Update SpladeQueryBuilder.php

Author: pascalbaljet

src/SpladeQueryBuilder.php

@@ -318,11 +318,31 @@ private function loadResults()
         // The 'perPage' value is taken from the request query
         // string, or from the configured parameter, or it's
         // the first from the 'perPage' selector options.
-        $perPage = $this->query('perPage', $this->perPage ?: Arr::first($this->perPageOptions));
+        $defaultPerPage = $this->perPage ?: Arr::first($this->perPageOptions);
+
+        $perPage = $this->query('perPage', $defaultPerPage);
+
+        if (!in_array($perPage, $this->perPageOptions)) {
+            // The 'perPage' value is not in the allowed options.
+            // So we'll use the first option.
+            $perPage = $defaultPerPage;
+        }
 
         $this->resource = $this->builder->{$this->paginateMethod}($perPage)->withQueryString();
     }
 
+    /**
+     * Adds the given 'perPage' value to the 'perPageOptions' array.
+     *
+     * @return void
+     */
+    public function addCurrentPerPageValueToOptions()
+    {
+        if ($this->perPage && !in_array($this->perPage, $this->perPageOptions)) {
+            $this->perPageOptions[] = $this->perPage;
+        }
+    }
+
     /**
      * Prepares the query and loads the results.
      *
@@ -334,6 +354,7 @@ public function beforeRender()
             $this->applyFilters();
             $this->applySearchInputs();
             $this->applySortingAndEagerLoading();
+            $this->addCurrentPerPageValueToOptions();
         }
 
         $this->loadResults();