Skip to content

fix: actionJs serialization in notification actions #19199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danharrin merged 4 commits into from
Feb 4, 2026
Merged

fix: actionJs serialization in notification actions #19199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e67fe58
fix: actionJs serialization in notification actions
People-Sea Feb 4, 2026
b316f8e
test: update notification snapshots for `alpineClickHandler`
People-Sea Feb 4, 2026
af717d0
cleanup
danharrin Feb 4, 2026
31a8d36
fix snapshots
danharrin Feb 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion packages/actions/src/Action.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ public function toArray(): array

return [
'name' => $this->getName(),
'alpineClickHandler' => $this->getCustomAlpineClickHandler(),
'color' => $this->getColor(),
'event' => $this->getEvent(),
'eventData' => $this->getEventData(),
Expand Down Expand Up @@ -225,6 +226,10 @@ public static function fromArray(array $data): static
$static->size($size);
}

if (filled($data['alpineClickHandler'] ?? null)) {
$static->alpineClickHandler($data['alpineClickHandler']);
}

$static->close($data['shouldClose'] ?? false);
$static->color($data['color'] ?? null);
$static->disabled($data['isDisabled'] ?? false);
Expand Down Expand Up @@ -382,7 +387,7 @@ public function getLivewireEventClickHandler(): ?string

public function getAlpineClickHandler(): ?string
{
if (filled($handler = $this->evaluate($this->alpineClickHandler))) {
if (filled($handler = $this->getCustomAlpineClickHandler())) {
return $handler;
}

Expand All @@ -405,6 +410,11 @@ public function getAlpineClickHandler(): ?string
return $this->getJsClickHandler();
}

public function getCustomAlpineClickHandler(): ?string
{
return $this->evaluate($this->alpineClickHandler);
}

public function livewireTarget(?string $target): static
{
$this->livewireTarget = $target;
Expand Down
1 change: 1 addition & 0 deletions ...Notifications/NotificationTest/it_serializes_notification_via__getDatabaseMessage___.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"actions": [
{
"name": "view",
"alpineClickHandler": null,
"color": null,
"event": null,
"eventData": [],
Expand Down
1 change: 1 addition & 0 deletions ...es_notification_with_action_containing__Heroicon__enum_and_icon_size_via__toArray___.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"actions": [
{
"name": "view",
"alpineClickHandler": null,
"color": null,
"event": null,
"eventData": [],
Expand Down
1 change: 1 addition & 0 deletions ...st/it_serializes_notification_with_action_containing__Heroicon__enum_via__toArray___.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"actions": [
{
"name": "view",
"alpineClickHandler": null,
"color": "primary",
"event": null,
"eventData": [],
Expand Down
1 change: 1 addition & 0 deletions ...ializes_notification_with_action_containing_outlined__Heroicon__enum_via__toArray___.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"actions": [
{
"name": "view",
"alpineClickHandler": null,
"color": "primary",
"event": null,
"eventData": [],
Expand Down
3 changes: 3 additions & 0 deletions ...ns/NotificationTest/it_serializes_notification_with_multiple_actions_via__toArray___.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"actions": [
{
"name": "view",
"alpineClickHandler": null,
"color": null,
"event": null,
"eventData": [],
Expand All @@ -27,6 +28,7 @@
},
{
"name": "edit",
"alpineClickHandler": null,
"color": null,
"event": null,
"eventData": [],
Expand All @@ -51,6 +53,7 @@
},
{
"name": "delete",
"alpineClickHandler": null,
"color": "danger",
"event": null,
"eventData": [],
Expand Down
Loading