Add bool typehint to dataBsToggle() method and add default value to true in data attributes. (#2)

Author: terabytesoftw

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Change Log
 
-## 0.1.1 Under development
+## 0.1.1 March 7, 2024
+
+- Bug #2: Add bool typehint to `dataBsToggle()` method and add default value to `true` in  `dataBsTarget()`,
+  `dataBstoggle()`, `dataDismissTarget()`, `dataDrawerTarget()`, `dataDrawerTarget()`, `dataDropdownToggle()` and 
+  `dataToggle()` (@terabytesoftw)
 
 ## 0.1.0 March 5, 2024
 

src/Data/HasDataBsTarget.php

@@ -21,7 +21,7 @@ abstract public function dataAttributes(array $values): static;
      *
      * @return static A new instance of the current class with the specified toggle attributes.
      */
-    public function dataBsTarget(bool|string $value): static
+    public function dataBsTarget(bool|string $value = true): static
     {
         if (is_string($value)) {
             return $this->dataAttributes([DataAttributeValues::BS_TARGET => $value]);

src/Data/HasDataBsToggle.php

@@ -9,17 +9,27 @@
  */
 trait HasDataBsToggle
 {
+    protected bool|string $dataBsToggle = false;
+
     abstract public function dataAttributes(array $values): static;
 
     /**
      * Set the `HTML` data-bs-toggle attribute for the toggle.
      *
-     * @param string $value The data-bs-toggle attribute value.
+     * @param bool|string $value The data-bs-toogle attribute value. If true, the value of the id attribute will be
+     * used.
      *
      * @return static A new instance of the current class with the specified toggle attributes.
      */
-    public function dataBsToggle(string $value): static
+    public function dataBsToggle(bool|string $value = true): static
     {
-        return $this->dataAttributes([DataAttributeValues::BS_TOGGLE => $value]);
+        if (is_string($value)) {
+            return $this->dataAttributes([DataAttributeValues::BS_TOGGLE => $value]);
+        }
+
+        $new = clone $this;
+        $new->dataBsToggle = $value;
+
+        return $new;
     }
 }

src/Data/HasDataDismissTarget.php

@@ -19,7 +19,7 @@ abstract public function dataAttributes(array $values): static;
      * @param bool|string $value The data-dismiss-target attribute value. If true, the value of the id attribute will be
      * used.
      */
-    public function dataDismissTarget(bool|string $value): static
+    public function dataDismissTarget(bool|string $value = true): static
     {
         if (is_string($value)) {
             return $this->dataAttributes([DataAttributeValues::DISMISS_TARGET => $value]);

src/Data/HasDataDrawerTarget.php

@@ -21,7 +21,7 @@ abstract public function dataAttributes(array $values): static;
      *
      * @return static A new instance of the current class with the specified toggle attributes.
      */
-    public function dataDrawerTarget(bool|string $value): static
+    public function dataDrawerTarget(bool|string $value = true): static
     {
         if (is_string($value)) {
             return $this->dataAttributes([DataAttributeValues::DRAWER_TARGET => $value]);

src/Data/HasDataDropdownToggle.php

@@ -21,7 +21,7 @@ abstract public function dataAttributes(array $values): static;
      *
      * @return static A new instance of the current class with the specified toggle attributes.
      */
-    public function dataDropdownToggle(bool|string $value): static
+    public function dataDropdownToggle(bool|string $value = true): static
     {
         if (is_string($value)) {
             return $this->dataAttributes([DataAttributeValues::DROPDOWN_TOGGLE => $value]);

src/Data/HasDataToggle.php

@@ -21,7 +21,7 @@ abstract public function dataAttributes(array $values): static;
      *
      * @return static A new instance of the current class with the specified toggle attributes.
      */
-    public function dataToggle(bool|string $value): static
+    public function dataToggle(bool|string $value = true): static
     {
         if (is_string($value)) {
             return $this->dataAttributes([DataAttributeValues::TOGGLE => $value]);

tests/Data/HasDataBsTargetTest.php

@@ -15,30 +15,24 @@ public function testDataBsTarget(): void
             use HasDataBsTarget;
 
             public array $attributes = [];
-        };
-
-        $instance = $instance->dataBsTarget('value');
-
-        $this->assertSame(['data-bs-target' => 'value'], $instance->attributes);
-    }
-
-    public function testDataBsTargetWithTrue(): void
-    {
-        $instance = new class () {
-            use HasData;
-            use HasDataBsTarget;
-
-            public array $attributes = [];
 
             public function getDataBsTarget(): bool|string
             {
                 return $this->dataBsTarget;
             }
         };
 
-        $instance = $instance->dataBsTarget(true);
+        $instance = $instance->dataBsTarget('value');
+
+        $this->assertSame(['data-bs-target' => 'value'], $instance->attributes);
+
+        $instance = $instance->dataBsTarget();
 
         $this->assertTrue($instance->getDataBsTarget());
+
+        $instance = $instance->dataBsTarget(false);
+
+        $this->assertFalse($instance->getDataBsTarget());
     }
 
     public function testImmutability(): void

tests/Data/HasDataBsToggleTest.php

@@ -15,10 +15,35 @@ public function testDataBsToggle(): void
             use HasDataBsToggle;
 
             public array $attributes = [];
+
+            public function getDataBsToggle()
+            {
+                return $this->dataBsToggle;
+            }
         };
 
         $instance = $instance->dataBsToggle('value');
 
         $this->assertSame(['data-bs-toggle' => 'value'], $instance->attributes);
+
+        $instance = $instance->dataBsToggle();
+
+        $this->assertTrue($instance->getDataBsToggle());
+
+        $instance = $instance->dataBsToggle(false);
+
+        $this->assertFalse($instance->getDataBsToggle());
+    }
+
+    public function testImmutability(): void
+    {
+        $instance = new class () {
+            use HasData;
+            use HasDataBsToggle;
+
+            protected array $attributes = [];
+        };
+
+        $this->assertNotSame($instance, $instance->dataBsToggle());
     }
 }

tests/Data/HasDataCollapseToggleTest.php

@@ -21,4 +21,16 @@ public function testDataCollapseToggle(): void
 
         $this->assertSame(['data-collapse-toggle' => 'value'], $instance->attributes);
     }
+
+    public function testImmutability(): void
+    {
+        $instance = new class () {
+            use HasData;
+            use HasDataCollapseToggle;
+
+            protected array $attributes = [];
+        };
+
+        $this->assertNotSame($instance, $instance->dataCollapseToggle(''));
+    }
 }