Merge branch 'develop' into master

Author: lrljoe

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to `laravel-livewire-tables` will be documented in this file
 
+## [v3.2.0] - 2023-01-04
+### Tweaks
+- Migration to new Core Traits, and de-duplication of code by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1623 
+
 ## [v3.1.9] - 2023-12-29
 ### Bug Fixes
 - Fix CHANGELOG.md missing release
@@ -1133,4 +1137,4 @@ Ground Up Rebuild
 [0.1.4]: https://github.com/rappasoft/laravel-livewire-tables/compare/v0.1.3...v0.1.4
 [0.1.3]: https://github.com/rappasoft/laravel-livewire-tables/compare/v0.1.2...v0.1.3
 [0.1.2]: https://github.com/rappasoft/laravel-livewire-tables/compare/v0.1.1...v0.1.2
-[0.1.1]: https://github.com/rappasoft/laravel-livewire-tables/compare/v0.1.0...v0.1.1
+[0.1.1]: https://github.com/rappasoft/laravel-livewire-tables/compare/v0.1.0...v0.1.1

config/livewire-tables.php

@@ -89,5 +89,27 @@
             'suffix' => '', // A suffix to append to the values when displayed
         ],
     ],
+    /**
+     * Configuration options for SelectFilter
+     */
+    'selectFilter' => [
+        'defaultOptions' => [],
+        'defaultConfig' => [],
+    ],
+    /**
+     * Configuration options for MultiSelectFilter
+     */
+    'multiSelectFilter' => [
+        'defaultOptions' => [],
+        'defaultConfig' => [],
+    ],
+
+    /**
+     * Configuration options for MultiSelectFilter
+     */
+    'multiSelectDropdownFilter' => [
+        'defaultOptions' => [],
+        'defaultConfig' => [],
+    ],
 
 ];

phpstan.neon

@@ -15,6 +15,7 @@ parameters:
     reportUnmatchedIgnoredErrors: false
     checkGenericClassInNonGenericObjectType: false
     ignoreErrors:
+        - '#Access to an undefined property Rappasoft\\LaravelLivewireTables\\Views\\Column\:\:\$view#'
         - "#Unsafe usage of new static#"
         - '#on array\<string, non-empty-array\<int\<0, max\>, mixed\>\> in empty\(\) does not exist.#'
         - '#on array<string, non-empty-array<int<0, max>, mixed>> in isset\(\) does not exist#'

pint.json

@@ -1,6 +1,8 @@
 {
     "preset": "laravel",
     "rules": {
+        "single_import_per_statement": false,
+        "no_unused_imports": false,       
         "ordered_traits": false
     }
 }

resources/views/components/table/tr/bulk-actions.blade.php

@@ -5,7 +5,7 @@
     @php
         $colspan = $component->getColspanCount();
         $selectAll = $component->selectAllIsEnabled();
-        $simplePagination = $component->paginationMethod === 'simple';
+        $simplePagination = $component->isPaginationMethod('simple');
     @endphp
 
     @if ($component->isTailwind())

src/Traits/Helpers/CustomisationsHelpers.php

@@ -12,7 +12,7 @@ public function hasExtends(): bool
         return isset($this->extends) && $this->extends !== null;
     }
 
-    public function getExtends()
+    public function getExtends(): ?string
     {
         return $this->extends;
     }
@@ -25,7 +25,7 @@ public function hasSection(): bool
         return isset($this->section) && $this->section !== null;
     }
 
-    public function getSection()
+    public function getSection(): ?string
     {
         return $this->section;
     }
@@ -38,7 +38,7 @@ public function hasSlot(): bool
         return isset($this->slot) && $this->slot !== null;
     }
 
-    public function getSlot()
+    public function getSlot(): ?string
     {
         return $this->slot;
     }
@@ -51,7 +51,7 @@ public function hasLayout(): bool
         return isset($this->layout) && $this->layout !== null;
     }
 
-    public function getLayout()
+    public function getLayout(): ?string
     {
         return $this->layout;
     }

src/Traits/Helpers/FilterHelpers.php

@@ -307,7 +307,7 @@ public function getFiltersByRow(): array
         return $orderedFilters;
     }
 
-    public function hasFilterGenericData()
+    public function hasFilterGenericData(): bool
     {
         return ! empty($this->filterGenericData);
     }

src/Traits/WithPagination.php

@@ -27,7 +27,7 @@ trait WithPagination
     public bool $perPageVisibilityStatus = true;
 
     // standard, simple, cursor
-    public string $paginationMethod = 'standard';
+    protected string $paginationMethod = 'standard';
 
     public array $paginationCurrentItems = [];
 

src/Traits/WithTableAttributes.php

@@ -2,6 +2,7 @@
 
 namespace Rappasoft\LaravelLivewireTables\Traits;
 
+use Closure;
 use Rappasoft\LaravelLivewireTables\Traits\Configuration\TableAttributeConfiguration;
 use Rappasoft\LaravelLivewireTables\Traits\Helpers\TableAttributeHelpers;
 

src/Views/Column.php

@@ -11,6 +11,8 @@ class Column
 
     protected bool $displayColumnLabel = true;
 
+    protected string $view = '';
+
     public function __construct(string $title, ?string $from = null)
     {
         $this->title = trim($title);