Add data tables, sort headers and M3 paginators
tests / lint (push) Successful in 1m0s
tests / feature (8.4) (push) Successful in 1m10s
tests / feature (8.5) (push) Successful in 1m6s
tests / browser (chrome, chromium) (push) Successful in 3m28s
tests / browser (firefox, firefox) (push) Successful in 4m20s
tests / browser (safari, webkit) (push) Failing after 6m16s
tests / lint (push) Successful in 1m0s
tests / feature (8.4) (push) Successful in 1m10s
tests / feature (8.5) (push) Successful in 1m6s
tests / browser (chrome, chromium) (push) Successful in 3m28s
tests / browser (firefox, firefox) (push) Successful in 4m20s
tests / browser (safari, webkit) (push) Failing after 6m16s
A data table styled from descendant selectors, a Livewire sort header with aria-sort, and Laravel's and Livewire's full and simple paginators drawn in M3, put in front of their own views. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01V9NnLxnPp8vaaurb3Z1MFy
This commit is contained in:
co-authored by
Claude Opus 5
parent
f90695cedd
commit
83ed671c4e
@@ -49,6 +49,20 @@ return [
|
|||||||
'variant' => 'outlined',
|
'variant' => 'outlined',
|
||||||
],
|
],
|
||||||
|
|
||||||
|
/*
|
||||||
|
|--------------------------------------------------------------------------
|
||||||
|
| Pagination
|
||||||
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
||||||
|
| Draw Laravel's and Livewire's paginators in M3: the package's views are
|
||||||
|
| put in front of `pagination::tailwind` and `livewire::tailwind` (and
|
||||||
|
| their simple versions). An application's own published pagination views
|
||||||
|
| still win.
|
||||||
|
|
|
||||||
|
*/
|
||||||
|
|
||||||
|
'pagination' => true,
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
| Node
|
| Node
|
||||||
|
|||||||
@@ -549,6 +549,31 @@ An avatar that opens a menu: `name`, `email`, `avatar` (image URL or initials; d
|
|||||||
|
|
||||||
Switches `$store.theme`: `mode="toggle"` (default, light/dark icon button), `cycle` (light → dark → system), `picker` (segmented buttons for settings pages). Every toggle on a page shares the store.
|
Switches `$store.theme`: `mode="toggle"` (default, light/dark icon button), `cycle` (light → dark → system), `picker` (segmented buttons for settings pages). Every toggle on a page shares the store.
|
||||||
|
|
||||||
|
### `<x-table>`, `<x-sort-header>`
|
||||||
|
|
||||||
|
A data table: write plain `<thead>`, `<tr>`, `<th>`, `<td>` inside `<x-table>` (`size="xs"` for a dense one); cell utilities (`text-end`, `whitespace-nowrap`) always win. Scrolling is yours: wrap it in `<div class="overflow-x-auto">`. A row that opens something is `data-list-row` with one `data-list-open` control; a selected row is `aria-selected="true"`.
|
||||||
|
|
||||||
|
`<x-sort-header column="size" :sort-by="$sortBy">Size</x-sort-header>` sorts through the Livewire property `sortBy` (`['column' => …, 'direction' => 'asc'|'desc']`; `model` names another), with `aria-sort`.
|
||||||
|
|
||||||
|
```blade
|
||||||
|
<div class="overflow-x-auto">
|
||||||
|
<x-table>
|
||||||
|
<thead><tr><x-sort-header column="name" :sort-by="$sortBy">Name</x-sort-header><th class="text-end">Size</th></tr></thead>
|
||||||
|
<tbody>
|
||||||
|
@foreach ($shares as $share)
|
||||||
|
<tr data-list-row wire:key="share-{{ $share->id }}">
|
||||||
|
<td><a href="{{ route('shares.show', $share) }}" data-list-open wire:navigate>{{ $share->name }}</a></td>
|
||||||
|
<td class="text-end tabular-nums">{{ $share->size }}</td>
|
||||||
|
</tr>
|
||||||
|
@endforeach
|
||||||
|
</tbody>
|
||||||
|
</x-table>
|
||||||
|
</div>
|
||||||
|
{{ $shares->links() }}
|
||||||
|
```
|
||||||
|
|
||||||
|
Pagination: `$paginator->links()` (Laravel and Livewire, full and simple/cursor) is drawn in M3 — current page in secondary-container, "Page 2 of 7" on a phone. Turn off with `config('livewire-material.pagination')` = `false`; published `vendor/pagination` or `vendor/livewire` views still win.
|
||||||
|
|
||||||
## Testing the design
|
## Testing the design
|
||||||
|
|
||||||
```php
|
```php
|
||||||
|
|||||||
@@ -0,0 +1,78 @@
|
|||||||
|
/*
|
||||||
|
* Data tables: `<x-table>` (resources/views/components/table.blade.php), whose callers write plain
|
||||||
|
* `<thead>`, `<tr>`, `<th>` and `<td>` inside it.
|
||||||
|
*
|
||||||
|
* So the styling is descendant selectors on the one attribute the component sets, all inside
|
||||||
|
* `:where()` and `@layer components`: a caller's `text-end` or `whitespace-nowrap` on a cell always
|
||||||
|
* wins. Header cells in title-small on-surface-variant over an outline-variant rule, body cells in
|
||||||
|
* body-medium between faint rules. One density step tighter on a fine pointer — keyed on the
|
||||||
|
* pointer, not the width, so a touch tablet in landscape keeps rows a finger can hit. A row that
|
||||||
|
* opens something is `data-list-row` and answers a pointer as a list row does (components/list.css).
|
||||||
|
*/
|
||||||
|
|
||||||
|
@layer components {
|
||||||
|
/* `relative` makes the table the containing block for anything absolute inside it — an `sr-only`
|
||||||
|
header label, a tooltip. Without it they escape the scroll box and widen a phone's layout
|
||||||
|
viewport. */
|
||||||
|
[data-table] {
|
||||||
|
--cell-x: 0.75rem;
|
||||||
|
--cell-y: 0.75rem;
|
||||||
|
|
||||||
|
position: relative;
|
||||||
|
width: 100%;
|
||||||
|
border-collapse: collapse;
|
||||||
|
color: var(--md-sys-color-on-surface);
|
||||||
|
font: var(--md-sys-typescale-body-md);
|
||||||
|
letter-spacing: var(--md-sys-typescale-body-md-tracking);
|
||||||
|
}
|
||||||
|
|
||||||
|
[data-table][data-size="xs"] {
|
||||||
|
--cell-x: 0.5rem;
|
||||||
|
--cell-y: 0.5rem;
|
||||||
|
|
||||||
|
font: var(--md-sys-typescale-body-sm);
|
||||||
|
letter-spacing: var(--md-sys-typescale-body-sm-tracking);
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (pointer: fine) {
|
||||||
|
[data-table] {
|
||||||
|
--cell-y: 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
[data-table][data-size="xs"] {
|
||||||
|
--cell-y: 0.25rem;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[data-table] :where(th, td) {
|
||||||
|
padding: var(--cell-y) var(--cell-x);
|
||||||
|
text-align: start;
|
||||||
|
vertical-align: middle;
|
||||||
|
}
|
||||||
|
|
||||||
|
[data-table] :where(thead th) {
|
||||||
|
color: var(--md-sys-color-on-surface-variant);
|
||||||
|
font: var(--md-sys-typescale-title-sm);
|
||||||
|
letter-spacing: var(--md-sys-typescale-title-sm-tracking);
|
||||||
|
white-space: nowrap;
|
||||||
|
border-bottom: 1px solid var(--md-sys-color-outline-variant);
|
||||||
|
}
|
||||||
|
|
||||||
|
[data-table][data-size="xs"] :where(thead th) {
|
||||||
|
font: var(--md-sys-typescale-label-md);
|
||||||
|
letter-spacing: var(--md-sys-typescale-label-md-tracking);
|
||||||
|
}
|
||||||
|
|
||||||
|
[data-table] :where(tbody tr) {
|
||||||
|
border-bottom: 1px solid color-mix(in srgb, var(--md-sys-color-outline-variant) 60%, transparent);
|
||||||
|
}
|
||||||
|
|
||||||
|
[data-table] :where(tbody tr:last-child) {
|
||||||
|
border-bottom: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
[data-table] :where(tbody tr[aria-selected="true"]) {
|
||||||
|
background-color: var(--md-sys-color-secondary-container);
|
||||||
|
color: var(--md-sys-color-on-secondary-container);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -29,6 +29,7 @@
|
|||||||
@import './components/tabs.css';
|
@import './components/tabs.css';
|
||||||
@import './components/app-bar.css';
|
@import './components/app-bar.css';
|
||||||
@import './components/toolbar.css';
|
@import './components/toolbar.css';
|
||||||
|
@import './components/table.css';
|
||||||
|
|
||||||
@layer base {
|
@layer base {
|
||||||
html {
|
html {
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
{{-- A column header that sorts the table, bound to a Livewire property shaped
|
||||||
|
`['column' => …, 'direction' => 'asc'|'desc']` — `sortBy` by default, or the one `model` names.
|
||||||
|
|
||||||
|
Pressing it sorts by this column, ascending first and then flipping; the arrow says which way,
|
||||||
|
and `aria-sort` says it to a screen reader. A column that cannot be sorted is a plain `<th>`.
|
||||||
|
`class` lands on the `<th>` (`text-end` for a number column moves the button with it). --}}
|
||||||
|
|
||||||
|
@props([
|
||||||
|
'sortBy' => [],
|
||||||
|
'column',
|
||||||
|
'model' => 'sortBy',
|
||||||
|
])
|
||||||
|
|
||||||
|
@php
|
||||||
|
$active = ($sortBy['column'] ?? null) === $column;
|
||||||
|
$direction = $active ? (($sortBy['direction'] ?? 'asc') === 'desc' ? 'desc' : 'asc') : null;
|
||||||
|
$next = $active && $direction === 'asc' ? 'desc' : 'asc';
|
||||||
|
@endphp
|
||||||
|
|
||||||
|
<th @if ($active) aria-sort="{{ $direction === 'asc' ? 'ascending' : 'descending' }}" @endif {{ $attributes }}>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
wire:click="$set('{{ $model }}', {{ json_encode(['column' => $column, 'direction' => $next]) }})"
|
||||||
|
data-sort-header
|
||||||
|
@class([
|
||||||
|
'group/sort focus-ring inline-flex cursor-pointer items-center gap-1 rounded-corner-xs',
|
||||||
|
'text-on-surface' => $active,
|
||||||
|
'hover:text-on-surface' => ! $active,
|
||||||
|
])
|
||||||
|
>
|
||||||
|
{{ $slot }}
|
||||||
|
<x-icon :name="$direction === 'desc' ? 'arrow_downward' : 'arrow_upward'" :class="\Illuminate\Support\Arr::toCssClasses([
|
||||||
|
'size-4 transition-opacity duration-(--md-sys-motion-effects-fast-duration)',
|
||||||
|
'opacity-0 group-hover/sort:opacity-60 group-focus-visible/sort:opacity-60' => ! $active,
|
||||||
|
])" />
|
||||||
|
</button>
|
||||||
|
</th>
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
{{-- A data table. Its callers write `<thead>`, `<tr>`, `<th>` and `<td>` as they always do; how they
|
||||||
|
look is resources/css/components/table.css, keyed on the `data-table` attribute set here (the
|
||||||
|
top of that file says why).
|
||||||
|
|
||||||
|
`size="xs"` for a table inside a panel inside a panel. A selected row is
|
||||||
|
`<tr aria-selected="true">`. Horizontal scrolling stays the caller's — wrap the table in
|
||||||
|
`<div class="overflow-x-auto">` where the page needs it. A column that sorts is
|
||||||
|
`<x-sort-header>`. --}}
|
||||||
|
|
||||||
|
@props([
|
||||||
|
'size' => 'sm',
|
||||||
|
])
|
||||||
|
|
||||||
|
<table data-table data-size="{{ $size === 'xs' ? 'xs' : 'sm' }}" {{ $attributes }}>
|
||||||
|
{{ $slot }}
|
||||||
|
</table>
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
{{-- Laravel's simple and cursor paginator, drawn in M3: previous and next as outlined buttons
|
||||||
|
(the package puts this in front of `pagination::simple-tailwind`). --}}
|
||||||
|
|
||||||
|
@if ($paginator->hasPages())
|
||||||
|
<nav role="navigation" aria-label="{{ __('Pagination Navigation') }}" data-pagination class="flex items-center justify-between gap-4">
|
||||||
|
@if ($paginator->onFirstPage())
|
||||||
|
<x-button variant="outlined" icon="chevron_left" :label="__('Previous')" disabled />
|
||||||
|
@else
|
||||||
|
<x-button variant="outlined" icon="chevron_left" :label="__('Previous')" :link="$paginator->previousPageUrl()" no-wire-navigate rel="prev" />
|
||||||
|
@endif
|
||||||
|
|
||||||
|
@if ($paginator->hasMorePages())
|
||||||
|
<x-button variant="outlined" icon-right="chevron_right" :label="__('Next')" :link="$paginator->nextPageUrl()" no-wire-navigate rel="next" />
|
||||||
|
@else
|
||||||
|
<x-button variant="outlined" icon-right="chevron_right" :label="__('Next')" disabled />
|
||||||
|
@endif
|
||||||
|
</nav>
|
||||||
|
@endif
|
||||||
@@ -0,0 +1,57 @@
|
|||||||
|
{{-- Laravel's paginator (`$items->links()` outside Livewire), drawn in M3 as Livewire's is
|
||||||
|
(resources/views/pagination/livewire/tailwind.blade.php): links instead of actions, the current
|
||||||
|
page in secondary-container, "Page 2 of 7" on a phone. The package puts this in front of
|
||||||
|
`pagination::tailwind` (config `livewire-material.pagination`). --}}
|
||||||
|
|
||||||
|
@php
|
||||||
|
$step = 'grid size-10 place-items-center rounded-corner-full type-label-lg tabular-nums';
|
||||||
|
$live = $step.' state-layer focus-ring text-on-surface';
|
||||||
|
$dead = $step.' text-on-surface/38';
|
||||||
|
@endphp
|
||||||
|
|
||||||
|
@if ($paginator->hasPages())
|
||||||
|
<nav role="navigation" aria-label="{{ __('Pagination Navigation') }}" data-pagination class="flex items-center justify-between gap-4">
|
||||||
|
<p class="type-body-sm text-on-surface-variant">
|
||||||
|
<span class="sm:hidden">{{ __('Page :page of :pages', ['page' => $paginator->currentPage(), 'pages' => $paginator->lastPage()]) }}</span>
|
||||||
|
<span class="max-sm:hidden">{{ __(':first–:last of :total', ['first' => $paginator->firstItem(), 'last' => $paginator->lastItem(), 'total' => $paginator->total()]) }}</span>
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<div class="flex items-center gap-1">
|
||||||
|
@if ($paginator->onFirstPage())
|
||||||
|
<span class="{{ $dead }}" aria-disabled="true" aria-label="{{ __('Previous') }}">
|
||||||
|
<x-icon name="chevron_left" class="size-6 rtl:-scale-x-100" />
|
||||||
|
</span>
|
||||||
|
@else
|
||||||
|
<a href="{{ $paginator->previousPageUrl() }}" rel="prev" class="{{ $live }}" aria-label="{{ __('Previous') }}">
|
||||||
|
<x-icon name="chevron_left" class="size-6 rtl:-scale-x-100" />
|
||||||
|
</a>
|
||||||
|
@endif
|
||||||
|
|
||||||
|
@foreach ($elements as $element)
|
||||||
|
@if (is_string($element))
|
||||||
|
<span class="{{ $dead }} max-sm:hidden" aria-disabled="true">{{ $element }}</span>
|
||||||
|
@endif
|
||||||
|
|
||||||
|
@if (is_array($element))
|
||||||
|
@foreach ($element as $page => $url)
|
||||||
|
@if ($page == $paginator->currentPage())
|
||||||
|
<span aria-current="page" class="{{ $step }} bg-secondary-container text-on-secondary-container max-sm:hidden">{{ $page }}</span>
|
||||||
|
@else
|
||||||
|
<a href="{{ $url }}" class="{{ $live }} max-sm:hidden" aria-label="{{ __('Go to page :page', ['page' => $page]) }}">{{ $page }}</a>
|
||||||
|
@endif
|
||||||
|
@endforeach
|
||||||
|
@endif
|
||||||
|
@endforeach
|
||||||
|
|
||||||
|
@if ($paginator->hasMorePages())
|
||||||
|
<a href="{{ $paginator->nextPageUrl() }}" rel="next" class="{{ $live }}" aria-label="{{ __('Next') }}">
|
||||||
|
<x-icon name="chevron_right" class="size-6 rtl:-scale-x-100" />
|
||||||
|
</a>
|
||||||
|
@else
|
||||||
|
<span class="{{ $dead }}" aria-disabled="true" aria-label="{{ __('Next') }}">
|
||||||
|
<x-icon name="chevron_right" class="size-6 rtl:-scale-x-100" />
|
||||||
|
</span>
|
||||||
|
@endif
|
||||||
|
</div>
|
||||||
|
</nav>
|
||||||
|
@endif
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
{{-- Livewire's simple and cursor paginator, drawn in M3: previous and next as outlined buttons
|
||||||
|
(the package puts this in front of `livewire::simple-tailwind`). --}}
|
||||||
|
|
||||||
|
@php
|
||||||
|
if (! isset($scrollTo)) {
|
||||||
|
$scrollTo = 'body';
|
||||||
|
}
|
||||||
|
|
||||||
|
$scrollIntoViewJsSnippet = ($scrollTo !== false)
|
||||||
|
? <<<JS
|
||||||
|
(\$el.closest('{$scrollTo}') || document.querySelector('{$scrollTo}')).scrollIntoView()
|
||||||
|
JS
|
||||||
|
: '';
|
||||||
|
|
||||||
|
$cursor = method_exists($paginator, 'getCursorName');
|
||||||
|
@endphp
|
||||||
|
|
||||||
|
<div>
|
||||||
|
@if ($paginator->hasPages())
|
||||||
|
<nav role="navigation" aria-label="{{ __('Pagination Navigation') }}" data-pagination class="flex items-center justify-between gap-4">
|
||||||
|
@if ($paginator->onFirstPage())
|
||||||
|
<x-button variant="outlined" icon="chevron_left" :label="__('Previous')" disabled />
|
||||||
|
@elseif ($cursor)
|
||||||
|
@php($previousCursor = $paginator->previousCursor() ?? $paginator->cursor())
|
||||||
|
<x-button variant="outlined" icon="chevron_left" :label="__('Previous')" wire:key="cursor-{{ $paginator->getCursorName() }}-{{ $previousCursor?->encode() }}" wire:click="setPage('{{ $previousCursor?->encode() }}', '{{ $paginator->getCursorName() }}')" x-on:click="{{ $scrollIntoViewJsSnippet }}" wire:loading.attr="disabled" dusk="previousPage" />
|
||||||
|
@else
|
||||||
|
<x-button variant="outlined" icon="chevron_left" :label="__('Previous')" wire:click="previousPage('{{ $paginator->getPageName() }}')" x-on:click="{{ $scrollIntoViewJsSnippet }}" wire:loading.attr="disabled" dusk="previousPage" />
|
||||||
|
@endif
|
||||||
|
|
||||||
|
@if (! $paginator->hasMorePages())
|
||||||
|
<x-button variant="outlined" icon-right="chevron_right" :label="__('Next')" disabled />
|
||||||
|
@elseif ($cursor)
|
||||||
|
@php($nextCursor = $paginator->nextCursor() ?? $paginator->cursor())
|
||||||
|
<x-button variant="outlined" icon-right="chevron_right" :label="__('Next')" wire:key="cursor-{{ $paginator->getCursorName() }}-{{ $nextCursor?->encode() }}" wire:click="setPage('{{ $nextCursor?->encode() }}', '{{ $paginator->getCursorName() }}')" x-on:click="{{ $scrollIntoViewJsSnippet }}" wire:loading.attr="disabled" dusk="nextPage" />
|
||||||
|
@else
|
||||||
|
<x-button variant="outlined" icon-right="chevron_right" :label="__('Next')" wire:click="nextPage('{{ $paginator->getPageName() }}')" x-on:click="{{ $scrollIntoViewJsSnippet }}" wire:loading.attr="disabled" dusk="nextPage" />
|
||||||
|
@endif
|
||||||
|
</nav>
|
||||||
|
@endif
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,76 @@
|
|||||||
|
{{-- Livewire's paginator, drawn in M3. The package puts this in front of Livewire's own
|
||||||
|
`livewire::tailwind` (config `livewire-material.pagination`), whose gray and blue classes do
|
||||||
|
not exist in an M3 theme.
|
||||||
|
|
||||||
|
The wiring is Livewire's, unchanged: `previousPage`, `nextPage` and `gotoPage` with the page
|
||||||
|
name, and the scroll back to the top of whatever `scrollTo` names. Page numbers are 40px
|
||||||
|
icon-button targets; the current one is the selected state, secondary-container, never the
|
||||||
|
action colour — it is where you are, not what to do next. On a phone the numbers give way to
|
||||||
|
"Page 2 of 7". --}}
|
||||||
|
|
||||||
|
@php
|
||||||
|
if (! isset($scrollTo)) {
|
||||||
|
$scrollTo = 'body';
|
||||||
|
}
|
||||||
|
|
||||||
|
$scrollIntoViewJsSnippet = ($scrollTo !== false)
|
||||||
|
? <<<JS
|
||||||
|
(\$el.closest('{$scrollTo}') || document.querySelector('{$scrollTo}')).scrollIntoView()
|
||||||
|
JS
|
||||||
|
: '';
|
||||||
|
|
||||||
|
$step = 'grid size-10 place-items-center rounded-corner-full type-label-lg tabular-nums';
|
||||||
|
$live = $step.' state-layer focus-ring cursor-pointer text-on-surface';
|
||||||
|
$dead = $step.' text-on-surface/38';
|
||||||
|
@endphp
|
||||||
|
|
||||||
|
<div>
|
||||||
|
@if ($paginator->hasPages())
|
||||||
|
<nav role="navigation" aria-label="{{ __('Pagination Navigation') }}" data-pagination class="flex items-center justify-between gap-4">
|
||||||
|
<p class="type-body-sm text-on-surface-variant">
|
||||||
|
<span class="sm:hidden">{{ __('Page :page of :pages', ['page' => $paginator->currentPage(), 'pages' => $paginator->lastPage()]) }}</span>
|
||||||
|
<span class="max-sm:hidden">{{ __(':first–:last of :total', ['first' => $paginator->firstItem(), 'last' => $paginator->lastItem(), 'total' => $paginator->total()]) }}</span>
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<div class="flex items-center gap-1">
|
||||||
|
@if ($paginator->onFirstPage())
|
||||||
|
<span class="{{ $dead }}" aria-disabled="true" aria-label="{{ __('Previous') }}">
|
||||||
|
<x-icon name="chevron_left" class="size-6 rtl:-scale-x-100" />
|
||||||
|
</span>
|
||||||
|
@else
|
||||||
|
<button type="button" wire:click="previousPage('{{ $paginator->getPageName() }}')" x-on:click="{{ $scrollIntoViewJsSnippet }}" wire:loading.attr="disabled" dusk="previousPage{{ $paginator->getPageName() == 'page' ? '' : '.'.$paginator->getPageName() }}" class="{{ $live }}" aria-label="{{ __('Previous') }}">
|
||||||
|
<x-icon name="chevron_left" class="size-6 rtl:-scale-x-100" />
|
||||||
|
</button>
|
||||||
|
@endif
|
||||||
|
|
||||||
|
@foreach ($elements as $element)
|
||||||
|
@if (is_string($element))
|
||||||
|
<span class="{{ $dead }} max-sm:hidden" aria-disabled="true">{{ $element }}</span>
|
||||||
|
@endif
|
||||||
|
|
||||||
|
@if (is_array($element))
|
||||||
|
@foreach ($element as $page => $url)
|
||||||
|
<span wire:key="paginator-{{ $paginator->getPageName() }}-page{{ $page }}" class="max-sm:hidden">
|
||||||
|
@if ($page == $paginator->currentPage())
|
||||||
|
<span aria-current="page" class="{{ $step }} bg-secondary-container text-on-secondary-container">{{ $page }}</span>
|
||||||
|
@else
|
||||||
|
<button type="button" wire:click="gotoPage({{ $page }}, '{{ $paginator->getPageName() }}')" x-on:click="{{ $scrollIntoViewJsSnippet }}" class="{{ $live }}" aria-label="{{ __('Go to page :page', ['page' => $page]) }}">{{ $page }}</button>
|
||||||
|
@endif
|
||||||
|
</span>
|
||||||
|
@endforeach
|
||||||
|
@endif
|
||||||
|
@endforeach
|
||||||
|
|
||||||
|
@if ($paginator->hasMorePages())
|
||||||
|
<button type="button" wire:click="nextPage('{{ $paginator->getPageName() }}')" x-on:click="{{ $scrollIntoViewJsSnippet }}" wire:loading.attr="disabled" dusk="nextPage{{ $paginator->getPageName() == 'page' ? '' : '.'.$paginator->getPageName() }}" class="{{ $live }}" aria-label="{{ __('Next') }}">
|
||||||
|
<x-icon name="chevron_right" class="size-6 rtl:-scale-x-100" />
|
||||||
|
</button>
|
||||||
|
@else
|
||||||
|
<span class="{{ $dead }}" aria-disabled="true" aria-label="{{ __('Next') }}">
|
||||||
|
<x-icon name="chevron_right" class="size-6 rtl:-scale-x-100" />
|
||||||
|
</span>
|
||||||
|
@endif
|
||||||
|
</div>
|
||||||
|
</nav>
|
||||||
|
@endif
|
||||||
|
</div>
|
||||||
@@ -22,5 +22,6 @@
|
|||||||
@include('livewire-material::showcase.sections.chips')
|
@include('livewire-material::showcase.sections.chips')
|
||||||
@include('livewire-material::showcase.sections.sliders')
|
@include('livewire-material::showcase.sections.sliders')
|
||||||
@include('livewire-material::showcase.sections.bars')
|
@include('livewire-material::showcase.sections.bars')
|
||||||
|
@include('livewire-material::showcase.sections.data')
|
||||||
</main>
|
</main>
|
||||||
@endsection
|
@endsection
|
||||||
|
|||||||
@@ -18,7 +18,7 @@
|
|||||||
<a href="{{ route('livewire-material.showcase') }}" class="shrink-0 type-title-lg max-sm:hidden">Livewire Material</a>
|
<a href="{{ route('livewire-material.showcase') }}" class="shrink-0 type-title-lg max-sm:hidden">Livewire Material</a>
|
||||||
|
|
||||||
<nav class="-my-2 flex min-w-0 flex-1 gap-x-4 overflow-x-auto py-2 whitespace-nowrap type-label-lg text-on-surface-variant [scrollbar-width:none]" aria-label="Sections">
|
<nav class="-my-2 flex min-w-0 flex-1 gap-x-4 overflow-x-auto py-2 whitespace-nowrap type-label-lg text-on-surface-variant [scrollbar-width:none]" aria-label="Sections">
|
||||||
@foreach (['colour' => 'Colour', 'type' => 'Type', 'shape' => 'Shape', 'elevation' => 'Elevation', 'motion' => 'Motion', 'icons' => 'Icons', 'buttons' => 'Buttons', 'menus' => 'Menus', 'communication' => 'Communication', 'progress' => 'Progress', 'containment' => 'Containment', 'carousel' => 'Carousel', 'fields' => 'Fields', 'chips' => 'Chips', 'sliders' => 'Sliders', 'bars' => 'Bars'] as $anchor => $section)
|
@foreach (['colour' => 'Colour', 'type' => 'Type', 'shape' => 'Shape', 'elevation' => 'Elevation', 'motion' => 'Motion', 'icons' => 'Icons', 'buttons' => 'Buttons', 'menus' => 'Menus', 'communication' => 'Communication', 'progress' => 'Progress', 'containment' => 'Containment', 'carousel' => 'Carousel', 'fields' => 'Fields', 'chips' => 'Chips', 'sliders' => 'Sliders', 'bars' => 'Bars', 'data' => 'Data'] as $anchor => $section)
|
||||||
<a href="#{{ $anchor }}" class="rounded-corner-xs hover:text-on-surface focus-ring">{{ $section }}</a>
|
<a href="#{{ $anchor }}" class="rounded-corner-xs hover:text-on-surface focus-ring">{{ $section }}</a>
|
||||||
@endforeach
|
@endforeach
|
||||||
</nav>
|
</nav>
|
||||||
|
|||||||
@@ -0,0 +1,56 @@
|
|||||||
|
@php
|
||||||
|
$examples = [
|
||||||
|
'Data table' => <<<'BLADE'
|
||||||
|
<div class="w-full overflow-x-auto">
|
||||||
|
<x-table>
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<x-sort-header column="name" :sort-by="['column' => 'name', 'direction' => 'asc']">Name</x-sort-header>
|
||||||
|
<x-sort-header column="size" :sort-by="['column' => 'name', 'direction' => 'asc']" class="text-end">Size</x-sort-header>
|
||||||
|
<th>Expires</th>
|
||||||
|
<th><span class="sr-only">Actions</span></th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
<tr data-list-row>
|
||||||
|
<td><a href="#data" data-list-open>contract.pdf</a></td>
|
||||||
|
<td class="text-end tabular-nums">1.2 MB</td>
|
||||||
|
<td>in 1 hour</td>
|
||||||
|
<td class="text-end"><x-button icon="more_vert" tooltip="More" /></td>
|
||||||
|
</tr>
|
||||||
|
<tr data-list-row aria-selected="true">
|
||||||
|
<td><a href="#data" data-list-open>design-review.mp4</a></td>
|
||||||
|
<td class="text-end tabular-nums">3.4 GB</td>
|
||||||
|
<td>in 7 days</td>
|
||||||
|
<td class="text-end"><x-button icon="more_vert" tooltip="More" /></td>
|
||||||
|
</tr>
|
||||||
|
<tr data-list-row>
|
||||||
|
<td><a href="#data" data-list-open>holiday-photos.zip</a></td>
|
||||||
|
<td class="text-end tabular-nums">248 MB</td>
|
||||||
|
<td>in 3 days</td>
|
||||||
|
<td class="text-end"><x-button icon="more_vert" tooltip="More" /></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</x-table>
|
||||||
|
</div>
|
||||||
|
BLADE,
|
||||||
|
'Pagination' => <<<'BLADE'
|
||||||
|
<div class="grid w-full gap-6">
|
||||||
|
{{ (new \Illuminate\Pagination\LengthAwarePaginator(range(1, 10), 95, 10, 3, ['path' => '#data']))->links() }}
|
||||||
|
{{ (new \Illuminate\Pagination\Paginator(range(1, 11), 10, 2, ['path' => '#data']))->links() }}
|
||||||
|
</div>
|
||||||
|
BLADE,
|
||||||
|
];
|
||||||
|
@endphp
|
||||||
|
|
||||||
|
<section id="data" class="scroll-mt-24 space-y-6">
|
||||||
|
<h2 class="type-headline-md">Data</h2>
|
||||||
|
|
||||||
|
<p class="max-w-3xl type-body-md text-on-surface-variant">
|
||||||
|
<code><x-table></code>, <code><x-sort-header></code>, and Laravel's and Livewire's paginators.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
@foreach ($examples as $title => $code)
|
||||||
|
<x-showcase::example :$title :$code />
|
||||||
|
@endforeach
|
||||||
|
</section>
|
||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace NoNameWeb\LivewireMaterial;
|
namespace NoNameWeb\LivewireMaterial;
|
||||||
|
|
||||||
|
use Illuminate\Contracts\View\Factory;
|
||||||
use Illuminate\Support\Facades\Blade;
|
use Illuminate\Support\Facades\Blade;
|
||||||
use Illuminate\Support\Facades\Route;
|
use Illuminate\Support\Facades\Route;
|
||||||
use Illuminate\Support\ServiceProvider;
|
use Illuminate\Support\ServiceProvider;
|
||||||
@@ -21,6 +22,7 @@ class LivewireMaterialServiceProvider extends ServiceProvider
|
|||||||
$this->loadTranslationsFrom(__DIR__.'/../lang', 'livewire-material');
|
$this->loadTranslationsFrom(__DIR__.'/../lang', 'livewire-material');
|
||||||
|
|
||||||
$this->registerComponents();
|
$this->registerComponents();
|
||||||
|
$this->registerPagination();
|
||||||
$this->registerShowcase();
|
$this->registerShowcase();
|
||||||
|
|
||||||
if ($this->app->runningInConsole()) {
|
if ($this->app->runningInConsole()) {
|
||||||
@@ -45,6 +47,24 @@ class LivewireMaterialServiceProvider extends ServiceProvider
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Put the M3 paginators in front of Laravel's and Livewire's own. Prepended to their
|
||||||
|
* namespaces rather than set as the default view, because Livewire sets its own default on
|
||||||
|
* every render; an application's published `vendor/pagination` or `vendor/livewire` views are
|
||||||
|
* looked up before any namespace path, so they still win.
|
||||||
|
*/
|
||||||
|
protected function registerPagination(): void
|
||||||
|
{
|
||||||
|
if (! config('livewire-material.pagination')) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->callAfterResolving('view', function (Factory $view): void {
|
||||||
|
$view->prependNamespace('pagination', __DIR__.'/../resources/views/pagination/laravel');
|
||||||
|
$view->prependNamespace('livewire', __DIR__.'/../resources/views/pagination/livewire');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* blade-icons registers a class-based <x-icon> of its own, and Blade resolves a
|
* blade-icons registers a class-based <x-icon> of its own, and Blade resolves a
|
||||||
* registered class alias before any anonymous component path, so ours would never
|
* registered class alias before any anonymous component path, so ours would never
|
||||||
|
|||||||
@@ -0,0 +1,105 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Contracts\View\View;
|
||||||
|
use Illuminate\Pagination\LengthAwarePaginator;
|
||||||
|
use Illuminate\Support\Facades\Blade;
|
||||||
|
use Illuminate\Support\Facades\Route;
|
||||||
|
use Livewire\Component;
|
||||||
|
use Livewire\Livewire;
|
||||||
|
use Livewire\WithPagination;
|
||||||
|
|
||||||
|
class DataProbe extends Component
|
||||||
|
{
|
||||||
|
use WithPagination;
|
||||||
|
|
||||||
|
/** @var array{column: string, direction: string} */
|
||||||
|
public array $sortBy = ['column' => 'name', 'direction' => 'asc'];
|
||||||
|
|
||||||
|
public function render(): View
|
||||||
|
{
|
||||||
|
$files = collect(range(1, 25))->map(fn (int $n): array => ['name' => sprintf('file-%02d.zip', $n), 'size' => $n * 3 % 17]);
|
||||||
|
$files = $files->sortBy($this->sortBy['column'], SORT_REGULAR, $this->sortBy['direction'] === 'desc')->values();
|
||||||
|
$page = $this->getPage();
|
||||||
|
|
||||||
|
return view('probe::data', [
|
||||||
|
'files' => new LengthAwarePaginator($files->forPage($page, 10)->values(), $files->count(), 10, $page),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function dataProbe()
|
||||||
|
{
|
||||||
|
$views = sys_get_temp_dir().'/livewire-material-data-probe';
|
||||||
|
@mkdir($views);
|
||||||
|
file_put_contents($views.'/data.blade.php', <<<'BLADE'
|
||||||
|
<div class="p-4">
|
||||||
|
<x-table>
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<x-sort-header column="name" :sort-by="$sortBy" id="by-name">Name</x-sort-header>
|
||||||
|
<x-sort-header column="size" :sort-by="$sortBy" id="by-size">Size</x-sort-header>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
@foreach ($files as $file)
|
||||||
|
<tr wire:key="file-{{ $file['name'] }}"><td>{{ $file['name'] }}</td><td>{{ $file['size'] }}</td></tr>
|
||||||
|
@endforeach
|
||||||
|
</tbody>
|
||||||
|
</x-table>
|
||||||
|
|
||||||
|
{{ $files->links() }}
|
||||||
|
</div>
|
||||||
|
BLADE);
|
||||||
|
app('view')->addNamespace('probe', $views);
|
||||||
|
|
||||||
|
Livewire::component('data-probe', DataProbe::class);
|
||||||
|
|
||||||
|
Route::middleware('web')->get('/data-probe', fn () => Blade::render(<<<'BLADE'
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<x-theme-script />
|
||||||
|
@vite(config('livewire-material.showcase.vite'))
|
||||||
|
@livewireStyles
|
||||||
|
</head>
|
||||||
|
<body class="bg-surface">
|
||||||
|
<livewire:data-probe />
|
||||||
|
@livewireScripts
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
BLADE));
|
||||||
|
|
||||||
|
return visit('/data-probe')->waitForEvent('networkidle')
|
||||||
|
->assertScript("document.readyState === 'complete' && typeof window.Alpine !== 'undefined' && typeof window.Livewire !== 'undefined'");
|
||||||
|
}
|
||||||
|
|
||||||
|
it('sorts by a column and flips the direction on a second press', function () {
|
||||||
|
$first = "document.querySelector('tbody tr td').textContent.trim()";
|
||||||
|
|
||||||
|
$page = dataProbe()
|
||||||
|
->assertAttribute('#by-name', 'aria-sort', 'ascending')
|
||||||
|
->assertScript("{$first} === 'file-01.zip'");
|
||||||
|
|
||||||
|
$page->click('#by-name button')
|
||||||
|
->assertAttribute('#by-name', 'aria-sort', 'descending')
|
||||||
|
->assertScript("{$first} === 'file-25.zip'");
|
||||||
|
|
||||||
|
$page->click('#by-size button')
|
||||||
|
->assertAttribute('#by-size', 'aria-sort', 'ascending')
|
||||||
|
->assertScript("! document.querySelector('#by-name').hasAttribute('aria-sort')");
|
||||||
|
});
|
||||||
|
|
||||||
|
it('pages through Livewire results and marks the current page', function () {
|
||||||
|
$page = dataProbe()
|
||||||
|
->assertSee('1–10 of 25')
|
||||||
|
->assertAttribute('[data-pagination] [aria-current="page"]', 'aria-current', 'page')
|
||||||
|
->click('[data-pagination] button[aria-label="Go to page 3"]')
|
||||||
|
->assertSee('21–25 of 25')
|
||||||
|
->assertSeeIn('[data-pagination] [aria-current="page"]', '3');
|
||||||
|
|
||||||
|
$page->click('[data-pagination] button[aria-label="Previous"]')
|
||||||
|
->assertSee('11–20 of 25');
|
||||||
|
|
||||||
|
$page->resize(400, 800)
|
||||||
|
->assertSee('Page 2 of 3');
|
||||||
|
});
|
||||||
@@ -0,0 +1,68 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Pagination\LengthAwarePaginator;
|
||||||
|
use Illuminate\Pagination\Paginator;
|
||||||
|
use Livewire\Component;
|
||||||
|
use Livewire\Livewire;
|
||||||
|
use Livewire\WithPagination;
|
||||||
|
|
||||||
|
it('marks a table for its styles and takes a size', function () {
|
||||||
|
expect((string) $this->blade('<x-table class="min-w-160"><tbody><tr><td>a</td></tr></tbody></x-table>'))
|
||||||
|
->toContain('<table data-table data-size="sm" class="min-w-160">')
|
||||||
|
->and((string) $this->blade('<x-table size="xs" />'))->toContain('data-size="xs"')
|
||||||
|
->and((string) $this->blade('<x-table size="huge" />'))->toContain('data-size="sm"');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('sorts by its column, ascending first and then flipping', function () {
|
||||||
|
expect((string) $this->blade('<x-sort-header column="size" :sort-by="[\'column\' => \'name\', \'direction\' => \'asc\']">Size</x-sort-header>'))
|
||||||
|
->not->toContain('aria-sort')
|
||||||
|
->toContain('wire:click="$set(\'sortBy\', {"column":"size","direction":"asc"})"')
|
||||||
|
->and((string) $this->blade('<x-sort-header column="size" model="order" :sort-by="[\'column\' => \'size\', \'direction\' => \'asc\']" class="text-end">Size</x-sort-header>'))
|
||||||
|
->toContain('aria-sort="ascending"')
|
||||||
|
->toContain('class="text-end"')
|
||||||
|
->toContain('$set(\'order\', {"column":"size","direction":"desc"})')
|
||||||
|
->and((string) $this->blade('<x-sort-header column="size" :sort-by="[\'column\' => \'size\', \'direction\' => \'desc\']">Size</x-sort-header>'))
|
||||||
|
->toContain('aria-sort="descending"')
|
||||||
|
->toContain('"direction":"asc"');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('draws Laravel\'s paginators in M3', function () {
|
||||||
|
$pages = new LengthAwarePaginator(range(1, 10), 95, 10, 3, ['path' => '/shares']);
|
||||||
|
|
||||||
|
expect((string) $pages->links())
|
||||||
|
->toContain('data-pagination')
|
||||||
|
->toContain('Page 3 of 10')
|
||||||
|
->toContain('21–30 of 95')
|
||||||
|
->toContain('<span aria-current="page" class="grid size-10 place-items-center rounded-corner-full type-label-lg tabular-nums bg-secondary-container text-on-secondary-container max-sm:hidden">3</span>')
|
||||||
|
->toContain('href="/shares?page=2" rel="prev"')
|
||||||
|
->toContain('aria-label="Go to page 4"')
|
||||||
|
->not->toContain('text-gray');
|
||||||
|
|
||||||
|
expect((string) (new Paginator(range(1, 11), 10, 2, ['path' => '/shares']))->links())
|
||||||
|
->toContain('data-pagination')
|
||||||
|
->toContain('href="/shares?page=1"')
|
||||||
|
->toContain('href="/shares?page=3"')
|
||||||
|
->toContain('Previous');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('draws Livewire\'s paginators in M3, wired to its page actions', function () {
|
||||||
|
Livewire::component('paging-probe', new class extends Component
|
||||||
|
{
|
||||||
|
use WithPagination;
|
||||||
|
|
||||||
|
public function render(): string
|
||||||
|
{
|
||||||
|
return <<<'BLADE'
|
||||||
|
<div>
|
||||||
|
{{ (new \Illuminate\Pagination\LengthAwarePaginator(range(1, 10), 95, 10, $this->getPage(), ['path' => '/'])) ->links() }}
|
||||||
|
</div>
|
||||||
|
BLADE;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(Livewire::test('paging-probe')->html())
|
||||||
|
->toContain('data-pagination')
|
||||||
|
->toContain('wire:click="gotoPage(2, \'page\')"')
|
||||||
|
->toContain('wire:click="nextPage(\'page\')"')
|
||||||
|
->not->toContain('text-gray');
|
||||||
|
});
|
||||||
Reference in New Issue
Block a user