Merge branch 'satoved-fix-remove-filter-for-multiselect' into develop

rappasoft · rappasoft · commit 5095e2c109c1 · 2021-10-14T15:47:46.000-04:00
diff --git a/src/Traits/WithFilters.php b/src/Traits/WithFilters.php
@@ -269,9 +269,17 @@ public function getFiltersWithoutSearch(): array
      */
     public function removeFilter($filter): void
     {
-        if (isset($this->filters[$filter])) {
-            $this->filters[$filter] = null;
+        if (! isset($this->filters[$filter])) {
+            return;
+        }
+
+        if ($this->filters()[$filter]->isMultiSelect()) {
+            $this->filters[$filter] = [];
+
+            return;
         }
+
+        $this->filters[$filter] = null;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -269,9 +269,17 @@ public function getFiltersWithoutSearch(): array`
`269`	`269`	`*/`
`270`	`270`	`public function removeFilter($filter): void`
`271`	`271`	`{`
`272`		`- if (isset($this->filters[$filter])) {`
`273`		`- $this->filters[$filter] = null;`
	`272`	`+ if (! isset($this->filters[$filter])) {`
	`273`	`+ return;`
	`274`	`+ }`
	`275`	`+`
	`276`	`+ if ($this->filters()[$filter]->isMultiSelect()) {`
	`277`	`+ $this->filters[$filter] = [];`
	`278`	`+`
	`279`	`+ return;`
`274`	`280`	`}`
	`281`	`+`
	`282`	`+ $this->filters[$filter] = null;`
`275`	`283`	`}`
`276`	`284`
`277`	`285`	`/**`