[1.x] Make inertia response more extension friendly

src/Response.php

@@ -90,12 +90,8 @@ public function toResponse($request)
         $props = $this->resolveAlwaysProps($props);
         $props = $this->evaluateProps($props, $request);
 
-        $page = [
-            'component' => $this->component,
-            'props' => $props,
-            'url' => Str::start(Str::after($request->fullUrl(), $request->getSchemeAndHttpHost()), '/'),
-            'version' => $this->version,
-        ];
+        $url = $this->resolveUrl($request, $props);
+        $page = $this->resolvePage($request, $props, $url);
 
         if ($request->header(Header::INERTIA)) {
             return new JsonResponse($page, 200, [Header::INERTIA => 'true']);
@@ -186,4 +182,25 @@ public function evaluateProps(array $props, Request $request, bool $unpackDotPro
 
         return $props;
     }
+
+    /**
+     * Resolve the URL for the response.
+     */
+    public function resolveUrl(Request $request, array $props): string
+    {
+        return Str::start(Str::after($request->fullUrl(), $request->getSchemeAndHttpHost()), '/');
+    }
+
+    /**
+     * Resolve the page for the response.
+     */
+    public function resolvePage(Request $request, array $props, string $url): array
+    {
+        return [
+            'component' => $this->component,
+            'props' => $props,
+            'url' => $url,
+            'version' => $this->version,
+        ];
+    }
 }

src/ResponseFactory.php

@@ -96,12 +96,12 @@ public function render(string $component, $props = []): Response
             $props = $props->toArray();
         }
 
-        return new Response(
-            $component,
-            array_merge($this->sharedProps, $props),
-            $this->rootView,
-            $this->getVersion()
-        );
+        return app(Response::class, [
+            'component' => $component,
+            'props' => array_merge($this->sharedProps, $props),
+            'rootView' => $this->rootView,
+            'version' => $this->getVersion(),
+        ]);
     }
 
     /**

tests/ResponseFactoryTest.php

@@ -15,6 +15,7 @@
 use Inertia\Tests\Stubs\ExampleMiddleware;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Http\Request as HttpRequest;
+use Inertia\Response as InertiaResponse;
 use Illuminate\Session\Middleware\StartSession;
 
 class ResponseFactoryTest extends TestCase
@@ -195,4 +196,31 @@ public function toArray()
             ],
         ]);
     }
+
+    public function test_it_allows_the_response_to_be_resolved_from_container(): void
+    {
+        app()->bind(InertiaResponse::class, function (): InertiaResponse {
+            return new class ('', []) extends InertiaResponse {
+                public function resolveUrl(HttpRequest $request, array $props): string
+                {
+                    $requestedFrom = $request->header('x-requested-from');
+                    $parsedRequestedFrom = parse_url($requestedFrom);
+
+                    return "{$parsedRequestedFrom['path']}#{$parsedRequestedFrom['fragment']}";
+                }
+            };
+        });
+
+        Route::middleware([StartSession::class, ExampleMiddleware::class])->get('/', function () {
+            return Inertia::render('User/Edit');
+        });
+
+        $response = $this->withoutExceptionHandling()->get('/', [
+            'X-Inertia' => 'true',
+            'X-Requested-From' => 'https://example.com/abc/123#value',
+        ]);
+
+        $response->assertSuccessful();
+        $response->assertJson(['url' => '/abc/123#value']);
+    }
 }