MenuBars continued (#420)

* Remove `event` prop

* Standardise events

* Fix styling

* Fix class name

---------

Co-authored-by: simonhamp <[email protected]>

Author: simonhamp

src/Events/MenuBar/MenuBarClicked.php

@@ -0,0 +1,23 @@
+<?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'),
+        ];
+    }
+}

src/Events/MenuBar/MenuBarDoubleClicked.php

@@ -0,0 +1,23 @@
+<?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 MenuBarDoubleClicked implements ShouldBroadcastNow
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+
+    public function __construct(public array $combo, public array $bounds) {}
+
+    public function broadcastOn()
+    {
+        return [
+            new Channel('nativephp'),
+        ];
+    }
+}

src/Events/MenuBar/MenuBarContextMenuOpened.php renamed to src/Events/MenuBar/MenuBarRightClicked.php

@@ -8,10 +8,12 @@
 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 [

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,
         ];
     }
 }