Skip to content

[12.x] Support Passing Htmlable Instances to Js::from() #56159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 28, 2025
Merged

[12.x] Support Passing Htmlable Instances to Js::from() #56159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b76daff
Add support for passing `Htmlable` instance to `Js::from()`
jj15asmr Jun 27, 2025
a2d2040
Reorder import for styling
jj15asmr Jun 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/Illuminate/Support/Js.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ protected function convertDataToJavaScriptExpression($data, $flags = 0, $depth =
return $data->toHtml();
}

if ($data instanceof Htmlable) {
$data = $data->toHtml();
}

if ($data instanceof UnitEnum) {
$data = enum_value($data);
}
Expand Down
14 changes: 14 additions & 0 deletions tests/Support/SupportJsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace Illuminate\Tests\Support;

use Illuminate\Contracts\Support\Arrayable;
use Illuminate\Contracts\Support\Htmlable;
use Illuminate\Contracts\Support\Jsonable;
use Illuminate\Support\Js;
use Illuminate\Tests\Support\Fixtures\IntBackedEnum;
Expand Down Expand Up @@ -128,6 +129,19 @@ public function toArray()
);
}

public function testHtmlable()
{
$data = new class implements Htmlable
{
public function toHtml(): string
{
return '<p>Hello, World!</p>';
}
};

$this->assertEquals("'\u003Cp\u003EHello, World!\u003C\/p\u003E'", (string) Js::from($data));
}

public function testBackedEnums()
{
$this->assertSame('2', (string) Js::from(IntBackedEnum::TWO));
Expand Down