If the option keys are numeric, cast them back to ints when getting the filter

Author: rappasoft

src/Traits/WithFilters.php

@@ -165,11 +165,15 @@ public function hasFilter(string $filter): bool
      *
      * @param  string  $filter
      *
-     * @return string|null
+     * @return int|mixed|null
      */
-    public function getFilter(string $filter): ?string
+    public function getFilter(string $filter)
     {
-        return $this->hasFilter($filter) ? $this->filters[$filter] : null;
+        if ($this->hasFilter($filter)) {
+            return $this->hasIntegerKeys($filter) ? (int)$this->filters[$filter] : $this->filters[$filter];
+        }
+
+        return null;
     }
 
     /**
@@ -206,9 +210,22 @@ public function getFilterOptions(string $filter): array
         return collect($this->filters()[$filter]->options())
             ->keys()
             ->reject(fn ($item) => $item === '' || $item === null)
+            ->values()
             ->toArray();
     }
 
+    /**
+     * Check whether the filter has numeric keys or not
+     *
+     * @param  string  $filter
+     *
+     * @return bool
+     */
+    public function hasIntegerKeys(string $filter): bool
+    {
+        return is_int($this->getFilterOptions($filter)[0] ?? null);
+    }
+
     /**
      * Collects columns with $searchable = true
      *