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

Update InteractsWithActions.php

Browse Source
This commit is contained in:
Dan Harrin
2023-05-05 15:54:14 +01:00
parent d5f449ee3e
commit 89ef46912a
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/actions/src/Concerns/InteractsWithActions.php
+11 -6
View File
@@ -273,9 +273,7 @@ trait InteractsWithActions
$name = $firstName;
}
$action = $this->cachedActions[$name] ?? null;
if ($action) {
if ($action = $this->cachedActions[$name] ?? null) {
return $this->getMountableModalActionFromAction(
$action,
modalActionNames: $modalActionNames ?? [],
@@ -283,17 +281,24 @@ trait InteractsWithActions
);
}
if (! method_exists($this, $name)) {
if (
(! str($name)->endsWith('Action')) &&
method_exists($this, "{$name}Action")
) {
$methodName = "{$name}Action";
} elseif (method_exists($this, $name)) {
$methodName = $name;
} else {
return null;
}
$action = Action::configureUsing(
Closure::fromCallable([$this, 'configureAction']),
fn () => $this->{$name}(),
fn () => $this->{$methodName}(),
);
if (! $action instanceof Action) {
throw new InvalidArgumentException('Actions must be an instance of ' . Action::class . ". The [{$name}] method on the Livewire component returned an instance of [" . get_class($action) . '].');
throw new InvalidArgumentException('Actions must be an instance of ' . Action::class . ". The [{$methodName}] method on the Livewire component returned an instance of [" . get_class($action) . '].');
}
return $this->getMountableModalActionFromAction(