Fix table filters

Dimonka2 · Jul 23, 2020 · 0afe2a3 · 0afe2a3
1 parent 438a3a7
commit 0afe2a3
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 4 deletions.
diff --git a/src/Form/Components/Table/ColumnsTrait.php b/src/Form/Components/Table/ColumnsTrait.php
@@ -42,6 +42,7 @@ public function getVisibleColumnCount()
             if($column->visible()) $count ++;
         }
         if($this->hasDetails()) $count ++;
+        if($this->hasSelect()) $count ++;
         return $count;
     }
 

diff --git a/src/Form/Components/Table/TableFilter.php b/src/Form/Components/Table/TableFilter.php
@@ -35,6 +35,10 @@ public function renderFilter($value)
                 return Flatform::render([
                     ['div', 'class' => 'col-md-12', [$checkbox]]
                 ]);
+            case 'text':
+                return Flatform::render([
+                    ['text', 'label' => $this->title, 'col' => 12, 'value' => $value, 'wire:model.debounce.500ms' => 'filtered.' . $this->name,]
+                ]);
             case 'select':
                 $list = $this->list;
                 if($list instanceof Closure) $list = $list(); // allow funciton as a list parameter

diff --git a/src/Livewire/TableComponent.php b/src/Livewire/TableComponent.php
@@ -414,5 +414,6 @@ public function __set($property, $value)
     {
         $this->WithPagination__set($property, $value);
         $this->TableSearchQuery__set($property, $value);
+        // parent::__set($property, $value);
     }
 }
diff --git a/src/Traits/TableSearchQuery.php b/src/Traits/TableSearchQuery.php
@@ -12,7 +12,7 @@ public function initializeTableSearchQuery()
         $this->updatesQueryString = array_merge([$this->searchQueryString => ['except' => '']], $this->updatesQueryString);
         $this->updatesQueryString = array_merge([$this->filterQueryString => ['except' => []]], $this->updatesQueryString);
         $this->search = request()->query($this->searchQueryString, $this->search);
-        $this->filter = request()->query($this->filterQueryString, $this->filtered);
+        $this->filtered = request()->query($this->filterQueryString, $this->filtered);
     }
 
     public function __get($property)
@@ -28,6 +28,7 @@ public function __get($property)
 
     public function __set($property, $value)
     {
+        // debug($property, $value);
         if ($property == $this->searchQueryString) {
             $this->search = $value;
         } elseif($property == $this->filterQueryString) {

diff --git a/views/livewire/table-filter.blade.php b/views/livewire/table-filter.blade.php
@@ -17,12 +17,13 @@
                 $checkbox,
             ]]
         ])
-        @break
+    @break
     @case('select')
         @php
             $select = array_merge(
                 ['select', 'label' => $title,
                     'selected' => $value,
+                    'name' => $name,
                     'wire:model' => 'filtered.' . $name,
                     'col' => 12, 'list' => $filter->getList()
                 ],
@@ -32,6 +33,19 @@
 
         @endphp
         @form([$select])
-        @break
-    @default
+    @break
+    @case('text')
+        @php
+            $_text = array_merge(
+                ['text', 'label' => $title,
+                    'value' => $value,
+                    'name' => $name,
+                    'wire:model.debounce.500ms' => 'filtered.' . $name,
+                    'col' => 12,
+                ],
+                $filter->getOptions([])
+            );
+        @endphp
+        @form([ $_text ])
+    @break
 @endswitch