From fc070a2a647a89e8f43788eb216f53e3f23b5006 Mon Sep 17 00:00:00 2001
From: Simon Hamp <simon.hamp@me.com>
Date: Tue, 19 Nov 2024 18:09:44 +0000
Subject: [PATCH 1/4] Remove `event` prop

---
 src/MenuBar/MenuBar.php | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/MenuBar/MenuBar.php b/src/MenuBar/MenuBar.php
index cfc2873f..13a57092 100644
--- a/src/MenuBar/MenuBar.php
+++ b/src/MenuBar/MenuBar.php
@@ -30,8 +30,6 @@ class MenuBar
 
     protected bool $alwaysOnTop = false;
 
-    protected ?string $event = null;
-
     protected bool $showDockIcon = false;
 
     protected Client $client;
@@ -97,13 +95,6 @@ public function alwaysOnTop($alwaysOnTop = true): self
         return $this;
     }
 
-    public function event(string $event): self
-    {
-        $this->event = $event;
-
-        return $this;
-    }
-
     public function withContextMenu(Menu $menu): self
     {
         $this->contextMenu = $menu;
@@ -131,7 +122,6 @@ public function toArray(): array
             'onlyShowContextMenu' => $this->onlyShowContextMenu,
             'contextMenu' => ! is_null($this->contextMenu) ? $this->contextMenu->toArray()['submenu'] : null,
             'alwaysOnTop' => $this->alwaysOnTop,
-            'event' => $this->event,
         ];
     }
 }

From 83edd85963742c84715a0ad1070c17d0ad04ed06 Mon Sep 17 00:00:00 2001
From: Simon Hamp <simon.hamp@me.com>
Date: Tue, 19 Nov 2024 18:10:11 +0000
Subject: [PATCH 2/4] Standardise events

---
 src/Events/MenuBar/MenuBarClicked.php         | 25 +++++++++++++++++++
 ...enuOpened.php => MenuBarDoubleClicked.php} |  6 ++++-
 src/Events/MenuBar/MenuBarRightClicked.php    | 25 +++++++++++++++++++
 3 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 src/Events/MenuBar/MenuBarClicked.php
 rename src/Events/MenuBar/{MenuBarContextMenuOpened.php => MenuBarDoubleClicked.php} (76%)
 create mode 100644 src/Events/MenuBar/MenuBarRightClicked.php

