Completes #17

config/config.php

@@ -4,9 +4,6 @@
     // Enable the query string feature of Livewire, saving the filters in the URL
     'enable_query_string' => false,
 
-    // Only allow filters for fields and conditions already loaded in the page to be applied
-    'only_allow_active_filters' => true,
-
     // Validate that the values of radio and checkbox filters are in the available options array
     'validate_filter_values' => true,
 

src/Http/Livewire/LfCheckboxFilter.php

@@ -31,8 +31,6 @@ public function filterOptions()
 
     public function updatedSelected()
     {
-        $this->dispatchFilterMounted();
-
         if (config('statamic-livewire-filters.validate_filter_values')) {
             $this->validate();
         }
@@ -82,8 +80,6 @@ public function rules()
     #[On('preset-params')]
     public function setPresetSort($params)
     {
-        $this->dispatchFilterMounted();
-
         if (array_key_exists($this->getParamKey(), $params)) {
             $this->selected = explode('|', $params[$this->getParamKey()]);
             $this->previousSelected = $this->selected;

src/Http/Livewire/LfDateFilter.php

@@ -16,8 +16,6 @@ class LfDateFilter extends Component
 
     public function updatedSelected()
     {
-        $this->dispatchFilterMounted();
-
         $this->dispatch('filter-updated',
             field: $this->field,
             condition: $this->condition,
@@ -45,8 +43,6 @@ public function clear()
     #[On('preset-params')]
     public function setPresetSort($params)
     {
-        $this->dispatchFilterMounted();
-
         if (array_key_exists($this->getParamKey(), $params)) {
             $this->selected = $params[$this->getParamKey()];
         }

src/Http/Livewire/LfRadioFilter.php

@@ -29,8 +29,6 @@ public function filterOptions()
 
     public function updatedSelected()
     {
-        $this->dispatchFilterMounted();
-
         if (config('statamic-livewire-filters.validate_filter_values')) {
             $this->validate();
         }
@@ -61,8 +59,6 @@ public function rules()
     #[On('preset-params')]
     public function setPresetSort($params)
     {
-        $this->dispatchFilterMounted();
-
         if (array_key_exists($this->getParamKey(), $params)) {
             $this->selected = $params[$this->getParamKey()];
         }

src/Http/Livewire/LfRangeFilter.php

@@ -28,8 +28,6 @@ public function mount($default)
 
     public function dispatchEvent()
     {
-        $this->dispatchFilterMounted();
-
         $this->dispatch('filter-updated',
             field: $this->field,
             condition: $this->condition,
@@ -54,8 +52,6 @@ public function livewireComponentReady()
     #[On('preset-params')]
     public function setPresetSort($params)
     {
-        $this->dispatchFilterMounted();
-
         if (array_key_exists($this->getParamKey(), $params)) {
             $this->selected = $params[$this->getParamKey()];
         }

src/Http/Livewire/LfTextFilter.php

@@ -15,8 +15,6 @@ class LfTextFilter extends Component
 
     public function updatedSelected()
     {
-        $this->dispatchFilterMounted();
-
         $this->dispatch('filter-updated',
             field: $this->field,
             condition: $this->condition,
@@ -36,8 +34,6 @@ public function clear()
     #[On('preset-params')]
     public function setPresetSort($params)
     {
-        $this->dispatchFilterMounted();
-
         if (array_key_exists($this->getParamKey(), $params)) {
             $this->selected = $params[$this->getParamKey()];
         }

src/Http/Livewire/LivewireCollection.php

@@ -18,15 +18,15 @@ class LivewireCollection extends Component
     public $collections;
 
     #[Locked]
-    public $filters;
+    public $allowedFilters;
 
     public $paginate;
 
     public $view = 'livewire-collection';
 
     public function mount($params)
     {
-        $this->filters = collect();
+        $this->allowedFilters = false;
         if (is_null($this->params)) {
             $this->setParameters($params);
         } else {
@@ -35,20 +35,6 @@ public function mount($params)
         $this->dispatchParamsUpdated();
     }
 
-    #[On('filter-mounted')]
-    public function filterMounted($field, $condition, $modifier)
-    {
-        if ($condition === 'query_scope') {
-            $this->filters->push('query_scope:'.$modifier);
-            $this->filters->push($modifier.':'.$field);
-        } elseif ($condition === 'taxonomy') {
-            $this->filters->push('taxonomy:'.$field.':'.$modifier);
-        } else {
-            $this->filters->push($field.':'.$condition);
-        }
-        $this->filters = $this->filters->unique();
-    }
-
     #[On('filter-updated')]
     public function filterUpdated($field, $condition, $payload, $command, $modifier)
     {

src/Http/Livewire/Traits/GenerateParams.php

@@ -9,8 +9,8 @@ trait GenerateParams
 {
     protected function generateParams()
     {
-        $params = config('statamic-livewire-filters.only_allow_active_filters')
-            ? $this->removeParamsNotInFiltersCollection()
+        $params = ($this->allowedFilters && $this->allowedFilters->isNotEmpty())
+            ? $this->removeParamsNotInAllowedFiltersCollection()
             : $this->params;
 
         return Parameters::make(array_merge(
@@ -30,17 +30,17 @@ protected function generateParamsForCount($collection, $params)
         );
     }
 
-    protected function removeParamsNotInFiltersCollection()
+    protected function removeParamsNotInAllowedFiltersCollection()
     {
         return collect($this->params)->filter(function ($value, $key) {
             if ($key === 'sort') {
                 return true;
             }
             if ($key === 'query_scope') {
-                return $this->filters->contains('query_scope:'.$value);
+                return $this->allowedFilters->contains('query_scope:'.$value);
             }
 
-            return $this->filters->contains($key);
+            return $this->allowedFilters->contains($key);
         })->all();
     }
 }

src/Http/Livewire/Traits/HandleParams.php

@@ -13,6 +13,7 @@ public function setParameters($params)
         $this->extractCollectionKeys($paramsCollection);
         $this->extractView($paramsCollection);
         $this->extractPagination($paramsCollection);
+        $this->extractAllowedFilters($paramsCollection);
 
         $this->params = $paramsCollection->all();
         $this->handlePresetParams();
@@ -43,6 +44,13 @@ protected function extractPagination($paramsCollection)
         }
     }
 
+    protected function extractAllowedFilters($paramsCollection)
+    {
+        if ($paramsCollection->has('allowed_filters')) {
+            $this->allowedFilters = collect(explode('|', $paramsCollection->pull('allowed_filters')));
+        }
+    }
+
     protected function handleCondition($field, $condition, $payload, $command)
     {
         $paramKey = $field.':'.$condition;

src/Http/Livewire/Traits/IsLivewireFilter.php

@@ -67,16 +67,6 @@ public function clearFilters()
             ->to(LivewireCollection::class);
     }
 
-    public function dispatchFilterMounted()
-    {
-        $this->dispatch('filter-mounted',
-            field: $this->field,
-            condition: $this->condition,
-            modifier: $this->modifier,
-        )
-            ->to(LivewireCollection::class);
-    }
-
     protected function getParamKey()
     {
         if ($this->condition === 'taxonomy') {

tests/Feature/LfCheckboxFilterTest.php

@@ -141,21 +141,6 @@ public function it_changes_the_value_of_selected_property_when_an_option_is_set_
             );
     }
 
-    /** @test */
-    public function it_sends_the_filter_mounted_event()
-    {
-        Livewire::test(LfCheckboxFilter::class, ['field' => 'item_options', 'blueprint' => 'pages.pages', 'condition' => 'is'])
-            ->assertSet('selected', [])
-            ->set('selected', ['option1'])
-            ->assertSet('selected', ['option1'])
-            ->assertDispatched('filter-mounted',
-                field: 'item_options',
-                condition: 'is',
-                modifier: 'any',
-            );
-
-    }
-
     /** @test */
     public function it_does_not_accept_a_value_not_in_the_options_array()
     {

tests/Feature/LfDateFilterTest.php

@@ -101,20 +101,6 @@ public function it_changes_the_value_of_selected_property_when_the_user_types()
             );
     }
 
-    /** @test */
-    public function it_sends_the_filter_mounted_event()
-    {
-        Livewire::test(LfDateFilter::class, ['field' => 'item_from', 'collection' => 'pages', 'blueprint' => 'pages.pages', 'condition' => 'is_after'])
-            ->assertSet('selected', '')
-            ->set('selected', '2024-03-01')
-            ->assertSet('selected', '2024-03-01')
-            ->assertDispatched('filter-mounted',
-                field: 'item_from',
-                condition: 'is_after',
-                modifier: 'any',
-            );
-    }
-
     /** @test */
     public function it_loads_a_param_that_is_preset()
     {

tests/Feature/LfRadioFilterTest.php

@@ -107,20 +107,6 @@ public function it_changes_the_value_of_selected_property_when_an_option_is_set_
             );
     }
 
-    /** @test */
-    public function it_sends_the_filter_mounted_event()
-    {
-        Livewire::test(LfRadioFilter::class, ['field' => 'item_options', 'collection' => 'pages', 'blueprint' => 'pages.pages', 'condition' => 'is'])
-            ->assertSet('selected', '')
-            ->set('selected', 'option1')
-            ->assertSet('selected', 'option1')
-            ->assertDispatched('filter-mounted',
-                field: 'item_options',
-                condition: 'is',
-                modifier: 'any',
-            );
-    }
-
     /** @test */
     public function it_does_not_accept_a_value_not_in_the_options_array()
     {

tests/Feature/LfRangeFilterTest.php

@@ -123,28 +123,6 @@ public function it_changes_the_value_of_selected_property_when_slider_changes()
             );
     }
 
-    /** @test */
-    public function it_sends_the_filter_mounted_event()
-    {
-        Livewire::test(LfRangeFilter::class, [
-            'field' => 'max_items',
-            'blueprint' => 'pages.pages',
-            'condition' => 'gte',
-            'min' => 1,
-            'max' => 4,
-            'default' => 2,
-
-        ])
-            ->assertSet('selected', 2)
-            ->set('selected', 3)
-            ->assertSet('selected', 3)
-            ->assertDispatched('filter-mounted',
-                field: 'max_items',
-                condition: 'gte',
-                modifier: 'any',
-            );
-    }
-
     /** @test */
     public function it_loads_a_param_that_is_preset()
     {

tests/Feature/LfTextFilterTest.php

@@ -99,20 +99,6 @@ public function it_changes_the_value_of_selected_property_when_the_user_types()
             );
     }
 
-    /** @test */
-    public function it_sends_the_filter_mounted_event()
-    {
-        Livewire::test(LfTextFilter::class, ['field' => 'item_options', 'collection' => 'pages', 'blueprint' => 'pages.pages', 'condition' => 'is'])
-            ->assertSet('selected', '')
-            ->set('selected', 'option1')
-            ->assertSet('selected', 'option1')
-            ->assertDispatched('filter-mounted',
-                field: 'item_options',
-                condition: 'is',
-                modifier: 'any',
-            );
-    }
-
     /** @test */
     public function it_loads_a_param_that_is_preset()
     {