Fix all data attributes for accept true value when id attribute is used. (#8)

terabytesoftw · web-flow · commit d4356d81c788 · 2024-03-16T06:33:02.000-03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Change Log
 
-## 0.1.3 Under development
+## 0.1.3 March 16, 2024
+
+- Bug #8: Fix all `data` attributes for accept `true` value when `id` attribute is used (@terabytesoftw)
 
 ## 0.1.2 March 14, 2024
 
diff --git a/src/Data/HasDataBsAutoClose.php b/src/Data/HasDataBsAutoClose.php
@@ -9,15 +9,25 @@
  */
 trait HasDataBsAutoClose
 {
+    protected bool|string $dataBsAutoClose = false;
+
     /**
-     * Set the `HTML` data-bs-auto-close attribute for the toggle.
+     * Set the `HTML` `data-bs-auto-close` attribute for the toggle.
      *
-     * @param string $value The data-bs-auto-close attribute value.
+     * @param bool|string $value The `data-bs-auto-close` 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 dataBsAutoClose(string $value): static
+    public function dataBsAutoClose(bool|string $value = true): static
     {
-        return $this->dataAttributes([DataAttributeValues::BS_AUTO_CLOSE => $value]);
+        if (is_string($value)) {
+            return $this->dataAttributes([DataAttributeValues::BS_AUTO_CLOSE => $value]);
+        }
+
+        $new = clone $this;
+        $new->dataBsAutoClose = $value;
+
+        return $new;
     }
 }
diff --git a/src/Data/HasDataBsDismiss.php b/src/Data/HasDataBsDismiss.php
@@ -9,15 +9,25 @@
  */
 trait HasDataBsDismiss
 {
+    protected bool|string $dataBsDismiss = false;
+
     /**
-     * Set the `HTML` data-bs-dismiss attribute for the toggle.
+     * Set the `HTML` `data-bs-dismiss` attribute for the toggle.
      *
-     * @param string $value The data-bs-dismiss attribute value.
+     * @param bool|string $value The `data-bs-dismiss` 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 dataBsDismiss(string $value): static
+    public function dataBsDismiss(bool|string $value = true): static
     {
-        return $this->dataAttributes([DataAttributeValues::BS_DISMISS => $value]);
+        if (is_string($value)) {
+            return $this->dataAttributes([DataAttributeValues::BS_DISMISS => $value]);
+        }
+
+        $new = clone $this;
+        $new->dataBsDismiss = $value;
+
+        return $new;
     }
 }
diff --git a/src/Data/HasDataBsTarget.php b/src/Data/HasDataBsTarget.php
@@ -12,10 +12,10 @@ trait HasDataBsTarget
     protected bool|string $dataBsTarget = false;
 
     /**
-     * Set the `HTML` data-bs-target attribute for the toggle.
+     * Set the `HTML` `data-bs-target` attribute for the toggle.
      *
-     * @param bool|string $value The data-bs-target attribute value. If true, the value of the id attribute will be
-     * used.
+     * @param bool|string $value The `data-bs-target` 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.
      */
diff --git a/src/Data/HasDataBsToggle.php b/src/Data/HasDataBsToggle.php
@@ -12,10 +12,10 @@ trait HasDataBsToggle
     protected bool|string $dataBsToggle = false;
 
     /**
-     * Set the `HTML` data-bs-toggle attribute for the toggle.
+     * Set the `HTML` `data-bs-toggle` attribute for the toggle.
      *
-     * @param bool|string $value The data-bs-toogle attribute value. If true, the value of the id attribute will be
-     * used.
+     * @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.
      */
diff --git a/src/Data/HasDataCollapseToggle.php b/src/Data/HasDataCollapseToggle.php
@@ -9,15 +9,25 @@
  */
 trait HasDataCollapseToggle
 {
+    protected bool|string $dataCollapseToggle = false;
+
     /**
-     * Set the `HTML` data-collapse-toggle attribute for the toggle.
+     * Set the `HTML` `data-collapse-toggle` attribute for the toggle.
      *
-     * @param string $value The data-collapse-toggle attribute value.
+     * @param bool|string $value The `data-collapse-toggle` 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 dataCollapseToggle(string $value): static
+    public function dataCollapseToggle(bool|string $value = true): static
     {
-        return $this->dataAttributes([DataAttributeValues::COLLAPSE_TOGGLE => $value]);
+        if (is_string($value)) {
+            return $this->dataAttributes([DataAttributeValues::COLLAPSE_TOGGLE => $value]);
+        }
+
+        $new = clone $this;
+        $new->dataCollapseToggle = $value;
+
+        return $new;
     }
 }
diff --git a/src/Data/HasDataDismissTarget.php b/src/Data/HasDataDismissTarget.php
@@ -12,10 +12,10 @@ trait HasDataDismissTarget
     protected bool|string $dataDismissTarget = false;
 
     /**
-     * Set the `HTML` data-dismiss-target attribute for the toggle.
+     * Set the `HTML` `data-dismiss-target` attribute for the toggle.
      *
-     * @param bool|string $value The data-dismiss-target attribute value. If true, the value of the id attribute will be
-     * used.
+     * @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 = true): static
     {
diff --git a/src/Data/HasDataDrawerTarget.php b/src/Data/HasDataDrawerTarget.php
@@ -12,10 +12,10 @@ trait HasDataDrawerTarget
     protected bool|string $dataDrawerTarget = false;
 
     /**
-     * Set the `HTML` data drawer target attribute for the toggle.
+     * Set the `HTML` `data-drawer-target` attribute for the toggle.
      *
-     * @param bool|string $value The data-drawer-target attribute value. If true, the value of the id attribute will be
-     * used.
+     * @param bool|string $value The `data-drawer-target` 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.
      */
diff --git a/src/Data/HasDataDropdownToggle.php b/src/Data/HasDataDropdownToggle.php
@@ -12,10 +12,10 @@ trait HasDataDropdownToggle
     protected bool|string $dataDropdownToggle = false;
 
     /**
-     * Set the `HTML` data dropdown toggle attribute for the toggle.
+     * Set the `HTML` `data-dropdown-toggle` attribute for the toggle.
      *
-     * @param bool|string $value The data-dropdown-toggle attribute value. If true, the value of the id attribute will
-     * be used.
+     * @param bool|string $value The `data-dropdown-toggle` 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.
      */
diff --git a/src/Data/HasDataToggle.php b/src/Data/HasDataToggle.php
@@ -12,9 +12,9 @@ trait HasDataToggle
     protected bool|string $dataToggle = false;
 
     /**
-     * Set the `HTML` data toggle attribute for the toggle.
+     * Set the `HTML` `data-toggle` attribute for the toggle.
      *
-     * @param bool|string $value The data-toggle attribute value. If true, the value of the id attribute will be
+     * @param bool|string $value The `data-toggle` 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.
diff --git a/tests/Data/HasDataBsAutoCloseTest.php b/tests/Data/HasDataBsAutoCloseTest.php
@@ -8,17 +8,42 @@
 
 final class HasDataBsAutoCloseTest extends \PHPUnit\Framework\TestCase
 {
-    public function testDataBsAutoClose(): void
+    public function testDataBsTarget(): void
     {
         $instance = new class () {
             use HasData;
             use HasDataBsAutoClose;
 
             public array $attributes = [];
+
+            public function getDataBsAutoClose(): bool|string
+            {
+                return $this->dataBsAutoClose;
+            }
         };
 
         $instance = $instance->dataBsAutoClose('value');
 
         $this->assertSame(['data-bs-auto-close' => 'value'], $instance->attributes);
+
+        $instance = $instance->dataBsAutoClose();
+
+        $this->assertTrue($instance->getDataBsAutoClose());
+
+        $instance = $instance->dataBsAutoClose(false);
+
+        $this->assertFalse($instance->getDataBsAutoClose());
+    }
+
+    public function testImmutability(): void
+    {
+        $instance = new class () {
+            use HasData;
+            use HasDataBsAutoClose;
+
+            public array $attributes = [];
+        };
+
+        $this->assertNotSame($instance, $instance->dataBsAutoClose());
     }
 }
diff --git a/tests/Data/HasDataBsDismissTest.php b/tests/Data/HasDataBsDismissTest.php
@@ -15,10 +15,35 @@ public function testDataBsDismiss(): void
             use HasDataBsDismiss;
 
             public array $attributes = [];
+
+            public function getDataBsDismiss(): bool|string
+            {
+                return $this->dataBsDismiss;
+            }
         };
 
         $instance = $instance->dataBsDismiss('value');
 
         $this->assertSame(['data-bs-dismiss' => 'value'], $instance->attributes);
+
+        $instance = $instance->dataBsDismiss();
+
+        $this->assertTrue($instance->getDataBsDismiss());
+
+        $instance = $instance->dataBsDismiss(false);
+
+        $this->assertFalse($instance->getDataBsDismiss());
+    }
+
+    public function testImmutability(): void
+    {
+        $instance = new class () {
+            use HasData;
+            use HasDataBsDismiss;
+
+            public array $attributes = [];
+        };
+
+        $this->assertNotSame($instance, $instance->dataBsDismiss());
     }
 }
diff --git a/tests/Data/HasDataBsTargetTest.php b/tests/Data/HasDataBsTargetTest.php
@@ -44,6 +44,6 @@ public function testImmutability(): void
             public array $attributes = [];
         };
 
-        $this->assertNotSame($instance, $instance->dataBsTarget(true));
+        $this->assertNotSame($instance, $instance->dataBsTarget());
     }
 }
diff --git a/tests/Data/HasDataBsToggleTest.php b/tests/Data/HasDataBsToggleTest.php
@@ -16,7 +16,7 @@ public function testDataBsToggle(): void
 
             public array $attributes = [];
 
-            public function getDataBsToggle()
+            public function getDataBsToggle(): bool|string
             {
                 return $this->dataBsToggle;
             }
diff --git a/tests/Data/HasDataCollapseToggleTest.php b/tests/Data/HasDataCollapseToggleTest.php
@@ -15,11 +15,24 @@ public function testDataCollapseToggle(): void
             use HasDataCollapseToggle;
 
             public array $attributes = [];
+
+            public function getDataCollapseToggle(): bool|string
+            {
+                return $this->dataCollapseToggle;
+            }
         };
 
         $instance = $instance->dataCollapseToggle('value');
 
         $this->assertSame(['data-collapse-toggle' => 'value'], $instance->attributes);
+
+        $instance = $instance->dataCollapseToggle();
+
+        $this->assertTrue($instance->getDataCollapseToggle());
+
+        $instance = $instance->dataCollapseToggle(false);
+
+        $this->assertFalse($instance->getDataCollapseToggle());
     }
 
     public function testImmutability(): void
@@ -31,6 +44,6 @@ public function testImmutability(): void
             public array $attributes = [];
         };
 
-        $this->assertNotSame($instance, $instance->dataCollapseToggle(''));
+        $this->assertNotSame($instance, $instance->dataCollapseToggle());
     }
 }
diff --git a/tests/Data/HasDataDismissTargetTest.php b/tests/Data/HasDataDismissTargetTest.php
@@ -16,7 +16,7 @@ public function testDataDismissTarget(): void
 
             public array $attributes = [];
 
-            public function getDataDismissTarget()
+            public function getDataDismissTarget(): bool|string
             {
                 return $this->dataDismissTarget;
             }
diff --git a/tests/Data/HasDataDrawerTargetTest.php b/tests/Data/HasDataDrawerTargetTest.php
@@ -44,6 +44,6 @@ public function testImmutability(): void
             public array $attributes = [];
         };
 
-        $this->assertNotSame($instance, $instance->dataDrawerTarget(true));
+        $this->assertNotSame($instance, $instance->dataDrawerTarget());
     }
 }
diff --git a/tests/Data/HasDataDropdownToggleTest.php b/tests/Data/HasDataDropdownToggleTest.php
@@ -44,6 +44,6 @@ public function testImmutability(): void
             public array $attributes = [];
         };
 
-        $this->assertNotSame($instance, $instance->dataDropdownToggle(true));
+        $this->assertNotSame($instance, $instance->dataDropdownToggle());
     }
 }
diff --git a/tests/Data/HasDataToggleTest.php b/tests/Data/HasDataToggleTest.php
@@ -44,6 +44,6 @@ public function testImmutability(): void
             public array $attributes = [];
         };
 
-        $this->assertNotSame($instance, $instance->dataToggle(true));
+        $this->assertNotSame($instance, $instance->dataToggle());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -9,15 +9,25 @@`
`9`	`9`	`*/`
`10`	`10`	`trait HasDataBsAutoClose`
`11`	`11`	`{`
	`12`	`+ protected bool\|string $dataBsAutoClose = false;`
	`13`	`+`
`12`	`14`	`/**`
`13`		- * Set the `HTML` data-bs-auto-close attribute for the toggle.
	`15`	+ * Set the `HTML` `data-bs-auto-close` attribute for the toggle.
`14`	`16`	`*`
`15`		`- * @param string $value The data-bs-auto-close attribute value.`
	`17`	+ * @param bool\|string $value The `data-bs-auto-close` attribute value. If `true`, the value of the `id` attribute
	`18`	`+ * will be used.`
`16`	`19`	`*`
`17`	`20`	`* @return static A new instance of the current class with the specified toggle attributes.`
`18`	`21`	`*/`
`19`		`- public function dataBsAutoClose(string $value): static`
	`22`	`+ public function dataBsAutoClose(bool\|string $value = true): static`
`20`	`23`	`{`
`21`		`- return $this->dataAttributes([DataAttributeValues::BS_AUTO_CLOSE => $value]);`
	`24`	`+ if (is_string($value)) {`
	`25`	`+ return $this->dataAttributes([DataAttributeValues::BS_AUTO_CLOSE => $value]);`
	`26`	`+ }`
	`27`	`+`
	`28`	`+ $new = clone $this;`
	`29`	`+ $new->dataBsAutoClose = $value;`
	`30`	`+`
	`31`	`+ return $new;`
`22`	`32`	`}`
`23`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,10 @@ trait HasDataBsTarget`
`12`	`12`	`protected bool\|string $dataBsTarget = false;`
`13`	`13`
`14`	`14`	`/**`
`15`		- * Set the `HTML` data-bs-target attribute for the toggle.
	`15`	+ * Set the `HTML` `data-bs-target` attribute for the toggle.
`16`	`16`	`*`
`17`		`- * @param bool\|string $value The data-bs-target attribute value. If true, the value of the id attribute will be`
`18`		`- * used.`
	`17`	+ * @param bool\|string $value The `data-bs-target` attribute value. If `true`, the value of the `id` attribute will
	`18`	`+ * be used.`
`19`	`19`	`*`
`20`	`20`	`* @return static A new instance of the current class with the specified toggle attributes.`
`21`	`21`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,10 @@ trait HasDataBsToggle`
`12`	`12`	`protected bool\|string $dataBsToggle = false;`
`13`	`13`
`14`	`14`	`/**`
`15`		- * Set the `HTML` data-bs-toggle attribute for the toggle.
	`15`	+ * Set the `HTML` `data-bs-toggle` attribute for the toggle.
`16`	`16`	`*`
`17`		`- * @param bool\|string $value The data-bs-toogle attribute value. If true, the value of the id attribute will be`
`18`		`- * used.`
	`17`	+ * @param bool\|string $value The `data-bs-toogle` attribute value. If `true`, the value of the `id` attribute will
	`18`	`+ * be used.`
`19`	`19`	`*`
`20`	`20`	`* @return static A new instance of the current class with the specified toggle attributes.`
`21`	`21`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,10 @@ trait HasDataDismissTarget`
`12`	`12`	`protected bool\|string $dataDismissTarget = false;`
`13`	`13`
`14`	`14`	`/**`
`15`		- * Set the `HTML` data-dismiss-target attribute for the toggle.
	`15`	+ * Set the `HTML` `data-dismiss-target` attribute for the toggle.
`16`	`16`	`*`
`17`		`- * @param bool\|string $value The data-dismiss-target attribute value. If true, the value of the id attribute will be`
`18`		`- * used.`
	`17`	+ * @param bool\|string $value The `data-dismiss-target` attribute value. If `true`, the value of the `id` attribute
	`18`	`+ * will be used.`
`19`	`19`	`*/`
`20`	`20`	`public function dataDismissTarget(bool\|string $value = true): static`
`21`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,10 @@ trait HasDataDrawerTarget`
`12`	`12`	`protected bool\|string $dataDrawerTarget = false;`
`13`	`13`
`14`	`14`	`/**`
`15`		- * Set the `HTML` data drawer target attribute for the toggle.
	`15`	+ * Set the `HTML` `data-drawer-target` attribute for the toggle.
`16`	`16`	`*`
`17`		`- * @param bool\|string $value The data-drawer-target attribute value. If true, the value of the id attribute will be`
`18`		`- * used.`
	`17`	+ * @param bool\|string $value The `data-drawer-target` attribute value. If `true`, the value of the `id` attribute
	`18`	`+ * will be used.`
`19`	`19`	`*`
`20`	`20`	`* @return static A new instance of the current class with the specified toggle attributes.`
`21`	`21`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,10 @@ trait HasDataDropdownToggle`
`12`	`12`	`protected bool\|string $dataDropdownToggle = false;`
`13`	`13`
`14`	`14`	`/**`
`15`		- * Set the `HTML` data dropdown toggle attribute for the toggle.
	`15`	+ * Set the `HTML` `data-dropdown-toggle` attribute for the toggle.
`16`	`16`	`*`
`17`		`- * @param bool\|string $value The data-dropdown-toggle attribute value. If true, the value of the id attribute will`
`18`		`- * be used.`
	`17`	+ * @param bool\|string $value The `data-dropdown-toggle` attribute value. If `true`, the value of the `id` attribute
	`18`	`+ * will be used.`
`19`	`19`	`*`
`20`	`20`	`* @return static A new instance of the current class with the specified toggle attributes.`
`21`	`21`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@ trait HasDataToggle`
`12`	`12`	`protected bool\|string $dataToggle = false;`
`13`	`13`
`14`	`14`	`/**`
`15`		- * Set the `HTML` data toggle attribute for the toggle.
	`15`	+ * Set the `HTML` `data-toggle` attribute for the toggle.
`16`	`16`	`*`
`17`		`- * @param bool\|string $value The data-toggle attribute value. If true, the value of the id attribute will be`
	`17`	+ * @param bool\|string $value The `data-toggle` attribute value. If `true`, the value of the `id` attribute will be
`18`	`18`	`* used.`
`19`	`19`	`*`
`20`	`20`	`* @return static A new instance of the current class with the specified toggle attributes.`