opensource/filament
3
0
Fork 0
mirror of https://github.com/filamentphp/filament.git synced 2026-09-24 15:42:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update CanGroupRecords.php

Browse Source
This commit is contained in:
Dan Harrin
2025-07-28 09:58:35 +01:00
parent fccf0012cc
commit 9f1095c79f
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/tables/src/Table/Concerns/CanGroupRecords.php
+9 -11
View File
@@ -10,7 +10,7 @@ use Filament\Tables\Grouping\Group;
trait CanGroupRecords
{
protected string | Closure | Group | null $defaultGroup = null;
protected string | Group | Closure | null $defaultGroup = null;
/**
* @var array<string, Group>
@@ -70,7 +70,7 @@ trait CanGroupRecords
return $this;
}
public function defaultGroup(string | Closure | Group | null $group): static
public function defaultGroup(string | Group | Closure | null $group): static
{
$this->defaultGroup = $group;
@@ -145,25 +145,23 @@ trait CanGroupRecords
public function getDefaultGroup(): ?Group
{
if ($this->defaultGroup instanceof Closure) {
$this->defaultGroup = $this->evaluate($this->defaultGroup);
}
if ($this->defaultGroup === null) {
$defaultGroup = $this->evaluate($this->defaultGroup);
if ($defaultGroup === null) {
return null;
}
if ($this->defaultGroup instanceof Group) {
return $this->defaultGroup->table($this);
if ($defaultGroup instanceof Group) {
return $defaultGroup->table($this);
}
$group = $this->getGroup($this->defaultGroup);
$group = $this->getGroup($defaultGroup);
if ($group) {
return $group;
}
return Group::make($this->defaultGroup)
return Group::make($defaultGroup)
->table($this);
}