Number Filter - adjust return values

Author: lrljoe

src/Views/Filters/NumberFilter.php

@@ -4,11 +4,11 @@
 
 use Rappasoft\LaravelLivewireTables\Views\Filter;
 use Rappasoft\LaravelLivewireTables\Views\Traits\Core\HasWireables;
-use Rappasoft\LaravelLivewireTables\Views\Traits\Filters\{IsStringFilter};
+use Rappasoft\LaravelLivewireTables\Views\Traits\Filters\{IsNumericFilter};
 
 class NumberFilter extends Filter
 {
-    use IsStringFilter;
+    use IsNumericFilter;
     use HasWireables;
 
     public string $wireMethod = 'blur';
@@ -17,17 +17,20 @@ class NumberFilter extends Filter
 
     public function validate(float|int|string|array $value): float|int|string|false
     {
+        $floatValue = (float) $value;
+        $intValue = (int) $value;
+
         if (is_array($value)) {
             return false;
         } elseif (is_float($value)) {
-            return (float) $value;
+            return $floatValue;
         } elseif (is_int($value)) {
-            return (int) $value;
-        } elseif (ctype_digit($value)) {
-            return (float) $value;
+            return $intValue;
+        } elseif(is_numeric($value)) {
+            return (($floatValue - $intValue) == 0) ? $intValue : $floatValue;
+        } else if (ctype_digit($value)) {
+            return $intValue;
         }
-
         return false;
-
     }
 }

src/Views/Traits/Filters/IsNumericFilter.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Views\Traits\Filters;
+
+use Closure;
+use Illuminate\View\ComponentAttributeBag;
+use Rappasoft\LaravelLivewireTables\Views\{Column,Filter};
+
+trait IsNumericFilter
+{
+    public function isEmpty(float|int|string|array|null $value): bool
+    {
+        return (!is_null($value) ? ($this->validate($value) == false) : true);
+    }
+
+    /**
+     * Gets the Default Value for this Filter via the Component
+     */
+    public function getFilterDefaultValue(): ?string
+    {
+        return $this->filterDefaultValue ?? null;
+    }
+}

tests/Views/Filters/NumberFilterTest.php

@@ -158,13 +158,16 @@ public function test_can_set_number_filter_to_number(): void
         $filter = NumberFilter::make('BreedID');
         $this->assertSame(123, $filter->validate(123));
         $this->assertSame(123.51, $filter->validate(123.51));
-        $this->assertFalse($filter->validate('123'));
+        $this->assertSame(123, $filter->validate('123'));
+        $this->assertSame(123.51, $filter->validate('123.51'));
+
     }
 
     public function test_can_get_if_number_filter_empty(): void
     {
         $filter = NumberFilter::make('Active');
         $this->assertTrue($filter->isEmpty(''));
+        $this->assertTrue($filter->isEmpty('q'));
         $this->assertFalse($filter->isEmpty('123'));
     }