Fix Collapse re-encoding content already managed by Toggler

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - Enh #306: Raise `yiisoft/html` version to `^3.13 || ^4.0` (@vjik)
 - New #305: Add `tabIndex()` method to `Button` widget (@Mister-42)
+- Bug #309: Fix `Collapse` re-encoding content already managed by `Toggler` (@vjik)
 
 ## 1.1.0 March 06, 2026
 

src/Collapse.php

@@ -362,14 +362,9 @@ public function render(): string
                     ->addAttributes($this->attributes)
                     ->addContent(
                         "\n",
-                        (new Div())
-                            ->addAttributes($this->cardBodyAttributes)
+                        Html::div("\n" . $item->getContent() . "\n", $this->cardBodyAttributes)
                             ->addClass(self::CARD, self::CARD_BODY)
-                            ->addContent(
-                                "\n",
-                                $item->getContent(),
-                                "\n",
-                            ),
+                            ->encode(false),
                         "\n",
                     )
                     ->id($item->getId());

tests/CollapseTest.php

@@ -6,6 +6,7 @@
 
 use InvalidArgumentException;
 use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\TestWith;
 use PHPUnit\Framework\TestCase;
 use Yiisoft\Bootstrap5\Collapse;
 use Yiisoft\Bootstrap5\Tests\Support\Assert;
@@ -475,4 +476,14 @@ public function testTogglerContainerTag(): void
                 ->render(),
         );
     }
+
+    #[TestWith(['<b>Bold content</b>', true])]
+    #[TestWith(['<b>Bold content</b>', false])]
+    public function testTogglerHtmlContent(string $expected, bool $encode): void
+    {
+        $toggler = Toggler::for('<b>Bold content</b>', 'collapseExample', encode: $encode)->togglerContent('Toggle');
+        $widget = Collapse::widget()->items($toggler);
+
+        $this->assertStringContainsString($expected, $widget->render());
+    }
 }