Consistency

NativePHP · Dec 19, 2024 · 1cf8438 · 1cf8438
1 parent 1a8151f
commit 1cf8438
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 16 deletions.
diff --git a/src/Menu/Items/Checkbox.php b/src/Menu/Items/Checkbox.php
@@ -7,10 +7,8 @@ class Checkbox extends MenuItem
     protected string $type = 'checkbox';
 
     public function __construct(
-        string $label,
+        protected ?string $label,
         protected bool $isChecked = false,
         protected ?string $accelerator = null
-    ) {
-        $this->label = $label;
-    }
+    ) {}
 }
diff --git a/src/Menu/Items/Label.php b/src/Menu/Items/Label.php
@@ -4,8 +4,8 @@
 
 class Label extends MenuItem
 {
-    public function __construct(string $label)
-    {
-        $this->label = $label;
-    }
+    public function __construct(
+        protected ?string $label,
+        protected ?string $accelerator = null
+    ) {}
 }
diff --git a/src/Menu/Items/Link.php b/src/Menu/Items/Link.php
@@ -8,7 +8,11 @@ class Link extends MenuItem
 
     protected bool $openInBrowser = false;
 
-    public function __construct(protected string $url, protected ?string $label, protected ?string $accelerator = null) {}
+    public function __construct(
+        protected string $url,
+        protected ?string $label,
+        protected ?string $accelerator = null
+    ) {}
 
     public function openInBrowser(bool $openInBrowser = true): self
     {

diff --git a/src/Menu/Items/Radio.php b/src/Menu/Items/Radio.php
@@ -7,10 +7,8 @@ class Radio extends MenuItem
     protected string $type = 'radio';
 
     public function __construct(
-        string $label,
+        protected ?string $label,
         protected bool $isChecked = false,
         protected ?string $accelerator = null
-    ) {
-        $this->label = $label;
-    }
+    ) {}
 }
diff --git a/src/Menu/Items/Role.php b/src/Menu/Items/Role.php
@@ -8,7 +8,10 @@ class Role extends MenuItem
 {
     protected string $type = 'role';
 
-    public function __construct(protected RolesEnum $role, protected ?string $label = '') {}
+    public function __construct(
+        protected RolesEnum $role,
+        protected ?string $label = ''
+    ) {}
 
     public function toArray(): array
     {

diff --git a/src/Menu/MenuBuilder.php b/src/Menu/MenuBuilder.php
@@ -38,9 +38,9 @@ public function default(): void
         );
     }
 
-    public function label(string $label): Items\Label
+    public function label(string $label, ?string $hotkey = null): Items\Label
     {
-        return new Items\Label($label);
+        return new Items\Label($label, $hotkey);
     }
 
     public function checkbox(string $label, bool $checked = false, ?string $hotkey = null): Items\Checkbox
@@ -162,4 +162,9 @@ public function hide(?string $label = null): Items\Role
     {
         return new Items\Role(RolesEnum::HIDE, $label);
     }
+
+    public function about(?string $label = null): Items\Role
+    {
+        return new Items\Role(RolesEnum::ABOUT, $label);
+    }
 }