diff --git a/packages/tables/src/Concerns/CanGroupRecords.php b/packages/tables/src/Concerns/CanGroupRecords.php index d2b73f02d4..ac965230a6 100644 --- a/packages/tables/src/Concerns/CanGroupRecords.php +++ b/packages/tables/src/Concerns/CanGroupRecords.php @@ -53,6 +53,8 @@ trait CanGroupRecords return $query; } + $group->applyEagerLoading($query); + return $group->orderQuery($query, $this->getTableGroupingDirection() ?? 'asc'); } } diff --git a/packages/tables/src/Grouping/Group.php b/packages/tables/src/Grouping/Group.php index 6449b24e83..3a2e527909 100644 --- a/packages/tables/src/Grouping/Group.php +++ b/packages/tables/src/Grouping/Group.php @@ -8,6 +8,7 @@ use Closure; use DateTimeInterface; use Filament\Support\Components\Component; use Filament\Support\Contracts\HasLabel as LabelInterface; +use Filament\Tables\Columns\Concerns\InteractsWithTableQuery; use Filament\Tables\Table; use Illuminate\Database\Eloquent\Builder as EloquentBuilder; use Illuminate\Database\Eloquent\Model; @@ -17,6 +18,8 @@ use Illuminate\Support\Arr; class Group extends Component { + use InteractsWithTableQuery; + protected ?string $column; protected ?Closure $getDescriptionFromRecordUsing = null;