From 1b3f12c9b629a7755c7bdc9333e1c5268eaff4d8 Mon Sep 17 00:00:00 2001 From: Arman Date: Tue, 11 Aug 2026 03:30:01 +0400 Subject: [PATCH 1/2] Fix pagination alignment and interaction states --- playwright.config.mjs | 6 ++ .../livewire/datatables/datatable.blade.php | 7 +- .../datatables/tailwind-pagination.blade.php | 35 +++++----- .../tailwind-simple-pagination.blade.php | 10 +-- .../views/livewire/datatables/theme.blade.php | 23 +++++++ tests/Browser/editable-csp.spec.mjs | 11 --- tests/Browser/pagination.html | 67 +++++++++++++++++++ tests/Browser/pagination.spec.mjs | 16 +++++ tests/Browser/run-test-server.mjs | 3 + tests/Browser/server.mjs | 11 ++- tests/LivewireDatatableTemplateTest.php | 12 ++++ 11 files changed, 164 insertions(+), 37 deletions(-) create mode 100644 tests/Browser/pagination.html create mode 100644 tests/Browser/pagination.spec.mjs create mode 100644 tests/Browser/run-test-server.mjs diff --git a/playwright.config.mjs b/playwright.config.mjs index 8ddc4a64..bd5a130c 100644 --- a/playwright.config.mjs +++ b/playwright.config.mjs @@ -3,6 +3,12 @@ import { defineConfig } from '@playwright/test'; export default defineConfig({ testDir: './tests/Browser', fullyParallel: false, + workers: 1, + webServer: { + command: 'node tests/Browser/run-test-server.mjs', + url: 'http://127.0.0.1:49187/editable-csp', + reuseExistingServer: false, + }, use: { baseURL: 'http://127.0.0.1:49187', browserName: 'chromium', diff --git a/resources/views/livewire/datatables/datatable.blade.php b/resources/views/livewire/datatables/datatable.blade.php index dd82c654..2daf0657 100644 --- a/resources/views/livewire/datatables/datatable.blade.php +++ b/resources/views/livewire/datatables/datatable.blade.php @@ -201,11 +201,12 @@ class="ld-button ld-button--success px-3 py-2 text-xs font-medium tracking-wider @unless($this->hidePagination)
-
+
{{-- check if there is any data --}} @if(count($this->results))
- @foreach(config('livewire-datatables.per_page_options', [ 10, 25, 50, 100 ]) as $per_page_option) @endforeach @@ -223,7 +224,7 @@ class="ld-button ld-button--success px-3 py-2 text-xs font-medium tracking-wider
-
+
{{__('Results')}} {{ $this->results->firstItem() }} - {{ $this->results->lastItem() }} {{__('of')}} {{ $this->results->total() }}
diff --git a/resources/views/livewire/datatables/tailwind-pagination.blade.php b/resources/views/livewire/datatables/tailwind-pagination.blade.php index b37ea6c1..c40f31b2 100644 --- a/resources/views/livewire/datatables/tailwind-pagination.blade.php +++ b/resources/views/livewire/datatables/tailwind-pagination.blade.php @@ -1,22 +1,23 @@ -