Merge pull request #13559 from archilex/Allow-table-groups-to-accept-…

…closure Allow table groups to accept a closure
filamentphp · Jul 17, 2024 · 0113c83 · 0113c83
2 parents 7d72266 + 9178bbb
commit 0113c83
Showing 1 changed file with 22 additions and 11 deletions.
diff --git a/packages/tables/src/Table/Concerns/CanGroupRecords.php b/packages/tables/src/Table/Concerns/CanGroupRecords.php
@@ -15,7 +15,12 @@ trait CanGroupRecords
     /**
      * @var array<string, Group>
      */
-    protected array $groups = [];
+    protected ?array $cachedGroups;
+
+    /**
+     * @var array<string | Group> | Closure
+     */
+    protected array | Closure $groups = [];
 
     protected bool | Closure $isGroupsOnly = false;
 
@@ -73,17 +78,11 @@ public function defaultGroup(string | Group | null $group): static
     }
 
     /**
-     * @param  array<Group | string>  $groups
+     * @param  array<string | Group> | Closure  $groups
      */
-    public function groups(array $groups): static
+    public function groups(array | Closure $groups): static
     {
-        foreach ($groups as $group) {
-            if (! $group instanceof Group) {
-                $group = Group::make($group);
-            }
-
-            $this->groups[$group->getId()] = $group;
-        }
+        $this->groups = $groups;
 
         return $this;
     }
@@ -168,7 +167,19 @@ public function getDefaultGroup(): ?Group
      */
     public function getGroups(): array
     {
-        return $this->groups;
+        return $this->cachedGroups ??= array_reduce(
+            $this->evaluate($this->groups),
+            function (array $carry, $group): array {
+                if (! $group instanceof Group) {
+                    $group = Group::make($group);
+                }
+
+                $groups[$group->getId()] = $group;
+
+                return $groups;
+            },
+            initial: [],
+        );
     }
 
     public function getGroup(string $id): ?Group