Migrate Filter Code Appropriately

phpunit.xml.dist

@@ -9,10 +9,6 @@
          failOnEmptyTestSuite="false" 
          beStrictAboutOutputDuringTests="true" >
     <testsuites>
-        <testsuite name="Laravel Livewire Tables Unit and Visuals Test Suite">
-            <directory>tests/Unit</directory>
-            <directory>tests/Visuals</directory>
-        </testsuite>
         <testsuite name="Laravel Livewire Tables Unit Test Suite">
             <directory>tests/Unit</directory>
         </testsuite>

src/Traits/Configuration/FilterConfiguration.php

@@ -2,8 +2,6 @@
 
 namespace Rappasoft\LaravelLivewireTables\Traits\Configuration;
 
-use Rappasoft\LaravelLivewireTables\DataTransferObjects\FilterGenericData;
-
 trait FilterConfiguration
 {
     public function setFiltersStatus(bool $status): self
@@ -26,56 +24,4 @@ public function setFiltersDisabled(): self
 
         return $this;
     }
-
-    public function setFiltersVisibilityStatus(bool $status): self
-    {
-        $this->filtersVisibilityStatus = $status;
-
-        return $this;
-    }
-
-    public function setFiltersVisibilityEnabled(): self
-    {
-        $this->setFiltersVisibilityStatus(true);
-
-        return $this;
-    }
-
-    public function setFiltersVisibilityDisabled(): self
-    {
-        $this->setFiltersVisibilityStatus(false);
-
-        return $this;
-    }
-
-    public function setFilterPillsStatus(bool $status): self
-    {
-        $this->filterPillsStatus = $status;
-
-        return $this;
-    }
-
-    public function setFilterPillsEnabled(): self
-    {
-        $this->setFilterPillsStatus(true);
-
-        return $this;
-    }
-
-    public function setFilterPillsDisabled(): self
-    {
-        $this->setFilterPillsStatus(false);
-
-        return $this;
-    }
-
-    public function generateFilterGenericData(): array
-    {
-        return (new FilterGenericData($this->getTableName(), $this->getFilterLayout(), $this->isTailwind(), $this->isBootstrap4(), $this->isBootstrap5()))->toArray();
-    }
-
-    public function setFilterGenericData(array $filterGenericData = []): void
-    {
-        $this->filterGenericData = $filterGenericData;
-    }
 }

src/Traits/Core/Filters/HandlesFilterTraits.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Core\Filters;
+
+trait HandlesFilterTraits
+{
+    use ManagesFilters,
+        HasFilterGenericData,
+        HasFilterMenuStyling,
+        HasFilterPillsStyling,
+        HasFilterQueryString,
+        HasFiltersVisibility;
+}

src/Traits/Core/Filters/HasFilterGenericData.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Core\Filters;
+
+use Livewire\Attributes\Computed;
+use Rappasoft\LaravelLivewireTables\DataTransferObjects\FilterGenericData;
+
+trait HasFilterGenericData
+{
+    public array $filterGenericData = [];
+
+    public function generateFilterGenericData(): array
+    {
+        return (new FilterGenericData($this->getTableName(), $this->getFilterLayout(), $this->isTailwind(), $this->isBootstrap4(), $this->isBootstrap5()))->toArray();
+    }
+
+    public function setFilterGenericData(array $filterGenericData = []): void
+    {
+        $this->filterGenericData = $filterGenericData;
+    }
+
+    public function hasFilterGenericData(): bool
+    {
+        return ! empty($this->filterGenericData);
+    }
+
+    #[Computed]
+    public function getFilterGenericData(): array
+    {
+        if (! $this->hasFilterGenericData()) {
+            $this->setFilterGenericData($this->generateFilterGenericData());
+        }
+
+        return $this->filterGenericData;
+    }
+}

src/Traits/Styling/Helpers/FilterMenuStylingHelpers.php → src/Traits/Core/Filters/HasFilterMenuStyling.php

@@ -1,13 +1,103 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Traits\Styling\Helpers;
+namespace Rappasoft\LaravelLivewireTables\Traits\Core\Filters;
 
+use Closure;
 use Illuminate\Support\Arr;
-use Livewire\Attributes\Computed;
+use Livewire\Attributes\{Computed, Locked};
+use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
 use Rappasoft\LaravelLivewireTables\Views\Filter;
 