diff --git a/src/Events/MenuBar/MenuBarClicked.php b/src/Events/MenuBar/MenuBarClicked.php
new file mode 100644
index 00000000..50f0d521
--- /dev/null
+++ b/src/Events/MenuBar/MenuBarClicked.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Native\Laravel\Events\MenuBar;
+
+use Illuminate\Broadcasting\Channel;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcastNow;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class MenuBarClicked implements ShouldBroadcastNow
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+
+    public function __construct(public array $combo, public array $bounds, public array $position)
+    {
+    }
+
+    public function broadcastOn()
+    {
+        return [
+            new Channel('nativephp'),
+        ];
+    }
+}
diff --git a/src/Events/MenuBar/MenuBarContextMenuOpened.php b/src/Events/MenuBar/MenuBarDoubleClicked.php
similarity index 76%
rename from src/Events/MenuBar/MenuBarContextMenuOpened.php
rename to src/Events/MenuBar/MenuBarDoubleClicked.php
index f4d85f6a..8acd2267 100644
--- a/src/Events/MenuBar/MenuBarContextMenuOpened.php
+++ b/src/Events/MenuBar/MenuBarDoubleClicked.php
@@ -8,10 +8,14 @@
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
-class MenuBarContextMenuOpened implements ShouldBroadcastNow
+class MenuBarRightClicked implements ShouldBroadcastNow
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
+    public function __construct(public array $combo, public array $bounds)
+    {
+    }
+
     public function broadcastOn()
     {
         return [
diff --git a/src/Events/MenuBar/MenuBarRightClicked.php b/src/Events/MenuBar/MenuBarRightClicked.php
new file mode 100644
index 00000000..8acd2267
--- /dev/null
+++ b/src/Events/MenuBar/MenuBarRightClicked.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Native\Laravel\Events\MenuBar;
+
+use Illuminate\Broadcasting\Channel;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcastNow;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class MenuBarRightClicked implements ShouldBroadcastNow
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+
+    public function __construct(public array $combo, public array $bounds)
+    {
+    }
+
+    public function broadcastOn()
+    {
+        return [
+            new Channel('nativephp'),
+        ];
+    }
+}

From a60dca9d87b533c2e840150be6619ff594ea3e2e Mon Sep 17 00:00:00 2001
From: simonhamp <simonhamp@users.noreply.github.com>
Date: Tue, 19 Nov 2024 18:10:45 +0000
Subject: [PATCH 3/4] Fix styling

---
 src/Events/MenuBar/MenuBarClicked.php       | 4 +---
 src/Events/MenuBar/MenuBarDoubleClicked.php | 4 +---
 src/Events/MenuBar/MenuBarRightClicked.php  | 4 +---
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/Events/MenuBar/MenuBarClicked.php b/src/Events/MenuBar/MenuBarClicked.php
index 50f0d521..4ac8f9e9 100644
--- a/src/Events/MenuBar/MenuBarClicked.php
+++ b/src/Events/MenuBar/MenuBarClicked.php
@@ -12,9 +12,7 @@ class MenuBarClicked implements ShouldBroadcastNow
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
-    public function __construct(public array $combo, public array $bounds, public array $position)
-    {
-    }
+    public function __construct(public array $combo, public array $bounds, public array $position) {}
 
     public function broadcastOn()
     {
diff --git a/src/Events/MenuBar/MenuBarDoubleClicked.php b/src/Events/MenuBar/MenuBarDoubleClicked.php
index 8acd2267..69cdde5c 100644
--- a/src/Events/MenuBar/MenuBarDoubleClicked.php
+++ b/src/Events/MenuBar/MenuBarDoubleClicked.php
@@ -12,9 +12,7 @@ class MenuBarRightClicked implements ShouldBroadcastNow
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
-    public function __construct(public array $combo, public array $bounds)
-    {
-    }
+    public function __construct(public array $combo, public array $bounds) {}
 
     public function broadcastOn()
     {
diff --git a/src/Events/MenuBar/MenuBarRightClicked.php b/src/Events/MenuBar/MenuBarRightClicked.php
index 8acd2267..69cdde5c 100644
--- a/src/Events/MenuBar/MenuBarRightClicked.php
+++ b/src/Events/MenuBar/MenuBarRightClicked.php
@@ -12,9 +12,7 @@ class MenuBarRightClicked implements ShouldBroadcastNow
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
-    public function __construct(public array $combo, public array $bounds)
-    {
-    }
+    public function __construct(public array $combo, public array $bounds) {}
 
     public function broadcastOn()
     {

From 9e3106f649d2adf9bfc5d2fbc17b7dde544c29a5 Mon Sep 17 00:00:00 2001
From: Simon Hamp <simon.hamp@me.com>
Date: Wed, 20 Nov 2024 16:37:02 +0000
Subject: [PATCH 4/4] Fix class name

---
 src/Events/MenuBar/MenuBarDoubleClicked.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Events/MenuBar/MenuBarDoubleClicked.php b/src/Events/MenuBar/MenuBarDoubleClicked.php
index 69cdde5c..b6450c20 100644
--- a/src/Events/MenuBar/MenuBarDoubleClicked.php
+++ b/src/Events/MenuBar/MenuBarDoubleClicked.php
@@ -8,7 +8,7 @@
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
-class MenuBarRightClicked implements ShouldBroadcastNow
+class MenuBarDoubleClicked implements ShouldBroadcastNow
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;