wip

conedevelopment · Nov 21, 2024 · 3e46420 · 3e46420
1 parent 5d5f5dc
commit 3e46420
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 45 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/resources/js/app.js b/resources/js/app.js
@@ -26,6 +26,7 @@ window.$http = Axios.create({
 // Cookie
 window.$cookie = new Cookie('__root_');
 
+// Handle the relation frame load event
 document.addEventListener('relation-frame-loaded', (event) => {
     if (window.location.href !== event.detail.url) {
         window.history.replaceState(window.history.state, document.title, event.detail.url);

diff --git a/src/Fields/Relation.php b/src/Fields/Relation.php
@@ -632,9 +632,10 @@ public function paginate(Request $request, Model $model): LengthAwarePaginator
             ->withCount($this->withCount)
             ->latest()
             ->paginate(
-                $request->input($this->getPerPageKey(), $request->isTurboFrameRequest()
-                    ? 5
-                    : $relation->getRelated()->getPerPage())
+                $request->input(
+                    $this->getPerPageKey(),
+                    $request->isTurboFrameRequest() ? 5 : $relation->getRelated()->getPerPage()
+                )
             )->withQueryString();
     }
 
@@ -875,9 +876,10 @@ public function routes(Router $router): void
     public function registerRouteConstraints(Request $request, Router $router): void
     {
         $router->bind($this->getRouteKeyName(), function (string $id, Route $route) use ($router): Model {
-            return $id === 'create'
-                ? $this->getRelation($route->parentOfParameter($this->getRouteKeyName()))->make()
-                : $this->resolveRouteBinding($router->getCurrentRequest(), $id);
+            return match ($id) {
+                'create' => $this->getRelation($route->parentOfParameter($this->getRouteKeyName()))->make(),
+                default => $this->resolveRouteBinding($router->getCurrentRequest(), $id),
+            };
         });
     }