From 614e2630100257d391ec5700b6243e8bc3be73f8 Mon Sep 17 00:00:00 2001
From: LRLJoe <joe@lowerrocklabs.com>
Date: Sun, 26 Jan 2025 02:29:04 +0000
Subject: [PATCH 1/2] Initial Migration for FilterView Traits

---
 src/Views/Filter.php                                   |  2 +-
 src/Views/Filters/BooleanFilter.php                    |  2 +-
 src/Views/Filters/DateFilter.php                       |  3 +--
 src/Views/Filters/DateRangeFilter.php                  |  3 +--
 src/Views/Filters/DateTimeFilter.php                   |  3 +--
 src/Views/Filters/LivewireComponentArrayFilter.php     |  3 +--
 src/Views/Filters/LivewireComponentFilter.php          |  3 +--
 src/Views/Filters/MultiSelectDropdownFilter.php        |  3 +--
 src/Views/Filters/MultiSelectFilter.php                |  3 +--
 src/Views/Filters/NumberFilter.php                     |  3 +--
 src/Views/Filters/NumberRangeFilter.php                |  3 +--
 src/Views/Filters/SelectFilter.php                     |  3 +--
 src/Views/Filters/TextFilter.php                       |  3 +--
 .../Traits}/FilterConfiguration.php                    |  2 +-
 .../Helpers => Filters/Traits}/FilterHelpers.php       |  2 +-
 .../Traits}/HandlesApplyingFilter.php                  |  2 +-
 .../Filters => Filters/Traits}/HandlesDates.php        |  2 +-
 .../Filters => Filters/Traits}/HandlesFieldName.php    |  2 +-
 .../Traits}/HandlesWildcardStrings.php                 |  2 +-
 .../{Traits/Filters => Filters/Traits}/HasConfig.php   |  2 +-
 .../Filters => Filters/Traits}/HasCustomPosition.php   |  2 +-
 .../{Traits/Filters => Filters/Traits}/HasOptions.php  |  2 +-
 .../Filters => Filters/Traits}/HasPillsLocale.php      |  2 +-
 .../Filters => Filters/Traits}/HasVisibility.php       |  2 +-
 src/Views/Filters/Traits/HasWireables.php              | 10 ++++++++++
 .../Filters => Filters/Traits}/IsArrayFilter.php       |  2 +-
 .../{ => Filters}/Traits/IsExternalArrayFilter.php     |  2 +-
 src/Views/{ => Filters}/Traits/IsExternalFilter.php    |  2 +-
 src/Views/{ => Filters}/Traits/IsFilter.php            |  7 ++-----
 .../Traits}/IsLivewireComponentFilter.php              |  2 +-
 .../Filters => Filters/Traits}/IsNumericFilter.php     |  2 +-
 .../Filters => Filters/Traits}/IsStringFilter.php      |  2 +-
 .../Traits/Styling/HandlesFilterInputAttributes.php    |  2 +-
 .../Traits/Styling/HandlesFilterLabelAttributes.php    |  2 +-
 34 files changed, 44 insertions(+), 48 deletions(-)
 rename src/Views/{Traits/Configuration => Filters/Traits}/FilterConfiguration.php (96%)
 rename src/Views/{Traits/Helpers => Filters/Traits}/FilterHelpers.php (98%)
 rename src/Views/{Traits/Filters => Filters/Traits}/HandlesApplyingFilter.php (89%)
 rename src/Views/{Traits/Filters => Filters/Traits}/HandlesDates.php (95%)
 rename src/Views/{Traits/Filters => Filters/Traits}/HandlesFieldName.php (85%)
 rename src/Views/{Traits/Filters => Filters/Traits}/HandlesWildcardStrings.php (97%)
 rename src/Views/{Traits/Filters => Filters/Traits}/HasConfig.php (84%)
 rename src/Views/{Traits/Filters => Filters/Traits}/HasCustomPosition.php (96%)
 rename src/Views/{Traits/Filters => Filters/Traits}/HasOptions.php (93%)
 rename src/Views/{Traits/Filters => Filters/Traits}/HasPillsLocale.php (88%)
 rename src/Views/{Traits/Filters => Filters/Traits}/HasVisibility.php (92%)
 create mode 100644 src/Views/Filters/Traits/HasWireables.php
 rename src/Views/{Traits/Filters => Filters/Traits}/IsArrayFilter.php (92%)
 rename src/Views/{ => Filters}/Traits/IsExternalArrayFilter.php (96%)
 rename src/Views/{ => Filters}/Traits/IsExternalFilter.php (68%)
 rename src/Views/{ => Filters}/Traits/IsFilter.php (67%)
 rename src/Views/{Traits/Filters => Filters/Traits}/IsLivewireComponentFilter.php (95%)
 rename src/Views/{Traits/Filters => Filters/Traits}/IsNumericFilter.php (85%)
 rename src/Views/{Traits/Filters => Filters/Traits}/IsStringFilter.php (84%)
 rename src/Views/{ => Filters}/Traits/Styling/HandlesFilterInputAttributes.php (93%)
 rename src/Views/{ => Filters}/Traits/Styling/HandlesFilterLabelAttributes.php (90%)