-trait FilterMenuStylingHelpers
+trait HasFilterMenuStyling
 {
+    #[Locked]
+    public string $filterLayout = 'popover';
+
+    // Entangled in JS
+    public bool $filterSlideDownDefaultVisible = false;
+
+    protected array $filterPopoverAttributes = ['class' => '', 'default-width' => true, 'default-colors' => true, 'default-styling' => true];
+
+    protected array $filterSlidedownWrapperAttributes = ['class' => '', 'default-colors' => true, 'default-styling' => true];
+
+    protected ?Closure $filterSlidedownRowCallback;
+
+    /**
+     * Used to set attributes for the Filter Popover
+     */
+    public function setFilterPopoverAttributes(array $filterPopoverAttributes): self
+    {
+        $this->filterPopoverAttributes = array_merge($this->filterPopoverAttributes, $filterPopoverAttributes);
+
+        return $this;
+    }
+
+    /**
+     * Used to set attributes for the Filter Slidedown Wrapper
+     */
+    public function setFilterSlidedownWrapperAttributes(array $filterSlidedownWrapperAttributes): self
+    {
+        $this->filterSlidedownWrapperAttributes = array_merge($this->filterSlidedownWrapperAttributes, $filterSlidedownWrapperAttributes);
+
+        return $this;
+    }
+
+    /**
+     * Set a list of attributes to override on the th sort button elements
+     */
+    public function setFilterSlidedownRowAttributes(Closure $callback): self
+    {
+        $this->filterSlidedownRowCallback = $callback;
+
+        return $this;
+    }
+
+    public function setFilterLayout(string $type): self
+    {
+        if (! in_array($type, ['popover', 'slide-down'], true)) {
+            throw new DataTableConfigurationException('Invalid filter layout type');
+        }
+
+        $this->filterLayout = $type;
+
+        return $this;
+    }
+
+    public function setFilterLayoutPopover(): self
+    {
+        $this->setFilterLayout('popover');
+
+        return $this;
+    }
+
+    public function setFilterLayoutSlideDown(): self
+    {
+        $this->setFilterLayout('slide-down');
+
+        return $this;
+    }
+
+    public function setFilterSlideDownDefaultStatus(bool $status): self
+    {
+        $this->filterSlideDownDefaultVisible = $status;
+
+        return $this;
+    }
+
+    public function setFilterSlideDownDefaultStatusDisabled(): self
+    {
+        $this->setFilterSlideDownDefaultStatus(false);
+
+        return $this;
+    }
+
+    public function setFilterSlideDownDefaultStatusEnabled(): self
+    {
+        $this->setFilterSlideDownDefaultStatus(true);
+
+        return $this;
+    }
+
     /**
      * Used to get attributes for the Filter Popover
      *

src/Traits/Core/Filters/HasFilterPillsStyling.php

@@ -0,0 +1,62 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Core\Filters;
+
+use Livewire\Attributes\{Computed, Locked};
+use Rappasoft\LaravelLivewireTables\Views\Filter;
+
+trait HasFilterPillsStyling
+{
+    #[Locked]
+    public bool $filterPillsStatus = true;
+
+    public function setFilterPillsStatus(bool $status): self
+    {
+        $this->filterPillsStatus = $status;
+
+        return $this;
+    }
+
+    public function setFilterPillsEnabled(): self
+    {
+        $this->setFilterPillsStatus(true);
+
+        return $this;
+    }
+
+    public function setFilterPillsDisabled(): self
+    {
+        $this->setFilterPillsStatus(false);
+
+        return $this;
+    }
+
+    #[Computed]
+    public function showFilterPillsSection(): bool
+    {
+        return $this->filtersAreEnabled() && $this->filterPillsAreEnabled() && $this->hasAppliedVisibleFiltersForPills();
+    }
+
+    public function getFilterPillsStatus(): bool
+    {
+        return $this->filterPillsStatus;
+    }
+
+    public function filterPillsAreEnabled(): bool
+    {
+        return $this->getFilterPillsStatus() === true;
+    }
+
+    public function filterPillsAreDisabled(): bool
+    {
+        return $this->getFilterPillsStatus() === false;
+    }
+
+    public function hasAppliedVisibleFiltersForPills(): bool
+    {
+        return collect($this->getAppliedFiltersWithValues())
+            ->map(fn ($_item, $key) => $this->getFilterByKey($key))
+            ->reject(fn (Filter $filter) => $filter->isHiddenFromPills())
+            ->count() > 0;
+    }
+}

src/Traits/Core/QueryStrings/HasQueryStringForFilter.php → src/Traits/Core/Filters/HasFilterQueryString.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Traits\Core\QueryStrings;
+namespace Rappasoft\LaravelLivewireTables\Traits\Core\Filters;
 
 use Livewire\Attributes\Locked;
 
-trait HasQueryStringForFilter
+trait HasFilterQueryString
 {
     #[Locked]
     public ?bool $queryStringStatusForFilter;

src/Traits/Core/Filters/HasFiltersVisibility.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Core\Filters;
+
+use Illuminate\Support\Collection;
+use Livewire\Attributes\Locked;
+use Rappasoft\LaravelLivewireTables\Views\Filter;
+
+trait HasFiltersVisibility
+{
+    public function getFiltersVisibilityStatus(): bool
+    {
+        return $this->filtersVisibilityStatus;
+    }
+
+    public function filtersVisibilityIsEnabled(): bool
+    {
+        return $this->getFiltersVisibilityStatus() === true;
+    }
+
+    public function filtersVisibilityIsDisabled(): bool
+    {
+        return $this->getFiltersVisibilityStatus() === false;
+    }
+
+    public function hasVisibleFilters(): bool
+    {
+        return $this->getFilters()
+            ->reject(fn (Filter $filter) => $filter->isHiddenFromMenus())
+            ->count() > 0;
+    }
+
+    /**
+     * Get whether filter has a configured slide down row.
+     */
+    public function getVisibleFilters(): Collection
+    {
+        return $this->getFilters()->reject(fn (Filter $filter) => $filter->isHiddenFromMenus());
+    }
+
+    #[Locked]
+    public bool $filtersVisibilityStatus = true;
+
+    public function setFiltersVisibilityStatus(bool $status): self
+    {
+        $this->filtersVisibilityStatus = $status;
+
+        return $this;
+    }
+
+    public function setFiltersVisibilityEnabled(): self
+    {
+        $this->setFiltersVisibilityStatus(true);
+
+        return $this;
+    }
+
+    public function setFiltersVisibilityDisabled(): self
+    {
+        $this->setFiltersVisibilityStatus(false);
+
+        return $this;
+    }
+}