Merge pull request #11955 from filamentphp/fix/table-action-group-wit…

…h-record-hidden-closure fix: Table row action group with record-dependant hidden callback
filamentphp · Mar 20, 2024 · 68e4a11 · 68e4a11
2 parents c8f394c + d0b05f0
commit 68e4a11
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/packages/panels/src/Resources/Pages/ListRecords.php b/packages/panels/src/Resources/Pages/ListRecords.php
@@ -3,6 +3,7 @@
 namespace Filament\Resources\Pages;
 
 use Filament\Actions\Action;
+use Filament\Actions\Contracts\HasRecord;
 use Filament\Actions\CreateAction;
 use Filament\Facades\Filament;
 use Filament\Forms\Form;
@@ -255,6 +256,10 @@ protected function makeTable(): Table
 
                     $action->record($record);
 
+                    if (($actionGroup = $action->getGroup()) instanceof HasRecord) {
+                        $actionGroup->record($record);
+                    }
+
                     if ($action->isHidden()) {
                         continue;
                     }
@@ -279,6 +284,10 @@ protected function makeTable(): Table
 
                     $action->record($record);
 
+                    if (($actionGroup = $action->getGroup()) instanceof HasRecord) {
+                        $actionGroup->record($record);
+                    }
+
                     if ($action->isHidden()) {
                         continue;
                     }

diff --git a/packages/tables/src/Table/Concerns/HasActions.php b/packages/tables/src/Table/Concerns/HasActions.php
@@ -3,6 +3,7 @@
 namespace Filament\Tables\Table\Concerns;
 
 use Closure;
+use Filament\Actions\Contracts\HasRecord;
 use Filament\Support\Enums\ActionSize;
 use Filament\Tables\Actions\Action;
 use Filament\Tables\Actions\ActionGroup;
@@ -129,6 +130,10 @@ public function getAction(string | array $name): ?Action
             return null;
         }
 
+        if (($actionGroup = $action->getGroup()) instanceof HasRecord) {
+            $actionGroup->record($mountedRecord);
+        }
+
         return $this->getMountableModalActionFromAction(
             $action->record($mountedRecord),
             modalActionNames: $modalActionNames ?? [],