Collapse rework5

.gitignore

@@ -21,3 +21,7 @@ phpunit.xml.bak
 phpstan.txt
 coverage.xml
 ./tmp/**
+./*.php.bk
+src/Views/Filters/Traits/IsExternalArrayFilter.php.bk
+.gitignore
+src/Views/Filters/Traits/IsExternalFilter.php.bk

CHANGELOG.md

@@ -204,7 +204,7 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
 - In LaravelLivewireTablesEvent, change the type to Illuminate\Contracts\Auth\Authenticatable by @khwadj in https://github.com/rappasoft/laravel-livewire-tables/pull/1963
 - Fix for Search Field Attribute Defaults by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1962
 - Fix Filter Pills Icon - Tailwind by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1961
-- Add filterComponents into queryString to ensure they're maintained by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1957
+- Add appliedFilters into queryString to ensure they're maintained by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1957
 - Reset Current Page on "Per Page" changing by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1953
 
 ### New Features
@@ -302,7 +302,7 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
 
 ## [v3.4.8] - 2024-08-18
 ### New Features
-- Add an event dispatch for Filter Was Set when filterComponents is updated by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1861
+- Add an event dispatch for Filter Was Set when appliedFilters is updated by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1861
 
 ## [v3.4.7] - 2024-08-18
 ### Bug Fixes
@@ -483,7 +483,7 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
 - Fix collapsing columns not respecting view point collapse points by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1665
 
 ### Tweaks
-- Migrate "updated" Search and FilterComponents calls to WithSearch and WithFilters by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1666
+- Migrate "updated" Search and appliedFilters calls to WithSearch and WithFilters by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1666
 - Allow nullable search/filter values by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1666
 
 ## [v3.2.0] - 2024-01-04
@@ -697,7 +697,7 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
             - DateFilter & DateTimeFilter fully support setFilterDefaultValue
             - MultiSelectFilter & MultiSelectDropdownFilter both support setFirstOption()
             - There are now two arrays relating to Filters:
-                - A wireable one ($filterComponents)
+                - A wireable one ($appliedFilters)
                 - An unwired one - only keeps track of those filters that have a value ($appliedFilters).  This is what is bound to the query string, and populates the filters on mount if they are present in the query string.
 
         - Livewire 3 Specific

composer.json

@@ -27,7 +27,7 @@
         "blade-ui-kit/blade-heroicons": "^2.1",
         "illuminate/contracts": "^10.0|^11.0|^12.0",
         "illuminate/support": "^10.0|^11.0|^12.0",
-        "livewire/livewire": "^3.0|dev-main"
+        "livewire/livewire": "*"
     },
     "require-dev": {
         "ext-sqlite3": "*",

docs/columns/available-methods.md

@@ -303,6 +303,21 @@ Column::make('Name')
     ->setColumnLabelStatusEnabled()
 ```
 
+### Hiding On Reorder
+
+You may set a Column to be hidden when reordering, this is often effective when you have complex columns that are not relevant to reordering.
+
+As pagination is disabled during reordering, returning a minimal set of columns dramatically improves efficiency.
+
+By default, all Selected Columns are displayed when reordering.
+
+```php
+Column::make('Name')
+    ->hideOnReorder()
+```
+
+
+
 ## See Also
 [Column Styling](./styling)
 

phpstan-baseline.neon

@@ -1,97 +0,0 @@
-parameters:
-	ignoreErrors:
-		-
-			message: '#^Offset ''1'' on array\<string, non\-empty\-list\> in empty\(\) does not exist\.$#'
-			identifier: empty.offset
-			count: 1
-			path: src/DataTableComponent.php
-
-		-
-			message: '#^Offset ''99'' on array\<string, non\-empty\-list\> in isset\(\) does not exist\.$#'
-			identifier: isset.offset
-			count: 1
-			path: src/DataTableComponent.php
-
-		-
-			message: '#^Offset ''99'' on non\-empty\-array\<1\|string, list\> in isset\(\) does not exist\.$#'
-			identifier: isset.offset
-			count: 1
-			path: src/DataTableComponent.php
-
-		-
-			message: '#^Parameter \#1 \$view of function view expects view\-string\|null, string given\.$#'
-			identifier: argument.type
-			count: 1
-			path: src/DataTableComponent.php
-
-		-
-			message: '#^Property Rappasoft\\LaravelLivewireTables\\DataTableComponent\:\:\$model has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: src/DataTableComponent.php
-
-		-
-			message: '#^Parameter \#1 \$view of function view expects view\-string\|null, string given\.$#'
-			identifier: argument.type
-			count: 1
-			path: src/View/Components/FilterPill.php
-
-		-
-			message: '#^Unsafe usage of new static\(\)\.$#'
-			identifier: new.static
-			count: 1
-			path: src/Views/Action.php
-
-		-
-			message: '#^Unsafe usage of new static\(\)\.$#'
-			identifier: new.static
-			count: 1
-			path: src/Views/Column.php
-
-		-
-			message: '#^Unsafe usage of new static\(\)\.$#'
-			identifier: new.static
-			count: 1
-			path: src/Views/Filter.php
-
-		-
-			message: '#^Parameter \#1 \$callback of method Illuminate\\Support\\Collection\<int,string\>\:\:filter\(\) expects \(callable\(string, int\)\: bool\)\|null, Closure\(mixed\)\: int\<0, max\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: src/Views/Filters/MultiSelectDropdownFilter.php
-
-		-
-			message: '#^Unable to resolve the template type TMapWithKeysKey in call to method Illuminate\\Support\\Collection\<\(int\|string\),mixed\>\:\:mapWithKeys\(\)$#'
-			identifier: argument.templateType
-			count: 1
-			path: src/Views/Filters/MultiSelectDropdownFilter.php
-
-		-
-			message: '#^Unable to resolve the template type TMapWithKeysValue in call to method Illuminate\\Support\\Collection\<\(int\|string\),mixed\>\:\:mapWithKeys\(\)$#'
-			identifier: argument.templateType
-			count: 1
-			path: src/Views/Filters/MultiSelectDropdownFilter.php
-
-		-
-			message: '#^Parameter \#1 \$callback of method Illuminate\\Support\\Collection\<int,string\>\:\:filter\(\) expects \(callable\(string, int\)\: bool\)\|null, Closure\(mixed\)\: int\<0, max\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: src/Views/Filters/MultiSelectFilter.php
-
-		-
-			message: '#^Parameter \#1 \$callback of method Illuminate\\Support\\Collection\<int,string\>\:\:filter\(\) expects \(callable\(string, int\)\: bool\)\|null, Closure\(mixed\)\: int\<0, max\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: src/Views/Filters/NumberRangeFilter.php
-
-		-
-			message: '#^Unable to resolve the template type TMapWithKeysKey in call to method Illuminate\\Support\\Collection\<\(int\|string\),mixed\>\:\:mapWithKeys\(\)$#'
-			identifier: argument.templateType
-			count: 1
-			path: src/Views/Filters/SelectFilter.php
-
-		-
-			message: '#^Unable to resolve the template type TMapWithKeysValue in call to method Illuminate\\Support\\Collection\<\(int\|string\),mixed\>\:\:mapWithKeys\(\)$#'
-			identifier: argument.templateType
-			count: 1
-			path: src/Views/Filters/SelectFilter.php

phpstan.neon

@@ -13,31 +13,21 @@ parameters:
     treatPhpDocTypesAsCertain: false
     reportUnmatchedIgnoredErrors: false
     ignoreErrors:
-        - identifier: missingType.generics
-        - identifier: missingType.iterableValue
-        - identifier: trait.unused
-        - identifier: deadCode.unreachable
-        - identifier: booleanNot.alwaysTrue
-          paths:
-            - src/Views/Columns/Traits/HasDataTableComponent.php
-        - identifier: notIdentical.alwaysTrue
-          paths:
-            - src/Traits/Filters/Helpers/FilterPillsHelpers.php
-            - src/Traits/Helpers/CustomisationsHelpers.php
-            - src/Traits/Helpers/QueryHelpers.php
-            - src/Views/Columns/Traits/HasSlot.php
-            - src/Views/Columns/Traits/Helpers/ArrayColumnHelpers.php
-        - identifier: instanceof.alwaysTrue
-          paths:
-            - src/Views/Columns/Traits/HasFooter.php
-            - src/Views/Columns/Traits/HasSecondaryHeader.php
+        - identifier: argument.type
+        - identifier: argument.templateType
+        - identifier: new.static
         - identifier: function.alreadyNarrowedType
           paths: 
-            - src/Views/Columns/Traits/Helpers/ArrayColumnHelpers.php
-            - src/Features/AutoInjectRappasoftAssets.php
-            - src/Traits/WithBulkActions.php
-            - src/Views/Actions/Traits/HasActionAttributes.php
             - src/Views/Filters/MultiSelectDropdownFilter.php
             - src/Views/Filters/Traits/HasOptions.php
-            - src/Views/Traits/Core/HasTheme.php
             - src/Views/Traits/Core/HasView.php
+        - identifier: missingType.generics
+          paths:
+            - src/Traits/WithData.php
+        - identifier: empty.offset
+          paths:
+            - src/Traits/Filters/Helpers/FilterMenuHelpers.php
+        - identifier: isset.offset
+          paths:
+            - src/Traits/Filters/Helpers/FilterMenuHelpers.php
+        - message: '# \$view of function view expects view-string\|null, string given.#'