Add blade for Livewire Component Array Filter - not live

Author: lrljoe

resources/views/components/tools/filters/livewire-component-array-filter.blade.php

@@ -0,0 +1,4 @@
+<div wire:key="filterComponents.{{ $filter->getKey() }}-wrapper">
+    <x-livewire-tables::tools.filter-label :$filter :$filterLayout :$tableName :$isTailwind :$isBootstrap4 :$isBootstrap5 :$isBootstrap />
+    <livewire:dynamic-component :is="$livewireComponent" :tableComponent="get_class($this)" :filterKey="$filter->getKey()" :$tableName :key="'filterComponents-'.$filter->getKey()" wire:model="filterComponents.{{ $filter->getKey() }}" />
+</div>

src/Traits/Helpers/FilterHelpers.php

@@ -347,7 +347,7 @@ public function showFilterPillsSection(): bool
     }
 
     #[On('livewireArrayFilterUpdateValues')]
-    public function updateLivewireArrayFilterValues(string $filterKey, string $tableName, array $values)
+    public function updateLivewireArrayFilterValues(string $filterKey, string $tableName, array $values): void
     {
         if ($this->tableName == $tableName) {
             $filter = $this->getFilterByKey($filterKey);

src/Views/Filters/LivewireComponentArrayFilter.php

@@ -16,7 +16,7 @@ class LivewireComponentArrayFilter extends Filter
 
     public string $wireMethod = 'blur';
 
-    protected string $view = 'livewire-tables::components.tools.filters.livewire-component-filter';
+    protected string $view = 'livewire-tables::components.tools.filters.livewire-component-array-filter';
 
     public function validate(array $value): array|bool
     {
@@ -50,4 +50,9 @@ public function getFilterPillValue($value): array|string|bool|null
 
         return $values;
     }
+
+    public function getKeys(): array
+    {
+        return array_keys($this->options ?? []);
+    }
 }

src/Views/Traits/Filters/HasOptions.php

@@ -33,7 +33,7 @@ public function options(array $options = []): self
 
     public function getOptions(): array
     {
-        return $this->options ?? $this->options = config($this->optionsPath, []);
+        return $this->options ?? $this->options = (property_exists($this, 'optionsPath') ? config($this->optionsPath, []) : []);
     }
 
     public function getKeys(): array

src/Views/Traits/IsExternalArrayFilter.php

@@ -7,7 +7,7 @@
 trait IsExternalArrayFilter
 {
     #[Modelable]
-    public $value = [];
+    public array $value = [];
 
     public string $filterKey = '';
 
@@ -24,12 +24,10 @@ trait IsExternalArrayFilter
     public array $selectOptions = [];
 
     #[On('filter-was-set')]
-    #[Renderless]
-    public function setFilterValues($tableName, $filterKey, $value)
+    public function setFilterValues(string $tableName, string $filterKey, array $value): void
     {
-        if ($tableName == $this->tableName && $filterKey == $this->filterKey) {
+        if ($tableName == $this->tableName && $filterKey == $this->filterKey && $this->selectedItems != $value) {
             $this->selectedItems = $value;
-            $this->clearFilter();
             $this->needsUpdating = false;
 
         }
@@ -38,37 +36,31 @@ public function setFilterValues($tableName, $filterKey, $value)
     protected function clearFilter() {}
 
     #[Renderless]
-    public function updatedSelectedItems($values)
+    public function updatedSelectedItems(string $value): void
     {
-        $this->needsUpdating = true;
-    }
-
-    protected function enableUpdateDispatch(): void
-    {
-        $this->needsUpdating = true;
-    }
+        if (!$this->needsUpdating)
+        {
+            $this->needsUpdating = true;
 
-    protected function disableUpdateDispatch(): void
-    {
-        $this->needsUpdating = false;
+        }
     }
 
     #[Renderless]
-    protected function sendUpdateDispatch(array $returnValues)
+    protected function sendUpdateDispatch(array $returnValues): void
     {
         if ($this->needsUpdating) {
             if (! empty($returnValues)) {
-                $this->dispatch('livewireArrayFilterUpdateValues', tableName: $this->tableName, filterKey: $this->filterKey, values: $returnValues)->to($this->tableComponent);
                 $this->value = array_keys($returnValues);
             } else {
                 $this->value = [];
             }
-            $this->needsUpdating = false;
+            $this->dispatch('livewireArrayFilterUpdateValues', tableName: $this->tableName, filterKey: $this->filterKey, values: $returnValues)->to($this->tableComponent);
 
         }
     }
 
-    public function renderingIsExternalArrayFilter()
+    #[Renderless]
+    public function renderingIsExternalArrayFilter(): void
     {
         $returnValues = [];