diff --git a/src/Views/Filter.php b/src/Views/Filter.php
index 966772149..76527c66f 100644
--- a/src/Views/Filter.php
+++ b/src/Views/Filter.php
@@ -3,7 +3,7 @@
 namespace Rappasoft\LaravelLivewireTables\Views;
 
 use Illuminate\Support\Str;
-use Rappasoft\LaravelLivewireTables\Views\Traits\IsFilter;
+use Rappasoft\LaravelLivewireTables\Views\Filters\Traits\IsFilter;
 
 abstract class Filter
 {
diff --git a/src/Views/Filters/BooleanFilter.php b/src/Views/Filters/BooleanFilter.php
index f629a2c48..f15a494ec 100644
--- a/src/Views/Filters/BooleanFilter.php
+++ b/src/Views/Filters/BooleanFilter.php
@@ -3,7 +3,7 @@
 namespace Rappasoft\LaravelLivewireTables\Views\Filters;
 
 use Rappasoft\LaravelLivewireTables\Views\Filter;
-use Rappasoft\LaravelLivewireTables\Views\Traits\Core\HasWireables;
+use Rappasoft\LaravelLivewireTables\Views\Filters\Traits\HasWireables;
 
 class BooleanFilter extends Filter
 {
diff --git a/src/Views/Filters/DateFilter.php b/src/Views/Filters/DateFilter.php
index 44e2aed51..d3d29ad52 100644
--- a/src/Views/Filters/DateFilter.php
+++ b/src/Views/Filters/DateFilter.php
@@ -3,8 +3,7 @@
 namespace Rappasoft\LaravelLivewireTables\Views\Filters;
 
 use Rappasoft\LaravelLivewireTables\Views\Filter;
-use Rappasoft\LaravelLivewireTables\Views\Traits\Core\HasWireables;
-use Rappasoft\LaravelLivewireTables\Views\Traits\Filters\{HandlesDates, HasConfig, IsStringFilter};
+use Rappasoft\LaravelLivewireTables\Views\Filters\Traits\{HandlesDates, HasConfig, HasWireables, IsStringFilter};
 
 class DateFilter extends Filter
 {
diff --git a/src/Views/Filters/DateRangeFilter.php b/src/Views/Filters/DateRangeFilter.php
index 4fe6fb67c..eb8777d2b 100644
--- a/src/Views/Filters/DateRangeFilter.php
+++ b/src/Views/Filters/DateRangeFilter.php
@@ -5,8 +5,7 @@
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Validator;
 use Rappasoft\LaravelLivewireTables\Views\Filter;
-use Rappasoft\LaravelLivewireTables\Views\Traits\Core\HasWireables;
-use Rappasoft\LaravelLivewireTables\Views\Traits\Filters\{HandlesDates, HasConfig, HasOptions};
+use Rappasoft\LaravelLivewireTables\Views\Filters\Traits\{HandlesDates, HasConfig, HasOptions, HasWireables};
 
 class DateRangeFilter extends Filter
 {
diff --git a/src/Views/Filters/DateTimeFilter.php b/src/Views/Filters/DateTimeFilter.php
index 8bb2f05d0..5c3a77339 100644
--- a/src/Views/Filters/DateTimeFilter.php
+++ b/src/Views/Filters/DateTimeFilter.php
@@ -3,8 +3,7 @@
 namespace Rappasoft\LaravelLivewireTables\Views\Filters;
 
 use Rappasoft\LaravelLivewireTables\Views\Filter;
-use Rappasoft\LaravelLivewireTables\Views\Traits\Core\HasWireables;
-use Rappasoft\LaravelLivewireTables\Views\Traits\Filters\{HandlesDates, HasConfig, IsStringFilter};
+use Rappasoft\LaravelLivewireTables\Views\Filters\Traits\{HandlesDates, HasConfig, HasWireables, IsStringFilter};
 
 class DateTimeFilter extends Filter
 {
diff --git a/src/Views/Filters/LivewireComponentArrayFilter.php b/src/Views/Filters/LivewireComponentArrayFilter.php
index ce2c005a3..bc5ed5f92 100644
--- a/src/Views/Filters/LivewireComponentArrayFilter.php
+++ b/src/Views/Filters/LivewireComponentArrayFilter.php
@@ -3,8 +3,7 @@
 namespace Rappasoft\LaravelLivewireTables\Views\Filters;
 
 use Rappasoft\LaravelLivewireTables\Views\Filter;
-use Rappasoft\LaravelLivewireTables\Views\Traits\Core\HasWireables;
-use Rappasoft\LaravelLivewireTables\Views\Traits\Filters\{HasOptions, IsArrayFilter, IsLivewireComponentFilter};
+use Rappasoft\LaravelLivewireTables\Views\Filters\Traits\{HasOptions, HasWireables, IsArrayFilter, IsLivewireComponentFilter};
 
 class LivewireComponentArrayFilter extends Filter
 {
diff --git a/src/Views/Filters/LivewireComponentFilter.php b/src/Views/Filters/LivewireComponentFilter.php
index 82300635a..24555566b 100644
--- a/src/Views/Filters/LivewireComponentFilter.php
+++ b/src/Views/Filters/LivewireComponentFilter.php
@@ -3,8 +3,7 @@
 namespace Rappasoft\LaravelLivewireTables\Views\Filters;
 
 use Rappasoft\LaravelLivewireTables\Views\Filter;
-use Rappasoft\LaravelLivewireTables\Views\Traits\Core\HasWireables;
-use Rappasoft\LaravelLivewireTables\Views\Traits\Filters\IsLivewireComponentFilter;
+use Rappasoft\LaravelLivewireTables\Views\Filters\Traits\{HasWireables, IsLivewireComponentFilter};
 
 class LivewireComponentFilter extends Filter
 {
diff --git a/src/Views/Filters/MultiSelectDropdownFilter.php b/src/Views/Filters/MultiSelectDropdownFilter.php
index 5e8ed566f..9a2283083 100644
--- a/src/Views/Filters/MultiSelectDropdownFilter.php
+++ b/src/Views/Filters/MultiSelectDropdownFilter.php
@@ -4,8 +4,7 @@
 
 use Illuminate\Support\Collection;
 use Rappasoft\LaravelLivewireTables\Views\Filter;
-use Rappasoft\LaravelLivewireTables\Views\Traits\Core\HasWireables;
-use Rappasoft\LaravelLivewireTables\Views\Traits\Filters\{HasOptions, IsArrayFilter};
+use Rappasoft\LaravelLivewireTables\Views\Filters\Traits\{HasOptions, HasWireables, IsArrayFilter};
 
 class MultiSelectDropdownFilter extends Filter
 {
diff --git a/src/Views/Filters/MultiSelectFilter.php b/src/Views/Filters/MultiSelectFilter.php
index c271354aa..d2cbb69e8 100644
--- a/src/Views/Filters/MultiSelectFilter.php
+++ b/src/Views/Filters/MultiSelectFilter.php
@@ -3,8 +3,7 @@
 namespace Rappasoft\LaravelLivewireTables\Views\Filters;
 
 use Rappasoft\LaravelLivewireTables\Views\Filter;
-use Rappasoft\LaravelLivewireTables\Views\Traits\Core\HasWireables;
-use Rappasoft\LaravelLivewireTables\Views\Traits\Filters\{HasOptions, IsArrayFilter};
+use Rappasoft\LaravelLivewireTables\Views\Filters\Traits\{HasOptions, HasWireables, IsArrayFilter};
 
 class MultiSelectFilter extends Filter
 {
diff --git a/src/Views/Filters/NumberFilter.php b/src/Views/Filters/NumberFilter.php
index 9aa8249ce..c45b7982b 100644
--- a/src/Views/Filters/NumberFilter.php
+++ b/src/Views/Filters/NumberFilter.php
@@ -3,8 +3,7 @@
 namespace Rappasoft\LaravelLivewireTables\Views\Filters;
 
 use Rappasoft\LaravelLivewireTables\Views\Filter;
-use Rappasoft\LaravelLivewireTables\Views\Traits\Core\HasWireables;
-use Rappasoft\LaravelLivewireTables\Views\Traits\Filters\{IsNumericFilter};
+use Rappasoft\LaravelLivewireTables\Views\Filters\Traits\{HasWireables, IsNumericFilter};
 
 class NumberFilter extends Filter
 {
diff --git a/src/Views/Filters/NumberRangeFilter.php b/src/Views/Filters/NumberRangeFilter.php
index ae3430b7d..fe3e47dde 100644
--- a/src/Views/Filters/NumberRangeFilter.php
+++ b/src/Views/Filters/NumberRangeFilter.php
@@ -3,8 +3,7 @@
 namespace Rappasoft\LaravelLivewireTables\Views\Filters;
 
 use Rappasoft\LaravelLivewireTables\Views\Filter;
-use Rappasoft\LaravelLivewireTables\Views\Traits\Core\HasWireables;
-use Rappasoft\LaravelLivewireTables\Views\Traits\Filters\{HasOptions};
+use Rappasoft\LaravelLivewireTables\Views\Filters\Traits\{HasOptions, HasWireables};
 
 class NumberRangeFilter extends Filter
 {
diff --git a/src/Views/Filters/SelectFilter.php b/src/Views/Filters/SelectFilter.php
index 4066f91cb..ec56c0fb5 100644
--- a/src/Views/Filters/SelectFilter.php
+++ b/src/Views/Filters/SelectFilter.php
@@ -4,8 +4,7 @@
 
 use Illuminate\Support\Collection;
 use Rappasoft\LaravelLivewireTables\Views\Filter;
-use Rappasoft\LaravelLivewireTables\Views\Traits\Core\HasWireables;
-use Rappasoft\LaravelLivewireTables\Views\Traits\Filters\{HasOptions, IsStringFilter};
+use Rappasoft\LaravelLivewireTables\Views\Filters\Traits\{HasOptions, HasWireables, IsStringFilter};
 
 class SelectFilter extends Filter
 {
diff --git a/src/Views/Filters/TextFilter.php b/src/Views/Filters/TextFilter.php
index 173c5c95c..6477acf67 100644
--- a/src/Views/Filters/TextFilter.php
+++ b/src/Views/Filters/TextFilter.php
@@ -3,8 +3,7 @@
 namespace Rappasoft\LaravelLivewireTables\Views\Filters;
 
 use Rappasoft\LaravelLivewireTables\Views\Filter;
-use Rappasoft\LaravelLivewireTables\Views\Traits\Core\HasWireables;
-use Rappasoft\LaravelLivewireTables\Views\Traits\Filters\{HandlesWildcardStrings, IsStringFilter};
+use Rappasoft\LaravelLivewireTables\Views\Filters\Traits\{HandlesWildcardStrings, HasWireables, IsStringFilter};
 
 class TextFilter extends Filter
 {
diff --git a/src/Views/Traits/Configuration/FilterConfiguration.php b/src/Views/Filters/Traits/FilterConfiguration.php
similarity index 96%
rename from src/Views/Traits/Configuration/FilterConfiguration.php
rename to src/Views/Filters/Traits/FilterConfiguration.php
index 2bc40c32a..2bf3f11b5 100644
--- a/src/Views/Traits/Configuration/FilterConfiguration.php
+++ b/src/Views/Filters/Traits/FilterConfiguration.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Views\Traits\Configuration;
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;
 
 trait FilterConfiguration
 {
diff --git a/src/Views/Traits/Helpers/FilterHelpers.php b/src/Views/Filters/Traits/FilterHelpers.php
similarity index 98%
rename from src/Views/Traits/Helpers/FilterHelpers.php
rename to src/Views/Filters/Traits/FilterHelpers.php
index 5ec88943c..10af4f5d2 100644
--- a/src/Views/Traits/Helpers/FilterHelpers.php
+++ b/src/Views/Filters/Traits/FilterHelpers.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Views\Traits\Helpers;
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;
 
 use Rappasoft\LaravelLivewireTables\Views\Filter;
 
diff --git a/src/Views/Traits/Filters/HandlesApplyingFilter.php b/src/Views/Filters/Traits/HandlesApplyingFilter.php
similarity index 89%
rename from src/Views/Traits/Filters/HandlesApplyingFilter.php
rename to src/Views/Filters/Traits/HandlesApplyingFilter.php
index bb6e6c66b..12a5bf47f 100644
--- a/src/Views/Traits/Filters/HandlesApplyingFilter.php
+++ b/src/Views/Filters/Traits/HandlesApplyingFilter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Views\Traits\Filters;
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;
 
 trait HandlesApplyingFilter
 {
diff --git a/src/Views/Traits/Filters/HandlesDates.php b/src/Views/Filters/Traits/HandlesDates.php
similarity index 95%
rename from src/Views/Traits/Filters/HandlesDates.php
rename to src/Views/Filters/Traits/HandlesDates.php
index b0835b742..c0870f013 100644
--- a/src/Views/Traits/Filters/HandlesDates.php
+++ b/src/Views/Filters/Traits/HandlesDates.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Views\Traits\Filters;
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;
 
 use Carbon\Carbon;
 
diff --git a/src/Views/Traits/Filters/HandlesFieldName.php b/src/Views/Filters/Traits/HandlesFieldName.php
similarity index 85%
rename from src/Views/Traits/Filters/HandlesFieldName.php
rename to src/Views/Filters/Traits/HandlesFieldName.php
index 344d47cfe..e07b229e6 100644
--- a/src/Views/Traits/Filters/HandlesFieldName.php
+++ b/src/Views/Filters/Traits/HandlesFieldName.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Views\Traits\Filters;
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;
 
 trait HandlesFieldName
 {
diff --git a/src/Views/Traits/Filters/HandlesWildcardStrings.php b/src/Views/Filters/Traits/HandlesWildcardStrings.php
similarity index 97%
rename from src/Views/Traits/Filters/HandlesWildcardStrings.php
rename to src/Views/Filters/Traits/HandlesWildcardStrings.php
index af085905f..2bc05ffd0 100644
--- a/src/Views/Traits/Filters/HandlesWildcardStrings.php
+++ b/src/Views/Filters/Traits/HandlesWildcardStrings.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Views\Traits\Filters;
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;
 
 use Illuminate\Database\Eloquent\Builder;
 
diff --git a/src/Views/Traits/Filters/HasConfig.php b/src/Views/Filters/Traits/HasConfig.php
similarity index 84%
rename from src/Views/Traits/Filters/HasConfig.php
rename to src/Views/Filters/Traits/HasConfig.php
index 60755c155..dede3b9d7 100644
--- a/src/Views/Traits/Filters/HasConfig.php
+++ b/src/Views/Filters/Traits/HasConfig.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Views\Traits\Filters;
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;
 
 trait HasConfig
 {
diff --git a/src/Views/Traits/Filters/HasCustomPosition.php b/src/Views/Filters/Traits/HasCustomPosition.php
similarity index 96%
rename from src/Views/Traits/Filters/HasCustomPosition.php
rename to src/Views/Filters/Traits/HasCustomPosition.php
index 4bdb670ee..d57c38a2c 100644
--- a/src/Views/Traits/Filters/HasCustomPosition.php
+++ b/src/Views/Filters/Traits/HasCustomPosition.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Views\Traits\Filters;
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;
 
 trait HasCustomPosition
 {
diff --git a/src/Views/Traits/Filters/HasOptions.php b/src/Views/Filters/Traits/HasOptions.php
similarity index 93%
rename from src/Views/Traits/Filters/HasOptions.php
rename to src/Views/Filters/Traits/HasOptions.php
index 059c37b8c..f36756e55 100644
--- a/src/Views/Traits/Filters/HasOptions.php
+++ b/src/Views/Filters/Traits/HasOptions.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Views\Traits\Filters;
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;
 
 trait HasOptions
 {
diff --git a/src/Views/Traits/Filters/HasPillsLocale.php b/src/Views/Filters/Traits/HasPillsLocale.php
similarity index 88%
rename from src/Views/Traits/Filters/HasPillsLocale.php
rename to src/Views/Filters/Traits/HasPillsLocale.php
index a3ad474d1..52b196c22 100644
--- a/src/Views/Traits/Filters/HasPillsLocale.php
+++ b/src/Views/Filters/Traits/HasPillsLocale.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Views\Traits\Filters;
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;
 
 trait HasPillsLocale
 {
diff --git a/src/Views/Traits/Filters/HasVisibility.php b/src/Views/Filters/Traits/HasVisibility.php
similarity index 92%
rename from src/Views/Traits/Filters/HasVisibility.php
rename to src/Views/Filters/Traits/HasVisibility.php
index 13631c270..0b8591829 100644
--- a/src/Views/Traits/Filters/HasVisibility.php
+++ b/src/Views/Filters/Traits/HasVisibility.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Views\Traits\Filters;
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;
 
 use Rappasoft\LaravelLivewireTables\Views\Traits\Core\HasVisibility as HasCoreVisibility;
 
diff --git a/src/Views/Filters/Traits/HasWireables.php b/src/Views/Filters/Traits/HasWireables.php
new file mode 100644
index 000000000..25af3547f
--- /dev/null
+++ b/src/Views/Filters/Traits/HasWireables.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;
+
+use Rappasoft\LaravelLivewireTables\Views\Traits\Core\HasWireables as HasWireablesCore;
+
+trait HasWireables
+{
+    use HasWireablesCore;
+}
\ No newline at end of file
diff --git a/src/Views/Traits/Filters/IsArrayFilter.php b/src/Views/Filters/Traits/IsArrayFilter.php
similarity index 92%
rename from src/Views/Traits/Filters/IsArrayFilter.php
rename to src/Views/Filters/Traits/IsArrayFilter.php
index cf66f4804..c730e3f7e 100644
--- a/src/Views/Traits/Filters/IsArrayFilter.php
+++ b/src/Views/Filters/Traits/IsArrayFilter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Views\Traits\Filters;
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;
 
 trait IsArrayFilter
 {
diff --git a/src/Views/Traits/IsExternalArrayFilter.php b/src/Views/Filters/Traits/IsExternalArrayFilter.php
similarity index 96%
rename from src/Views/Traits/IsExternalArrayFilter.php
rename to src/Views/Filters/Traits/IsExternalArrayFilter.php
index 15feb3bf4..1c09a2b62 100644
--- a/src/Views/Traits/IsExternalArrayFilter.php
+++ b/src/Views/Filters/Traits/IsExternalArrayFilter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Views\Traits;
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;
 
 use Livewire\Attributes\{Modelable, On, Renderless};
 
diff --git a/src/Views/Traits/IsExternalFilter.php b/src/Views/Filters/Traits/IsExternalFilter.php
similarity index 68%
rename from src/Views/Traits/IsExternalFilter.php
rename to src/Views/Filters/Traits/IsExternalFilter.php
index b2073c126..ffc1090a2 100644
--- a/src/Views/Traits/IsExternalFilter.php
+++ b/src/Views/Filters/Traits/IsExternalFilter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Views\Traits;
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;
 
 use Livewire\Attributes\Modelable;
 
diff --git a/src/Views/Traits/IsFilter.php b/src/Views/Filters/Traits/IsFilter.php
similarity index 67%
rename from src/Views/Traits/IsFilter.php
rename to src/Views/Filters/Traits/IsFilter.php
index ed1db9067..b2b42bef8 100644
--- a/src/Views/Traits/IsFilter.php
+++ b/src/Views/Filters/Traits/IsFilter.php
@@ -1,13 +1,10 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Views\Traits;
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;
 
 use Rappasoft\LaravelLivewireTables\Traits\Core\HasLocalisations;
-use Rappasoft\LaravelLivewireTables\Views\Traits\Configuration\FilterConfiguration;
 use Rappasoft\LaravelLivewireTables\Views\Traits\Core\{HasConfig, HasLabelAttributes, HasView};
-use Rappasoft\LaravelLivewireTables\Views\Traits\Filters\{HasCustomPosition, HasVisibility};
-use Rappasoft\LaravelLivewireTables\Views\Traits\Helpers\FilterHelpers;
-use Rappasoft\LaravelLivewireTables\Views\Traits\Styling\{HandlesFilterInputAttributes, HandlesFilterLabelAttributes};
+use Rappasoft\LaravelLivewireTables\Views\Filters\Traits\Styling\{HandlesFilterInputAttributes, HandlesFilterLabelAttributes};
 
 trait IsFilter
 {
diff --git a/src/Views/Traits/Filters/IsLivewireComponentFilter.php b/src/Views/Filters/Traits/IsLivewireComponentFilter.php
similarity index 95%
rename from src/Views/Traits/Filters/IsLivewireComponentFilter.php
rename to src/Views/Filters/Traits/IsLivewireComponentFilter.php
index fbcf83d0a..9d05a0b95 100644
--- a/src/Views/Traits/Filters/IsLivewireComponentFilter.php
+++ b/src/Views/Filters/Traits/IsLivewireComponentFilter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Views\Traits\Filters;
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;
 
 use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
 
diff --git a/src/Views/Traits/Filters/IsNumericFilter.php b/src/Views/Filters/Traits/IsNumericFilter.php
similarity index 85%
rename from src/Views/Traits/Filters/IsNumericFilter.php
rename to src/Views/Filters/Traits/IsNumericFilter.php
index 6ce4a6d28..0d613b50b 100644
--- a/src/Views/Traits/Filters/IsNumericFilter.php
+++ b/src/Views/Filters/Traits/IsNumericFilter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Views\Traits\Filters;
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;
 
 trait IsNumericFilter
 {
diff --git a/src/Views/Traits/Filters/IsStringFilter.php b/src/Views/Filters/Traits/IsStringFilter.php
similarity index 84%
rename from src/Views/Traits/Filters/IsStringFilter.php
rename to src/Views/Filters/Traits/IsStringFilter.php
index 2c505bad9..28616bc87 100644
--- a/src/Views/Traits/Filters/IsStringFilter.php
+++ b/src/Views/Filters/Traits/IsStringFilter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Views\Traits\Filters;
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;
 
 trait IsStringFilter
 {
diff --git a/src/Views/Traits/Styling/HandlesFilterInputAttributes.php b/src/Views/Filters/Traits/Styling/HandlesFilterInputAttributes.php
similarity index 93%
rename from src/Views/Traits/Styling/HandlesFilterInputAttributes.php
rename to src/Views/Filters/Traits/Styling/HandlesFilterInputAttributes.php
index a921c7808..9c1873f74 100644
--- a/src/Views/Traits/Styling/HandlesFilterInputAttributes.php
+++ b/src/Views/Filters/Traits/Styling/HandlesFilterInputAttributes.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Views\Traits\Styling;
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits\Styling;
 
 use Illuminate\View\ComponentAttributeBag;
 
diff --git a/src/Views/Traits/Styling/HandlesFilterLabelAttributes.php b/src/Views/Filters/Traits/Styling/HandlesFilterLabelAttributes.php
similarity index 90%
rename from src/Views/Traits/Styling/HandlesFilterLabelAttributes.php
rename to src/Views/Filters/Traits/Styling/HandlesFilterLabelAttributes.php
index b175478a9..d35588ab5 100644
--- a/src/Views/Traits/Styling/HandlesFilterLabelAttributes.php
+++ b/src/Views/Filters/Traits/Styling/HandlesFilterLabelAttributes.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Views\Traits\Styling;
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits\Styling;
 
 use Illuminate\View\ComponentAttributeBag;
 

From 6454a906e4d76b93cce9d7b2c35d1fccc4e62246 Mon Sep 17 00:00:00 2001
From: lrljoe <104938042+lrljoe@users.noreply.github.com>
Date: Sun, 26 Jan 2025 02:29:32 +0000
Subject: [PATCH 2/2] Fix styling

---
 src/Views/Filters/Traits/HasWireables.php | 2 +-
 src/Views/Filters/Traits/IsFilter.php     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Views/Filters/Traits/HasWireables.php b/src/Views/Filters/Traits/HasWireables.php
index 25af3547f..eb3c07b12 100644
--- a/src/Views/Filters/Traits/HasWireables.php
+++ b/src/Views/Filters/Traits/HasWireables.php
@@ -7,4 +7,4 @@
 trait HasWireables
 {
     use HasWireablesCore;
-}
\ No newline at end of file
+}
diff --git a/src/Views/Filters/Traits/IsFilter.php b/src/Views/Filters/Traits/IsFilter.php
index b2b42bef8..61cd61a4d 100644
--- a/src/Views/Filters/Traits/IsFilter.php
+++ b/src/Views/Filters/Traits/IsFilter.php
@@ -3,8 +3,8 @@
 namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;
 
 use Rappasoft\LaravelLivewireTables\Traits\Core\HasLocalisations;
-use Rappasoft\LaravelLivewireTables\Views\Traits\Core\{HasConfig, HasLabelAttributes, HasView};
 use Rappasoft\LaravelLivewireTables\Views\Filters\Traits\Styling\{HandlesFilterInputAttributes, HandlesFilterLabelAttributes};
+use Rappasoft\LaravelLivewireTables\Views\Traits\Core\{HasConfig, HasLabelAttributes, HasView};
 
 trait IsFilter
 {