From 9f1095c79fd925857eabed3aeabf52ce5cfc02cc Mon Sep 17 00:00:00 2001
From: Dan Harrin <git@danharrin.com>
Date: Mon, 28 Jul 2025 09:58:35 +0100
Subject: [PATCH] Update CanGroupRecords.php

---
 .../src/Table/Concerns/CanGroupRecords.php    | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/packages/tables/src/Table/Concerns/CanGroupRecords.php b/packages/tables/src/Table/Concerns/CanGroupRecords.php
index 08ce397975..f7c6c79e4f 100644
--- a/packages/tables/src/Table/Concerns/CanGroupRecords.php
+++ b/packages/tables/src/Table/Concerns/CanGroupRecords.php
@@ -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);
     }