Merge pull request #391 from rappasoft/develop

v1.11.0

Author: rappasoft

CHANGELOG.md

@@ -4,6 +4,20 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
 
 ## [Unreleased]
 
+## [1.11.0] - 2021-07-10
+
+### Added
+
+- [Added `addAttributes` method to column headers](https://github.com/rappasoft/laravel-livewire-tables/pull/379)
+
+### Changed
+
+- Increased minimum Livewire version
+- Added default empty message to lang file.
+- [Fix people messing with sort direction from URL](https://github.com/rappasoft/laravel-livewire-tables/pull/389)
+- [Check to make sure column exists before sorting](https://github.com/rappasoft/laravel-livewire-tables/pull/390)
+- Removed ability to alter per page dropdown select to bypass allowed values.
+
 ## [1.10.4] - 2021-06-23
 
 ### Added
@@ -414,7 +428,8 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
 
 - Initial release
 
-[Unreleased]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.10.4...development
+[Unreleased]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.11.0...development
+[1.11.0]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.10.4...v1.11.0
 [1.10.4]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.10.3...v1.10.4
 [1.10.3]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.10.2...v1.10.3
 [1.10.2]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.10.1...v1.10.2

composer.json

@@ -19,7 +19,7 @@
     ],
     "require": {
         "php": "^7.4|^8.0",
-        "livewire/livewire": "^2.0",
+        "livewire/livewire": "^2.5.3",
         "spatie/laravel-package-tools": "^1.4.3",
         "illuminate/contracts": "^8.0"
     },

resources/lang/en.json

@@ -21,5 +21,6 @@
     "results": "results",
     "rows": "rows",
     "rows, do you want to select all": "rows, do you want to select all",
+    "No items found. Try narrowing your search.": "No items found. Try narrowing your search.",
     "to": "to"
 }

resources/views/bootstrap-4/components/table/heading.blade.php

@@ -4,16 +4,17 @@
     'sortable' => null,
     'direction' => null,
     'text' => null,
+    'customAttributes' => [],
 ])
 
 @unless ($sortingEnabled && $sortable)
-    <th {{ $attributes->only('class') }}>
+    <th {{ $attributes->merge($customAttributes) }}>
         {{ $text ?? $slot }}
     </th>
 @else
     <th
         wire:click="sortBy('{{ $column }}', '{{ $text ?? $column }}')"
-        {{ $attributes->only('class') }}
+        {{ $attributes->merge($customAttributes) }}
         style="cursor:pointer;"
     >
         <div class="d-flex align-items-center">

resources/views/bootstrap-4/includes/table.blade.php

@@ -27,6 +27,7 @@
                         :direction="$column->column() ? $sorts[$column->column()] ?? null : null"
                         :text="$column->text() ?? ''"
                         :class="$column->class() ?? ''"
+                        :customAttributes="$column->attributes()"
                     />
                 @endif
             @endif

resources/views/bootstrap-5/components/table/heading.blade.php

@@ -4,16 +4,17 @@
     'sortable' => null,
     'direction' => null,
     'text' => null,
+    'customAttributes' => [],
 ])
 
 @unless ($sortingEnabled && $sortable)
-    <th {{ $attributes->only('class') }}>
+    <th {{ $attributes->merge($customAttributes) }}>
         {{ $text ?? $slot }}
     </th>
 @else
     <th
         wire:click="sortBy('{{ $column }}', '{{ $text ?? $column }}')"
-        {{ $attributes->only('class') }}
+        {{ $attributes->merge($customAttributes) }}
         style="cursor:pointer;"
     >
         <div class="d-flex align-items-center">

resources/views/bootstrap-5/includes/table.blade.php

@@ -28,6 +28,7 @@ class="form-check-input"
                         :direction="$column->column() ? $sorts[$column->column()] ?? null : null"
                         :text="$column->text() ?? ''"
                         :class="$column->class() ?? ''"
+                        :customAttributes="$column->attributes()"
                     />
                 @endif
             @endif

resources/views/tailwind/components/table/heading.blade.php

@@ -4,10 +4,11 @@
     'sortable' => null,
     'direction' => null,
     'text' => null,
+    'customAttributes' => [],
 ])
 
 <th
-    {{ $attributes->merge(['class' => 'px-3 py-2 md:px-6 md:py-3 bg-gray-50'])->only('class') }}
+    {{ $attributes->merge(array_merge(['class' => 'px-3 py-2 md:px-6 md:py-3 bg-gray-50'], $customAttributes)) }}
 >
     @unless ($sortingEnabled && $sortable)
         <span class="block text-left text-xs leading-4 font-medium text-gray-500 uppercase tracking-wider">

resources/views/tailwind/includes/table.blade.php

@@ -30,6 +30,7 @@ class="rounded-md shadow-sm border-gray-300 block transition duration-150 ease-i
                         :direction="$column->column() ? $sorts[$column->column()] ?? null : null"
                         :text="$column->text() ?? ''"
                         :class="$column->class() ?? ''"
+                        :customAttributes="$column->attributes()"
                     />
                 @endif
             @endif

src/Traits/WithPerPagePagination.php

@@ -29,6 +29,10 @@ public function mountWithPerPagePagination(): void
 
     public function updatedPerPage($value): void
     {
+        if (! in_array($value, $this->perPageAccepted, false)) {
+            $value = $this->perPage = $this->perPageAccepted[0] ?? 10;
+        }
+
         if (in_array(session()->get($this->getPerPagePaginationSessionKey(), $this->perPage), $this->perPageAccepted, true)) {
             session()->put($this->getPerPagePaginationSessionKey(), (int) $value);
         } else {