From d4b5391b20ca235ffc793040e3ceb393c73085cc Mon Sep 17 00:00:00 2001 From: a7medKhalid Date: Fri, 5 Jan 2024 00:06:05 +0300 Subject: [PATCH 1/2] add description --- resources/views/popover.blade.php | 25 +++++++++++++++++++++++++ src/Tables/PopoverColumn.php | 16 ++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/resources/views/popover.blade.php b/resources/views/popover.blade.php index fbe2e60..c485623 100644 --- a/resources/views/popover.blade.php +++ b/resources/views/popover.blade.php @@ -6,6 +6,9 @@ $getOffset = $getOffset(); $getPopOverMaxWidth = $getPopOverMaxWidth(); $getIcon = $getIcon($getState); + $descriptionAbove = $getDescriptionAbove(); + $descriptionBelow = $getDescriptionBelow(); + $canWrap = $canWrap(); @endphp + @if (filled($descriptionAbove)) +

$canWrap, + ]) + > + {{ $descriptionAbove }} +

+ @endif + + + @if (filled($descriptionBelow)) +

$canWrap, + ]) + > + {{ $descriptionBelow }} +

+ @endif diff --git a/src/Tables/PopoverColumn.php b/src/Tables/PopoverColumn.php index 2375a45..0501e0f 100644 --- a/src/Tables/PopoverColumn.php +++ b/src/Tables/PopoverColumn.php @@ -4,19 +4,35 @@ use Filament\Support\Concerns; use Filament\Tables\Columns\Column; +use Filament\Tables\Columns\Concerns\HasDescription; use LaraZeus\Popover\Concerns\HasPopover; class PopoverColumn extends Column { use Concerns\HasIcon; use HasPopover; + use HasDescription; protected string $view = 'zeus-popover::popover'; + protected bool | Closure $canWrap = false; + protected function setUp(): void { parent::setUp(); $this->disabledClick(); } + + public function wrap(bool | Closure $condition = true): static + { + $this->canWrap = $condition; + + return $this; + } + + public function canWrap(): bool + { + return (bool) $this->evaluate($this->canWrap); + } } From 7ce88e5316c54e67d9a4026c9bf537fd70e36355 Mon Sep 17 00:00:00 2001 From: a7medKhalid Date: Tue, 9 Jan 2024 15:26:15 +0300 Subject: [PATCH 2/2] use canWrap trait --- src/Tables/PopoverColumn.php | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/Tables/PopoverColumn.php b/src/Tables/PopoverColumn.php index 0501e0f..e44ec50 100644 --- a/src/Tables/PopoverColumn.php +++ b/src/Tables/PopoverColumn.php @@ -4,6 +4,7 @@ use Filament\Support\Concerns; use Filament\Tables\Columns\Column; +use Filament\Tables\Columns\Concerns\CanWrap; use Filament\Tables\Columns\Concerns\HasDescription; use LaraZeus\Popover\Concerns\HasPopover; @@ -12,27 +13,14 @@ class PopoverColumn extends Column use Concerns\HasIcon; use HasPopover; use HasDescription; + use CanWrap; protected string $view = 'zeus-popover::popover'; - protected bool | Closure $canWrap = false; - protected function setUp(): void { parent::setUp(); $this->disabledClick(); } - - public function wrap(bool | Closure $condition = true): static - { - $this->canWrap = $condition; - - return $this; - } - - public function canWrap(): bool - { - return (bool) $this->evaluate($this->canWrap); - } }