[12.x] Fix handling of Htmlable objects in Js::convertDataToJavaScriptExpression() (#56253)

* Refine handling of `Htmlable` objects

* Update Js.php

---------

Co-authored-by: Taylor Otwell <[email protected]>

Author: jj15asmr

src/Illuminate/Support/Js.php

@@ -70,7 +70,10 @@ protected function convertDataToJavaScriptExpression($data, $flags = 0, $depth =
             return $data->toHtml();
         }
 
-        if ($data instanceof Htmlable) {
+        if ($data instanceof Htmlable && 
+            ! $data instanceof Arrayable && 
+            ! $data instanceof Jsonable && 
+            ! $data instanceof JsonSerializable) {
             $data = $data->toHtml();
         }
 

tests/Support/SupportJsTest.php

@@ -133,13 +133,67 @@ public function testHtmlable()
     {
         $data = new class implements Htmlable
         {
-            public function toHtml(): string
+            public function toHtml()
             {
                 return '<p>Hello, World!</p>';
             }
         };
 
         $this->assertEquals("'\u003Cp\u003EHello, World!\u003C\/p\u003E'", (string) Js::from($data));
+
+        $data = new class implements Htmlable, Arrayable
+        {
+            public function toHtml()
+            {
+                return '<p>Hello, World!</p>';
+            }
+
+            public function toArray()
+            {
+                return ['foo' => 'hello', 'bar' => 'world'];
+            }
+        };
+
+        $this->assertEquals(
+            "JSON.parse('{\\u0022foo\\u0022:\\u0022hello\\u0022,\\u0022bar\\u0022:\\u0022world\\u0022}')",
+            (string) Js::from($data)
+        );
+
+        $data = new class implements Htmlable, Jsonable
+        {
+            public function toHtml()
+            {
+                return '<p>Hello, World!</p>';
+            }
+
+            public function toJson($options = 0)
+            {
+                return json_encode(['foo' => 'hello', 'bar' => 'world'], $options);
+            }
+        };
+
+        $this->assertEquals(
+            "JSON.parse('{\\u0022foo\\u0022:\\u0022hello\\u0022,\\u0022bar\\u0022:\\u0022world\\u0022}')",
+            (string) Js::from($data)
+        );
+
+        $data = new class implements Htmlable, JsonSerializable
+        {
+            public function toHtml()
+            {
+                return '<p>Hello, World!</p>';
+            }
+
+            public function jsonSerialize(): mixed
+            {
+                return ['foo' => 'hello', 'bar' => 'world'];
+            }
+        };
+
+        $this->assertEquals(
+            "JSON.parse('{\\u0022foo\\u0022:\\u0022hello\\u0022,\\u0022bar\\u0022:\\u0022world\\u0022}')",
+            (string) Js::from($data)
+        );
     }
 
     public function testBackedEnums()