Merge pull request #1489 from moonshine-software/fix-issue-1485

fix: Paginator url
moonshine-software · Jan 20, 2025 · 86a0afb · 86a0afb
2 parents 70692a0 + 2c8d95b
commit 86a0afb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/Core/src/Paginator/Paginator.php b/src/Core/src/Paginator/Paginator.php
@@ -63,7 +63,7 @@ private function changeLinkUrls(string $path): void
             $changeUrl = function (?string $link) use ($path): ?string {
                 $current = strtok($this->path, '?');
                 $new = strtok($path, '?');
-                $query = (string) str($path)->after('?');
+                $query = str($path)->contains('?') ? str($path)->after('?')->value() : '';
 
                 return $link
                     ? trim(str_replace($current, $new, $link) . '&' . $query, '&')

diff --git a/src/UI/src/Traits/Fields/UpdateOnPreview.php b/src/UI/src/Traits/Fields/UpdateOnPreview.php
@@ -77,6 +77,9 @@ public function updateInPopover(string $component): static
         return $this->withUpdateRow($component);
     }
 
+    /**
+     * @param  ?Closure(mixed $data, mixed $value, static $field): string  $url
+     */
     public function updateOnPreview(
         ?Closure $url = null,
         ?ResourceContract $resource = null,
@@ -111,7 +114,7 @@ public function updateOnPreview(
     }
 
     /**
-     * @param  Closure(mixed $data, mixed $value, self $field): string  $url
+     * @param  Closure(mixed $data, mixed $value, FieldContract $field): string  $url
      */
     public function setUpdateOnPreviewUrl(Closure $url, array $events = []): static
     {