From 635460653c978222d17d229635a81a468fad3e51 Mon Sep 17 00:00:00 2001
From: nuno maduro <enunomaduro@gmail.com>
Date: Sat, 2 May 2026 17:37:34 +0100
Subject: [PATCH] wip

---
 src/Plugins/Tia/Edges/InertiaEdges.php | 58 +++++++++-----------------
 1 file changed, 19 insertions(+), 39 deletions(-)

diff --git a/src/Plugins/Tia/Edges/InertiaEdges.php b/src/Plugins/Tia/Edges/InertiaEdges.php
index 4e274ba6..038c1d41 100644
--- a/src/Plugins/Tia/Edges/InertiaEdges.php
+++ b/src/Plugins/Tia/Edges/InertiaEdges.php
@@ -36,11 +36,7 @@ final class InertiaEdges
             return;
         }
 
-        if ($app->bound(self::MARKER)) {
-            return;
-        }
-
-        if (! $app->bound('events')) {
+        if ($app->bound(self::MARKER) || ! $app->bound('events')) {
             return;
         }
 
@@ -54,18 +50,11 @@ final class InertiaEdges
         }
 
         $events->listen(self::REQUEST_HANDLED_EVENT, static function (object $event) use ($recorder): void {
-            if (! property_exists($event, 'response')) {
+            if (! property_exists($event, 'response') || ! is_object($event->response)) {
                 return;
             }
 
-            /** @var mixed $response */
-            $response = $event->response;
-
-            if (! is_object($response)) {
-                return;
-            }
-
-            $component = self::extractComponent($response);
+            $component = self::extractComponent($event->response);
 
             if ($component !== null) {
                 $recorder->linkInertiaComponent($component);
@@ -75,32 +64,16 @@ final class InertiaEdges
 
     private static function extractComponent(object $response): ?string
     {
-        if (property_exists($response, 'headers') && is_object($response->headers)) {
-            $headers = $response->headers;
-
-            if (method_exists($headers, 'has') && $headers->has('X-Inertia')) {
-                $content = self::readContent($response);
-
-                if ($content !== null) {
-                    /** @var mixed $decoded */
-                    $decoded = json_decode($content, true);
-
-                    if (is_array($decoded)
-                        && isset($decoded['component'])
-                        && is_string($decoded['component'])
-                        && $decoded['component'] !== '') {
-                        return $decoded['component'];
-                    }
-                }
-            }
-        }
-
         $content = self::readContent($response);
 
         if ($content === null) {
             return null;
         }
 
+        if (self::isInertiaJsonResponse($response)) {
+            return self::componentFromJson($content);
+        }
+
         if (str_contains($content, 'type="application/json"')
             && preg_match('#<script\b(?=[^>]*\bdata-page="app")(?=[^>]*\btype="application/json")[^>]*>(.+?)</script>#s', $content, $match) === 1) {
             $component = self::componentFromJson(html_entity_decode($match[1]));
@@ -112,16 +85,23 @@ final class InertiaEdges
 
         if (str_contains($content, 'data-page=')
             && preg_match('/\sdata-page="(\{[^"]+\})"/', $content, $match) === 1) {
-            $component = self::componentFromJson(html_entity_decode($match[1]));
-
-            if ($component !== null) {
-                return $component;
-            }
+            return self::componentFromJson(html_entity_decode($match[1]));
         }
 
         return null;
     }
 
+    private static function isInertiaJsonResponse(object $response): bool
+    {
+        if (! property_exists($response, 'headers') || ! is_object($response->headers)) {
+            return false;
+        }
+
+        $headers = $response->headers;
+
+        return method_exists($headers, 'has') && $headers->has('X-Inertia') === true;
+    }
+
     private static function componentFromJson(string $json): ?string
     {
         /** @var mixed $decoded */