Tweaks to Base

Author: lrljoe

src/Views/Filters/Traits/FilterConfiguration.php

@@ -4,24 +4,7 @@
 
 trait FilterConfiguration
 {
-    public function notResetByClearButton(): self
-    {
-        $this->resetByClearButton = false;
-
-        return $this;
-    }
 
-    /**
-     * Sets a Default Value via the Filter Component
-     *
-     * @param  mixed  $value
-     */
-    public function setFilterDefaultValue($value): self
-    {
-        $this->filterDefaultValue = $value;
-
-        return $this;
-    }
 
     public function setGenericDisplayData(array $genericDisplayData = []): self
     {

src/Views/Filters/Traits/FilterHelpers.php

@@ -32,13 +32,6 @@ public function getKeys(): array
         return [];
     }
 
-    /**
-     * Get the filter options.
-     */
-    public function getDefaultValue(): mixed
-    {
-        return null;
-    }
 
     public function filter(callable $callback): Filter
     {
@@ -57,18 +50,6 @@ public function getFilterCallback(): callable
         return $this->filterCallback;
     }
 
-    public function isResetByClearButton(): bool
-    {
-        return $this->resetByClearButton === true;
-    }
-
-    /**
-     * Determines if the Filter has a Default Value via the Component
-     */
-    public function hasFilterDefaultValue(): bool
-    {
-        return ! is_null($this->filterDefaultValue);
-    }
 
     public function generateWireKey(string $tableName, string $filterType, string $extraData = ''): string
     {

src/Views/Filters/Traits/HandlesClearButton.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;
+
+trait HandlesClearButton
+{
+    protected bool $resetByClearButton = true;
+
+    public function isResetByClearButton(): bool
+    {
+        return $this->resetByClearButton === true;
+    }
+    
+    public function notResetByClearButton(): self
+    {
+        $this->resetByClearButton = false;
+
+        return $this;
+    }
+
+
+}

src/Views/Filters/Traits/HandlesDates.php

@@ -2,11 +2,12 @@
 
 namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;
 
+use Rappasoft\LaravelLivewireTables\Views\Filters\Traits\Pills\HandlesPillsLocale;
 use Carbon\Carbon;
 
 trait HandlesDates
 {
-    use HasPillsLocale;
+    use HandlesPillsLocale;
 
     protected string $inputDateFormat;
 

src/Views/Filters/Traits/HandlesDefaultValue.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;
+
+trait HandlesDefaultValue
+{
+
+    protected mixed $filterDefaultValue = null;
+
+    /**
+     * Sets a Default Value via the Filter Component
+     *
+     * @param  mixed  $value
+     */
+    public function setFilterDefaultValue($value): self
+    {
+        $this->filterDefaultValue = $value;
+
+        return $this;
+    }
+    
+    /**
+     * Get the filter options.
+     */
+    public function getDefaultValue(): mixed
+    {
+        return null;
+    }
+    /**
+     * Determines if the Filter has a Default Value via the Component
+     */
+    public function hasFilterDefaultValue(): bool
+    {
+        return ! is_null($this->filterDefaultValue);
+    }
+
+}

src/Views/Filters/Traits/HasFilterPills.php

@@ -3,18 +3,20 @@
 namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;
 
 use Rappasoft\LaravelLivewireTables\Views\Filters\Traits\Styling\HandlesFilterPillsAttributes;
+use Rappasoft\LaravelLivewireTables\Views\Filters\Traits\Pills\{HandlesPillsAsHtml,HandlesPillsCustomBlade,HandlesPillsLocale};
 
 trait HasFilterPills
 {
-    use HandlesFilterPillsAttributes;
+    use HandlesPillsAsHtml,
+        HandlesPillsCustomBlade,
+        HandlesPillsLocale,
+        HandlesFilterPillsAttributes;
 
     protected ?string $filterPillTitle = null;
 
     protected array $filterPillValues = [];
 
-    protected ?string $filterCustomPillBlade = null;
 
-    protected bool $pillsAsHtml = false;
 
     public function setFilterPillTitle(string $title): self
     {
@@ -33,12 +35,6 @@ public function setFilterPillValues(array $values): self
         return $this;
     }
 
-    public function setFilterPillBlade(string $blade): self
-    {
-        $this->filterCustomPillBlade = $blade;
-
-        return $this;
-    }
 
     public function getCustomFilterPillTitle(): ?string
     {
@@ -71,41 +67,5 @@ public function getCustomFilterPillValue(string $value): ?string
         return $this->getCustomFilterPillValues()[$value] ?? null;
     }
 
-    /**
-     * Determine if filter has a Custom Pill Blade
-     */
-    public function hasCustomPillBlade(): bool
-    {
-        return $this->filterCustomPillBlade != null;
-    }
-
-    /**
-     * Get the path to the Custom Pill Blade
-     */
-    public function getCustomPillBlade(): ?string
-    {
-        return $this->filterCustomPillBlade;
-    }
-
-    public function getPillsAreHtml(): bool
-    {
-        return $this->pillsAsHtml ?? false;
-    }
 
-    public function setPillsAsHtml(bool $status = true): self
-    {
-        $this->pillsAsHtml = $status;
-
-        return $this;
-    }
-
-    public function setPillsAsHtmlEnabled(): self
-    {
-        return $this->setPillsAsHtml(true);
-    }
-
-    public function setPillsAsHtmlDisabled(): self
-    {
-        return $this->setPillsAsHtml(false);
-    }
 }

src/Views/Filters/Traits/IsFilter.php

@@ -8,7 +8,8 @@
 
 trait IsFilter
 {
-    use HasLocalisations,
+    use HandlesDefaultValue,
+        HasLocalisations,
         HasFilterPills,
         HasFilterLabel,
         FilterConfiguration,
@@ -18,17 +19,14 @@ trait IsFilter
         HasLabelAttributes,
         HasVisibility,
         HasView,
-        HandlesFilterInputAttributes;
+        HandlesFilterInputAttributes,
+        HandlesClearButton;
 
     protected string $name;
 
     protected string $key;
 
-    protected bool $resetByClearButton = true;
-
     protected mixed $filterCallback = null;
 
-    protected mixed $filterDefaultValue = null;
-
     public array $genericDisplayData = [];
 }

src/Views/Filters/Traits/Pills/HandlesPillsAsHtml.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits\Pills;
+
+trait HandlesPillsAsHtml
+{
+    protected bool $pillsAsHtml = false;
+
+    public function getPillsAreHtml(): bool
+    {
+        return $this->pillsAsHtml ?? false;
+    }
+
+    public function setPillsAsHtml(bool $status = true): self
+    {
+        $this->pillsAsHtml = $status;
+
+        return $this;
+    }
+
+    public function setPillsAsHtmlEnabled(): self
+    {
+        return $this->setPillsAsHtml(true);
+    }
+
+    public function setPillsAsHtmlDisabled(): self
+    {
+        return $this->setPillsAsHtml(false);
+    }
+}

src/Views/Filters/Traits/Pills/HandlesPillsCustomBlade.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits\Pills;
+
+trait HandlesPillsCustomBlade
+{
+    protected ?string $filterCustomPillBlade = null;
+
+    public function setFilterPillBlade(string $blade): self
+    {
+        $this->filterCustomPillBlade = $blade;
+
+        return $this;
+    }
+
+    
+    /**
+     * Determine if filter has a Custom Pill Blade
+     */
+    public function hasCustomPillBlade(): bool
+    {
+        return $this->filterCustomPillBlade != null;
+    }
+
+    /**
+     * Get the path to the Custom Pill Blade
+     */
+    public function getCustomPillBlade(): ?string
+    {
+        return $this->filterCustomPillBlade;
+    }
+}

src/Views/Filters/Traits/HasPillsLocale.php renamed to src/Views/Filters/Traits/Pills/HandlesPillsLocale.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits\Pills;
 
-trait HasPillsLocale
+trait HandlesPillsLocale
 {
     protected ?string $pillsLocale;
 
@@ -22,4 +22,5 @@ public function getPillsLocale(): string
     {
         return isset($this->pillsLocale) ? $this->pillsLocale : ($this->getConfig('locale') ?? config('app.locale', 'en'));
     }
-}
+
+}