Refactor button and toggle components. (#193)

php-forge · Dec 31, 2023 · 2f82472 · 2f82472
1 parent 5cb2253
commit 2f82472
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 79 deletions.
diff --git a/src/Attribute/Component/HasIcon.php b/src/Attribute/Component/HasIcon.php
@@ -14,11 +14,15 @@
  */
 trait HasIcon
 {
+    protected bool $icon = true;
     protected array $iconAttributes = [];
     protected string $iconClass = '';
+    protected bool $iconContainer = false;
     protected array $iconContainerAttributes = [];
+    protected string $iconContainerTag = 'div';
     protected string $iconContent = '';
     protected string $iconFilePath = '';
+    protected string $iconTag = 'svg';
 
     /**
      * @return array The `HTML` attributes of the icon of the menu item.
@@ -196,6 +200,7 @@ private function renderIconTag(): string
         $iconTag = match ($this->iconTag) {
             'svg' => Svg::widget()
                 ->attributes($this->iconAttributes)
+                ->class($this->iconClass)
                 ->content($this->iconContent)
                 ->filePath($this->iconFilePath)
                 ->render(),

diff --git a/src/Attribute/Component/HasToggle.php b/src/Attribute/Component/HasToggle.php
@@ -19,10 +19,12 @@
  */
 trait HasToggle
 {
+    protected bool $toggle = true;
     protected array $toggleAttributes = [];
     protected string $toggleClass = '';
     protected bool $toggleClassOverride = false;
     protected string $toggleContent = '';
+    protected string $toggleTag = 'span';
     protected string $toggleId = '';
 
     /**

diff --git a/src/Button.php b/src/Button.php
@@ -39,10 +39,7 @@ final class Button extends Element
     use Attribute\Input\HasType;
 
     protected array $attributes = [];
-    protected bool $container = false;
-    protected string $containerTag = 'div';
     protected string $tagName = 'button';
-    protected string $type = 'button';
 
     /**
      * This method is used to configure the widget with the provided default definitions.

diff --git a/src/ButtonToggle.php b/src/ButtonToggle.php
@@ -30,13 +30,7 @@ final class ButtonToggle extends Element
     use Attribute\Input\HasName;
 
     protected array $attributes = [];
-    protected bool $icon = true;
-    protected string $iconTag = 'svg';
-    protected bool $iconContainer = false;
-    protected string $iconContainerTag = 'div';
     protected string $tagName = 'button';
-    protected bool $toggle = true;
-    protected string $toggleTag = 'span';
 
     /**
      * Set tag name to `a` for the toggle.

diff --git a/src/Input/Base/AbstractButton.php b/src/Input/Base/AbstractButton.php
@@ -37,7 +37,6 @@ abstract class AbstractButton extends Element implements LabelInterface, InputIn
     use Attribute\Input\HasValue;
 
     protected array $attributes = [];
-    protected string $type = 'button';
 
     /**
      * This method is used to configure the widget with the provided default definitions.

diff --git a/tests/Attribute/Component/HasIconTest.php b/tests/Attribute/Component/HasIconTest.php
@@ -16,11 +16,6 @@ public function testClass(): void
         $instance = new class () {
             use HasIcon;
 
-            private bool $icon = false;
-            private bool $iconContainer = false;
-            private string $iconContainerTag = 'div';
-            private string $iconTag = 'i';
-
             public function getIconClass(): string
             {
                 return $this->iconClass;
@@ -39,11 +34,6 @@ public function testContainerClass(): void
         $instance = new class () {
             use HasIcon;
 
-            private bool $icon = false;
-            private bool $iconContainer = false;
-            private string $iconContainerTag = 'div';
-            private string $iconTag = 'i';
-
             public function getIconContainerClass(): string
             {
                 return $this->iconContainerAttributes['class'] ?? '';
@@ -69,11 +59,6 @@ public function testGetIconAttributes(): void
     {
         $instance = new class () {
             use HasIcon;
-
-            private bool $icon = false;
-            private bool $iconContainer = false;
-            private string $iconContainerTag = 'div';
-            private string $iconTag = 'i';
         };
 
         $this->assertEmpty($instance->getIconAttributes());
@@ -87,11 +72,6 @@ public function testGetIconContainerAttributes(): void
     {
         $instance = new class () {
             use HasIcon;
-
-            private bool $icon = false;
-            private bool $iconContainer = false;
-            private string $iconContainerTag = 'div';
-            private string $iconTag = 'i';
         };
 
         $this->assertEmpty($instance->getIconContainerAttributes());
@@ -105,11 +85,6 @@ public function testGetIconContent(): void
     {
         $instance = new class () {
             use HasIcon;
-
-            private bool $icon = false;
-            private bool $iconContainer = false;
-            private string $iconContainerTag = 'div';
-            private string $iconTag = 'i';
         };
 
         $this->assertEmpty($instance->getIconContent());
@@ -123,11 +98,6 @@ public function testImmutability(): void
     {
         $instance = new class () {
             use HasIcon;
-
-            private bool $icon = false;
-            private bool $iconContainer = false;
-            private string $iconContainerTag = 'div';
-            private string $iconTag = 'i';
         };
 
         $this->assertNotSame($instance, $instance->iconAttributes([]));
@@ -146,11 +116,6 @@ public function testRenderIconTag(): void
         $instance = new class () {
             use HasIcon;
 
-            private bool $icon = false;
-            private bool $iconContainer = false;
-            private string $iconContainerTag = 'div';
-            private string $iconTag = 'i';
-
             public function getIconTag(): string
             {
                 return $this->iconTag;
@@ -174,11 +139,6 @@ public function testRenderIconTagWithClass(): void
         $instance = new class () {
             use HasIcon;
 
-            private bool $icon = true;
-            private bool $iconContainer = false;
-            private string $iconContainerTag = 'div';
-            private string $iconTag = 'i';
-
             public function getIconTag(): string
             {
                 return $this->iconTag;
@@ -192,21 +152,23 @@ public function render(): string
 
         $this->assertEmpty($instance->render());
 
-        $instance = $instance->iconClass('class');
+        $instance = $instance->iconClass('class')->iconContent('content');
 
-        $this->assertSame('<i class="class"></i>', $instance->render());
+        Assert::equalsWithoutLE(
+            <<<HTML
+            <svg class="class">
+            content
+            </svg>
+            HTML,
+            $instance->render()
+        );
     }
 
     public function testRenderIconTagWithContainer(): void
     {
         $instance = new class () {
             use HasIcon;
 
-            private bool $icon = true;
-            private bool $iconContainer = true;
-            private string $iconContainerTag = 'div';
-            private string $iconTag = 'i';
-
             public function getIconTag(): string
             {
                 return $this->iconTag;
@@ -220,12 +182,14 @@ public function render(): string
 
         $this->assertEmpty($instance->render());
 
-        $instance = $instance->iconClass('class');
+        $instance = $instance->iconClass('class')->iconContainer(true)->iconContent('content');
 
         Assert::equalsWithoutLE(
             <<<HTML
             <div>
-            <i class="class"></i>
+            <svg class="class">
+            content
+            </svg>
             </div>
             HTML,
             $instance->render()
@@ -237,11 +201,6 @@ public function testRenderIconTagWithContent(): void
         $instance = new class () {
             use HasIcon;
 
-            private bool $icon = true;
-            private bool $iconContainer = false;
-            private string $iconContainerTag = 'div';
-            private string $iconTag = 'i';
-
             public function getIconTag(): string
             {
                 return $this->iconTag;
@@ -255,21 +214,21 @@ public function render(): string
 
         $this->assertEmpty($instance->render());
 
-        $instance = $instance->iconContent('content');
+        $instance = $instance->iconContent('content')->iconTag('i');
 
-        $this->assertSame('<i>content</i>', $instance->render());
+        Assert::equalsWithoutLE(
+            <<<HTML
+            <i>content</i>
+            HTML,
+            $instance->render()
+        );
     }
 
     public function testRenderIconTagWithSVG(): void
     {
         $instance = new class () {
             use HasIcon;
 
-            private bool $icon = true;
-            private bool $iconContainer = false;
-            private string $iconContainerTag = 'div';
-            private string $iconTag = 'svg';
-
             public function getIconTag(): string
             {
                 return $this->iconTag;
@@ -298,18 +257,13 @@ public function testTag(): void
         $instance = new class () {
             use HasIcon;
 
-            private bool $icon = false;
-            private bool $iconContainer = false;
-            private string $iconContainerTag = 'div';
-            private string $iconTag = 'i';
-
             public function getIconTag(): string
             {
                 return $this->iconTag;
             }
         };
 
-        $this->assertSame('i', $instance->getIconTag());
+        $this->assertSame('svg', $instance->getIconTag());
 
         $instance = $instance->iconTag('span');
 
@@ -323,8 +277,6 @@ public function testTagException(): void
 
         $instance = new class () {
             use HasIcon;
-
-            protected string $iconTag = 'i';
         };
 
         $instance->iconTag('');