Draw the navigation bar and bar item without Tailwind
Plan step 36 (navigation group, second batch): <x-navigation-bar>'s and <x-navigation-bar-item>'s class lists move into resources/css/components/navigation-bar.css and navigation-bar-item.css, keyed on data-md-navigation-bar (data-md-tall, data-md-hide-on-scroll/ -hidden) and data-md-navigation-bar-item (data-md-active), both in material.components. The indicator's growing fill and its state layer, shared with the rail's item, move into a new navigation-item.css both files import — the day's own layer in datepicker.css is the precedent for keeping it out of the shared foundation classes: the element focused and pressed is the whole item, the layer drawn only on the smaller indicator or pill inside it, which md-state-layer cannot do and :focus-visible never matches. The wash colour moves from a dead on-surface base overridden by both items to a shared on-secondary- container declaration, and its opacities from literal 0.08/0.1 to state.css's own tokens — no visible change, since the numbers matched. Every size is px (16dp Tailwind quirks aside, this file had none); the bar's own item-count and container-query layout, N-08's label-medium fix and N-19's on-secondary-container wash already matched the audit, so only hooks, units and layer needed to change. The scaffold's hide-on-scroll offset rule (`--material-bottom-bar`, navigation-bar.css) stays unlayered: <x-scaffold> still publishes that variable with a Tailwind utility until its own rewrite, and a rule in any layer loses to it regardless of specificity — unlike the FAB overrides the rail commit moves into material.components, which only have to beat another material.components rule. navigation.css is not deleted yet (still Tailwind's for the rail); its "Navigation" comment in tailwind.css narrows as each stream leaves. navigation-bar.css is not in NavigationStylesheetsTest.php's dataset: its one unlayered rule breaks that test's "every block is material.components" assumption, so the same checks are in NavigationBarTest.php instead, the same reason ErrorPagesTest.php carries error-page.css's. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Qwx5USif3wFFmxtHg5U1g9
This commit is contained in:
co-authored by
Claude Sonnet 5
parent
1f9384efdf
commit
63d421ccb6
@@ -72,3 +72,6 @@
|
||||
@import './components/app-bar.css';
|
||||
@import './components/toolbar.css';
|
||||
@import './components/tabs.css';
|
||||
@import './components/navigation-item.css';
|
||||
@import './components/navigation-bar.css';
|
||||
@import './components/navigation-bar-item.css';
|
||||
|
||||
@@ -0,0 +1,151 @@
|
||||
/*
|
||||
* `<x-navigation-bar-item>`: one destination in an `<x-navigation-bar>`
|
||||
* (NavigationBarVerticalItemTokens.kt, NavigationBarHorizontalItemTokens.kt, androidx Compose
|
||||
* Material 3, Apache-2.0).
|
||||
*
|
||||
* [data-md-navigation-bar-item] data-md-active; the link or button itself
|
||||
* [data-md-navigation-pill] icon and label; becomes the indicator from 600px
|
||||
* [data-md-navigation-indicator] the 56×32 indicator around the icon below 600px
|
||||
* [data-md-navigation-icon] the floating badge's anchor (navigation-item.css)
|
||||
* [data-md-navigation-label]
|
||||
*
|
||||
* Below 600px (the bar's own width — a container query, so a bar in a narrow column keeps this
|
||||
* layout) the icon sits in a 56×32 `CornerFull` indicator over a label-medium label, both equally
|
||||
* wide. From 600px icon and label share a 40px horizontal indicator with 16px leading and
|
||||
* trailing space; the label stays label-medium — `NavigationBarTokens.LabelTextFont` is the bar's
|
||||
* only label token, and Compose's `ShortNavigationBarItem` passes it for both icon positions (the
|
||||
* *rail's* horizontal item is label-large, a different component's token; N-08). An active item is
|
||||
* secondary-container behind on-secondary-container (icon and, from 600px, label); its indicator's
|
||||
* fill is a background image so it can grow from its centre (navigation-item.css) rather than
|
||||
* stretch the icon.
|
||||
*
|
||||
* The indicator's growing fill and its state layer are shared with the rail's item
|
||||
* (navigation-item.css); only this file's focus ring and the display swap between the two
|
||||
* indicator shapes are the bar's own.
|
||||
*/
|
||||
|
||||
@layer material.reset, material.tokens, material.base, material.layout, material.components, material.text, material.visibility;
|
||||
|
||||
@import './icon.css';
|
||||
@import './badge.css';
|
||||
@import './navigation-item.css';
|
||||
|
||||
@layer material.components {
|
||||
[data-md-navigation-bar-item] {
|
||||
--navigation-layer: 0;
|
||||
|
||||
position: relative;
|
||||
display: flex;
|
||||
flex: 1 1 0%;
|
||||
min-width: 0;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
padding-block: 6px;
|
||||
color: var(--md-sys-color-on-surface-variant);
|
||||
text-decoration: none;
|
||||
cursor: pointer;
|
||||
outline: none;
|
||||
-webkit-tap-highlight-color: transparent;
|
||||
}
|
||||
|
||||
[data-md-navigation-bar-item][data-md-active] {
|
||||
color: var(--md-sys-color-secondary);
|
||||
}
|
||||
|
||||
[data-md-navigation-bar-item] [data-md-navigation-pill] {
|
||||
display: flex;
|
||||
min-width: 0;
|
||||
max-width: 100%;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
gap: 4px;
|
||||
border-radius: var(--md-sys-shape-corner-full);
|
||||
font: var(--md-sys-typescale-label-md);
|
||||
letter-spacing: var(--md-sys-typescale-label-md-tracking);
|
||||
}
|
||||
|
||||
[data-md-navigation-bar-item] [data-md-navigation-label] {
|
||||
max-width: 100%;
|
||||
padding-inline: 4px;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
[data-md-navigation-bar-item] [data-md-navigation-indicator] {
|
||||
position: relative;
|
||||
isolation: isolate;
|
||||
display: flex;
|
||||
flex-shrink: 0;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 56px;
|
||||
height: 32px;
|
||||
border-radius: var(--md-sys-shape-corner-full);
|
||||
}
|
||||
|
||||
/* Vertical layout (below 600px, or a tall bar at any width): the indicator fills behind the
|
||||
icon; the pill draws no layer of its own. */
|
||||
[data-md-navigation-bar-item][data-md-active] [data-md-navigation-indicator] {
|
||||
background-image: linear-gradient(var(--md-sys-color-secondary-container), var(--md-sys-color-secondary-container));
|
||||
color: var(--md-sys-color-on-secondary-container);
|
||||
}
|
||||
|
||||
[data-md-navigation-bar-item] [data-md-navigation-pill]::before {
|
||||
display: none;
|
||||
}
|
||||
|
||||
[data-md-navigation-bar-item]:focus-visible [data-md-navigation-indicator] {
|
||||
outline: 3px solid var(--md-sys-color-secondary);
|
||||
outline-offset: 2px;
|
||||
}
|
||||
|
||||
/* Horizontal layout, from 600px: the pill itself fills and takes the layer; the indicator
|
||||
stops drawing either. Only the short bar (a tall bar keeps the vertical layout). */
|
||||
@container (width >= 600px) {
|
||||
[data-md-navigation-bar]:not([data-md-tall]) [data-md-navigation-bar-item] {
|
||||
min-width: max-content;
|
||||
}
|
||||
|
||||
[data-md-navigation-bar]:not([data-md-tall]) [data-md-navigation-bar-item] [data-md-navigation-pill] {
|
||||
position: relative;
|
||||
isolation: isolate;
|
||||
flex-direction: row;
|
||||
height: 40px;
|
||||
padding-inline: 16px;
|
||||
}
|
||||
|
||||
[data-md-navigation-bar]:not([data-md-tall]) [data-md-navigation-bar-item] [data-md-navigation-label] {
|
||||
padding-inline: 0;
|
||||
}
|
||||
|
||||
[data-md-navigation-bar]:not([data-md-tall]) [data-md-navigation-bar-item][data-md-active] {
|
||||
color: var(--md-sys-color-on-secondary-container);
|
||||
}
|
||||
|
||||
[data-md-navigation-bar]:not([data-md-tall]) [data-md-navigation-bar-item][data-md-active] [data-md-navigation-pill] {
|
||||
background-image: linear-gradient(var(--md-sys-color-secondary-container), var(--md-sys-color-secondary-container));
|
||||
}
|
||||
|
||||
[data-md-navigation-bar]:not([data-md-tall]) [data-md-navigation-bar-item][data-md-active] [data-md-navigation-indicator] {
|
||||
background-image: none;
|
||||
}
|
||||
|
||||
[data-md-navigation-bar]:not([data-md-tall]) [data-md-navigation-bar-item] [data-md-navigation-pill]::before {
|
||||
display: block;
|
||||
}
|
||||
|
||||
[data-md-navigation-bar]:not([data-md-tall]) [data-md-navigation-bar-item] [data-md-navigation-indicator]::before {
|
||||
display: none;
|
||||
}
|
||||
|
||||
[data-md-navigation-bar]:not([data-md-tall]) [data-md-navigation-bar-item]:focus-visible [data-md-navigation-indicator] {
|
||||
outline: none;
|
||||
}
|
||||
|
||||
[data-md-navigation-bar]:not([data-md-tall]) [data-md-navigation-bar-item]:focus-visible [data-md-navigation-pill] {
|
||||
outline: 3px solid var(--md-sys-color-secondary);
|
||||
outline-offset: 2px;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,91 @@
|
||||
/*
|
||||
* `<x-navigation-bar>`: M3 Expressive's flexible navigation bar, three to five destinations
|
||||
* pinned to the bottom of a compact or medium window (NavigationBarTokens.kt, androidx Compose
|
||||
* Material 3, Apache-2.0, and the layout of ShortNavigationBar.kt;
|
||||
* docs/reference/m3/components-navigation-selection-inputs.md § Navigation Bar).
|
||||
*
|
||||
* [data-md-navigation-bar] 64px in surface-container; data-md-tall (80px),
|
||||
* data-md-hide-on-scroll and data-md-hidden
|
||||
* [data-md-navigation-bar-items] equal widths below 600px; centred with Compose's
|
||||
* calculateCenteredContentHorizontalPadding from it
|
||||
* [data-md-navigation-bar-item] navigation-bar-item.css
|
||||
*
|
||||
* `data-md-tall` is `NavigationBarTokens.TallContainerHeight`, 80px against the short bar's 64
|
||||
* (`ContainerHeight`) — Missing until this rewrite. It keeps the vertical, icon-over-label item
|
||||
* layout at every width, so every rule below that only the short bar's horizontal layout needs
|
||||
* says `:not([data-md-tall])` first.
|
||||
*
|
||||
* `data-md-hide-on-scroll` is M3's scrolling behaviour, also Missing until now: "hides on
|
||||
* scroll-down, reappears on scroll-up… never hide it while a screen reader is active"
|
||||
* (§ Navigation Bar/Behaviour). resources/js/navigation.js drives `data-md-hidden` and never hides
|
||||
* the bar while a snackbar, a bottom sheet or a drawer rests on its edge — those are anchored to
|
||||
* its bottom edge and would slide with it — and focus reaching the bar brings it back, the web's
|
||||
* nearest equivalent of "a screen reader is active". It slides on the default spatial spring,
|
||||
* which reduced motion zeroes along with every other duration token.
|
||||
*
|
||||
* The item's own indicator, pill and state layer (shared with the rail item) are
|
||||
* navigation-bar-item.css and navigation-item.css.
|
||||
*/
|
||||
|
||||
@layer material.reset, material.tokens, material.base, material.layout, material.components, material.text, material.visibility;
|
||||
|
||||
@layer material.components {
|
||||
[data-md-navigation-bar] {
|
||||
container-type: inline-size;
|
||||
padding-inline: var(--material-safe-left, env(safe-area-inset-left)) var(--material-safe-right, env(safe-area-inset-right));
|
||||
padding-bottom: var(--material-safe-bottom, env(safe-area-inset-bottom));
|
||||
background-color: var(--md-sys-color-surface-container);
|
||||
color: var(--md-sys-color-on-surface-variant);
|
||||
}
|
||||
|
||||
[data-md-navigation-bar-items] {
|
||||
display: flex;
|
||||
min-height: 64px;
|
||||
margin-inline: auto;
|
||||
}
|
||||
|
||||
[data-md-navigation-bar][data-md-tall] [data-md-navigation-bar-items] {
|
||||
min-height: 80px;
|
||||
}
|
||||
|
||||
[data-md-navigation-bar][data-md-hide-on-scroll] {
|
||||
transition: translate var(--md-sys-motion-spatial-default-duration) var(--md-sys-motion-spatial-default);
|
||||
}
|
||||
|
||||
[data-md-navigation-bar][data-md-hide-on-scroll][data-md-hidden] {
|
||||
translate: 0 100%;
|
||||
}
|
||||
|
||||
/* From 600px (M3's medium window, the bar's own width): icon and label side by side in a
|
||||
40px pill, the items gathered in the middle with Centered arrangement's own padding. The
|
||||
short bar only — a tall bar is the vertical layout everywhere. */
|
||||
@container (width >= 600px) {
|
||||
[data-md-navigation-bar]:not([data-md-tall]) [data-md-navigation-bar-items] {
|
||||
width: calc(10% * (var(--navigation-bar-count, 7) + 3));
|
||||
min-width: fit-content;
|
||||
max-width: 100%;
|
||||
}
|
||||
|
||||
[data-md-navigation-bar]:not([data-md-tall]) [data-md-navigation-bar-items]:has(> :last-child:nth-child(1)) { --navigation-bar-count: 1; }
|
||||
[data-md-navigation-bar]:not([data-md-tall]) [data-md-navigation-bar-items]:has(> :last-child:nth-child(2)) { --navigation-bar-count: 2; }
|
||||
[data-md-navigation-bar]:not([data-md-tall]) [data-md-navigation-bar-items]:has(> :last-child:nth-child(3)) { --navigation-bar-count: 3; }
|
||||
[data-md-navigation-bar]:not([data-md-tall]) [data-md-navigation-bar-items]:has(> :last-child:nth-child(4)) { --navigation-bar-count: 4; }
|
||||
[data-md-navigation-bar]:not([data-md-tall]) [data-md-navigation-bar-items]:has(> :last-child:nth-child(5)) { --navigation-bar-count: 5; }
|
||||
[data-md-navigation-bar]:not([data-md-tall]) [data-md-navigation-bar-items]:has(> :last-child:nth-child(6)) { --navigation-bar-count: 6; }
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* A bar that has slid off the bottom of the window is no longer there to clear, so the offset
|
||||
* everything pinned to the bottom reads drops to the bottom safe area and whatever the application
|
||||
* has docked on the bar — a `fab` button, the snackbar and the page's own bottom padding all follow
|
||||
* it down and come back up with it. Unlayered on purpose, still: <x-scaffold> (its own rewrite is a
|
||||
* later batch) publishes --material-bottom-bar with a Tailwind utility
|
||||
* (`max-medium:[--material-bottom-bar:…]`), and a rule in any layer loses to an unlayered utility
|
||||
* regardless of specificity — unlike toolbar.css's and fab.css's overrides, which only have to beat
|
||||
* another `material.components` rule. Keyed on `data-md-scaffold`, the hook the scaffold already
|
||||
* renders, not `data-app-shell`, which belongs to that later rewrite.
|
||||
*/
|
||||
[data-md-scaffold]:has([data-md-navigation-bar][data-md-hide-on-scroll][data-md-hidden]) {
|
||||
--material-bottom-bar: calc(var(--material-safe-bottom, env(safe-area-inset-bottom)) + var(--material-bottom-extra, 0px));
|
||||
}
|
||||
@@ -0,0 +1,70 @@
|
||||
/*
|
||||
* Shared between `<x-navigation-bar-item>` and `<x-navigation-rail-item>` (imported by both
|
||||
* navigation-bar-item.css and navigation-rail-item.css): the destination indicator's growing fill
|
||||
* and its state layer, on androidx's one stated colour for a navigation item's layer.
|
||||
*
|
||||
* `NavigationRailColorTokens.kt` gives one colour for all six states, active or not:
|
||||
* `ItemActiveHoveredStateLayer = … = ItemInactivePressedStateLayer = OnSecondaryContainer`.
|
||||
* `NavigationBarTokens.kt` states no state-layer tokens of its own, so the bar's item takes the
|
||||
* rail's (N-19). Hover only where a pointer can hover, so a touch screen does not keep the last
|
||||
* hover after a tap; state.css's own opacities (8% hover, 10% focus and press) rather than the
|
||||
* package's `md-state-layer` class, because the element focused and pressed is the whole item
|
||||
* while the layer is drawn only on the smaller indicator or pill inside it — `md-state-layer`
|
||||
* cannot draw on a different element than the one it decorates, and `:focus-visible` never
|
||||
* matches a child (the same reason datepicker.css keeps the day's own layer).
|
||||
*
|
||||
* The active indicator itself is a secondary-container fill painted as a background image so it
|
||||
* can grow out of its centre without stretching the icon: when a page arrives through
|
||||
* wire:navigate, resources/js/navigation.js starts it at zero width for a moment and it springs
|
||||
* open on the default spatial spring, as Compose's indicator does when the selection changes
|
||||
* (NavigationItem.kt). A full page load draws it at once; reduced motion zeroes the transition.
|
||||
*/
|
||||
|
||||
@layer material.reset, material.tokens, material.base, material.layout, material.components, material.text, material.visibility;
|
||||
|
||||
@layer material.components {
|
||||
[data-md-navigation-bar-item] :is([data-md-navigation-indicator], [data-md-navigation-pill]),
|
||||
[data-md-navigation-rail-item],
|
||||
[data-md-navigation-rail-item] [data-md-navigation-indicator] {
|
||||
background-position: center;
|
||||
background-repeat: no-repeat;
|
||||
background-size: 100% 100%;
|
||||
transition: background-size var(--md-sys-motion-spatial-default-duration) var(--md-sys-motion-spatial-default);
|
||||
}
|
||||
|
||||
@media (hover: hover) {
|
||||
:is([data-md-navigation-bar-item], [data-md-navigation-rail-item]):hover {
|
||||
--navigation-layer: var(--md-sys-state-hover-state-layer-opacity);
|
||||
}
|
||||
}
|
||||
|
||||
:is([data-md-navigation-bar-item], [data-md-navigation-rail-item]):focus-visible {
|
||||
--navigation-layer: var(--md-sys-state-focus-state-layer-opacity);
|
||||
}
|
||||
|
||||
:is([data-md-navigation-bar-item], [data-md-navigation-rail-item]):active {
|
||||
--navigation-layer: var(--md-sys-state-pressed-state-layer-opacity);
|
||||
}
|
||||
|
||||
[data-md-navigation-bar-item] [data-md-navigation-indicator]::before,
|
||||
[data-md-navigation-bar-item] [data-md-navigation-pill]::before,
|
||||
[data-md-navigation-rail-item]::before,
|
||||
[data-md-navigation-rail-item] [data-md-navigation-indicator]::before {
|
||||
content: '';
|
||||
position: absolute;
|
||||
inset: 0;
|
||||
z-index: -1;
|
||||
border-radius: inherit;
|
||||
background-color: var(--md-sys-color-on-secondary-container);
|
||||
opacity: var(--navigation-layer, 0);
|
||||
pointer-events: none;
|
||||
transition: opacity var(--md-sys-motion-effects-fast-duration) var(--md-sys-motion-effects-fast);
|
||||
}
|
||||
|
||||
/* The wrapper a floating badge anchors to: tight around the glyph alone, not the wider
|
||||
indicator or pill around it, so the badge sits at the icon's own corner (badge.css). */
|
||||
[data-md-navigation-icon] {
|
||||
position: relative;
|
||||
display: inline-flex;
|
||||
}
|
||||
}
|
||||
@@ -40,16 +40,16 @@
|
||||
'wire:navigate' => $isLink && ! $external && ! $noWireNavigate && ! $attributes->has('wire:navigate') ? true : null,
|
||||
'type' => $isLink ? null : 'button',
|
||||
'aria-current' => $active ? 'page' : null,
|
||||
'data-active' => $active ? true : null,
|
||||
'data-md-active' => $active ? true : null,
|
||||
], fn ($value): bool => $value !== null));
|
||||
@endphp
|
||||
|
||||
<{{ $tag }} data-navigation-bar-item {{ $attributes }}>
|
||||
<span data-navigation-pill>
|
||||
<span data-navigation-indicator>
|
||||
<span class="relative inline-flex">
|
||||
<{{ $tag }} data-md-navigation-bar-item {{ $attributes }}>
|
||||
<span data-md-navigation-pill>
|
||||
<span data-md-navigation-indicator>
|
||||
<span data-md-navigation-icon>
|
||||
@if ($icon)
|
||||
<x-livewire-material::icon :name="$icon" :filled="$active" class="size-6" />
|
||||
<x-livewire-material::icon :name="$icon" :filled="$active" />
|
||||
@endif
|
||||
|
||||
@if ($dot)
|
||||
@@ -60,10 +60,10 @@
|
||||
</span>
|
||||
</span>
|
||||
|
||||
<span data-navigation-label>{{ $label ?? $slot }}</span>
|
||||
<span data-md-navigation-label>{{ $label ?? $slot }}</span>
|
||||
</span>
|
||||
|
||||
@if ($spoken !== null)
|
||||
<span class="sr-only">, {{ $spoken }}</span>
|
||||
<span class="md-visually-hidden">, {{ $spoken }}</span>
|
||||
@endif
|
||||
</{{ $tag }}>
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
NavigationBarVerticalItemTokens.kt, NavigationBarHorizontalItemTokens.kt and
|
||||
ShortNavigationBar.kt, all under
|
||||
https://github.com/androidx/androidx/tree/androidx-main/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3
|
||||
— the styles are resources/css/components/navigation.css. --}}
|
||||
— the styles are resources/css/components/navigation-bar.css. --}}
|
||||
|
||||
@props([
|
||||
'label' => null,
|
||||
@@ -50,17 +50,17 @@
|
||||
|
||||
<nav
|
||||
aria-label="{{ $label ?? __('Main') }}"
|
||||
data-navigation-bar
|
||||
@if ($tall) data-tall @endif
|
||||
data-md-navigation-bar
|
||||
@if ($tall) data-md-tall @endif
|
||||
@if ($hideOnScroll)
|
||||
data-hide-on-scroll
|
||||
data-md-hide-on-scroll
|
||||
x-data="materialNavigationBar"
|
||||
x-bind:data-hidden="away ? '' : null"
|
||||
x-bind:data-md-hidden="away ? '' : null"
|
||||
x-on:focusin="show()"
|
||||
@endif
|
||||
{{ $attributes }}
|
||||
>
|
||||
<div data-navigation-bar-items>
|
||||
<div data-md-navigation-bar-items>
|
||||
{{ $slot }}
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
@@ -1,17 +1,20 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Support\Facades\File;
|
||||
use Illuminate\Support\Str;
|
||||
use NoNameWeb\LivewireMaterial\Tests\Support\ComponentStylesheet;
|
||||
use NoNameWeb\LivewireMaterial\Tests\Support\ViewClasses;
|
||||
|
||||
it('draws a navigation landmark around its items', function () {
|
||||
expect((string) $this->blade('<x-navigation-bar><x-navigation-bar-item label="Inbox" icon="inbox" link="/inbox" /></x-navigation-bar>'))
|
||||
->toMatch('/<nav\s+aria-label="Main"\s+data-navigation-bar/')
|
||||
->toContain('data-navigation-bar-items')
|
||||
->toMatch('/<nav\s+aria-label="Main"\s+data-md-navigation-bar/')
|
||||
->toContain('data-md-navigation-bar-items')
|
||||
->and((string) $this->blade('<x-navigation-bar label="Sections" />'))->toContain('aria-label="Sections"');
|
||||
});
|
||||
|
||||
it('links a destination through wire:navigate unless told not to', function () {
|
||||
expect((string) $this->blade('<x-navigation-bar-item label="Inbox" icon="inbox" link="/inbox" />'))
|
||||
->toContain('<a data-navigation-bar-item')
|
||||
->toContain('<a data-md-navigation-bar-item')
|
||||
->toContain('href="/inbox"')
|
||||
->toContain('wire:navigate')
|
||||
->and((string) $this->blade('<x-navigation-bar-item label="Inbox" icon="inbox" link="/inbox" no-wire-navigate />'))->not->toContain('wire:navigate')
|
||||
@@ -22,7 +25,7 @@ it('links a destination through wire:navigate unless told not to', function () {
|
||||
|
||||
it('is a button without a link', function () {
|
||||
expect((string) $this->blade('<x-navigation-bar-item label="Inbox" icon="inbox" wire:click="show(\'inbox\')" />'))
|
||||
->toContain('<button data-navigation-bar-item')
|
||||
->toContain('<button data-md-navigation-bar-item')
|
||||
->toContain('type="button"')
|
||||
->not->toContain('href=');
|
||||
});
|
||||
@@ -33,10 +36,10 @@ it('marks the current destination with aria-current and the filled icon', functi
|
||||
|
||||
$symbol = fn (string $html): string => preg_match('/<svg.*?<\/svg>/s', $html, $svg) ? $svg[0] : '';
|
||||
|
||||
expect($active)->toContain('aria-current="page"')->toContain('data-active')
|
||||
->and($inactive)->not->toContain('aria-current')->not->toContain('data-active')
|
||||
->and($symbol($active))->toBe(trim((string) $this->blade('<x-icon name="star" filled class="size-6" />')))
|
||||
->and($symbol($inactive))->toBe(trim((string) $this->blade('<x-icon name="star" class="size-6" />')))
|
||||
expect($active)->toContain('aria-current="page"')->toContain('data-md-active')
|
||||
->and($inactive)->not->toContain('aria-current')->not->toContain('data-md-active')
|
||||
->and($symbol($active))->toBe(trim((string) $this->blade('<x-icon name="star" filled />')))
|
||||
->and($symbol($inactive))->toBe(trim((string) $this->blade('<x-icon name="star" />')))
|
||||
->and($symbol($active))->not->toBe($symbol($inactive));
|
||||
});
|
||||
|
||||
@@ -44,62 +47,98 @@ it('badges the icon with a dot or a count that screen readers hear', function ()
|
||||
$count = (string) $this->blade('<x-navigation-bar-item label="Inbox" icon="inbox" link="/inbox" badge="1200" />');
|
||||
$dot = (string) $this->blade('<x-navigation-bar-item label="Inbox" icon="inbox" link="/inbox" :badge="true" badge-label="New mail" />');
|
||||
|
||||
expect($count)->toContain('999+')->toContain('<span class="sr-only">, 1200</span>')
|
||||
->and($dot)->toContain('data-md-dot')->toContain('<span class="sr-only">, New mail</span>')
|
||||
->and((string) $this->blade('<x-navigation-bar-item label="Inbox" icon="inbox" link="/inbox" />'))->not->toContain('sr-only');
|
||||
expect($count)->toContain('999+')->toContain('<span class="md-visually-hidden">, 1200</span>')
|
||||
->and($dot)->toContain('data-md-dot')->toContain('<span class="md-visually-hidden">, New mail</span>')
|
||||
->and((string) $this->blade('<x-navigation-bar-item label="Inbox" icon="inbox" link="/inbox" />'))->not->toContain('md-visually-hidden');
|
||||
});
|
||||
|
||||
it('keeps the bar item on the label and state-layer colours M3 tokens', function () {
|
||||
$css = file_get_contents(__DIR__.'/../../../resources/css/components/navigation.css');
|
||||
$horizontal = Str::of($css)->after('@container (width >= 37.5rem)')->before('/* ------')->toString();
|
||||
$bar = ComponentStylesheet::read('navigation-bar-item');
|
||||
$shared = ComponentStylesheet::read('navigation-item');
|
||||
|
||||
expect($horizontal)
|
||||
// NavigationBarTokens names one label font for both icon positions: label-medium (N-08).
|
||||
->not->toContain('--md-sys-typescale-label-lg')
|
||||
->and($css)
|
||||
// The indicator and the pill wash in on-secondary-container, as the rail's do (N-19).
|
||||
->toContain('[data-navigation-bar-item] :is([data-navigation-indicator], [data-navigation-pill])::before {');
|
||||
expect($bar->declarations('[data-md-navigation-bar]:not([data-md-tall]) [data-md-navigation-bar-item] [data-md-navigation-pill]', ['@container (width >= 600px)']))
|
||||
->not->toHaveKey('font')
|
||||
// The indicator and the pill wash in on-secondary-container, as the rail's do (N-19), from
|
||||
// the shared file both the bar's and the rail's items import.
|
||||
->and($shared->declarations('[data-md-navigation-bar-item] [data-md-navigation-indicator]::before, [data-md-navigation-bar-item] [data-md-navigation-pill]::before, [data-md-navigation-rail-item]::before, [data-md-navigation-rail-item] [data-md-navigation-indicator]::before'))
|
||||
->toHaveKey('background-color', 'var(--md-sys-color-on-secondary-container)');
|
||||
});
|
||||
|
||||
it('takes M3\'s tall container, which keeps the vertical item layout at every width', function () {
|
||||
expect((string) $this->blade('<x-navigation-bar tall><x-navigation-bar-item label="Inbox" icon="inbox" link="/inbox" /></x-navigation-bar>'))
|
||||
->toMatch('/data-navigation-bar\s+data-tall\s/')
|
||||
->and((string) $this->blade('<x-navigation-bar />'))->not->toContain('data-tall');
|
||||
->toMatch('/data-md-navigation-bar\s+data-md-tall\s/')
|
||||
->and((string) $this->blade('<x-navigation-bar />'))->not->toContain('data-md-tall');
|
||||
|
||||
$css = file_get_contents(__DIR__.'/../../../resources/css/components/navigation.css');
|
||||
$css = ComponentStylesheet::read('navigation-bar');
|
||||
|
||||
expect($css)
|
||||
// NavigationBarTokens.TallContainerHeight, 80dp, against the short bar's 64.
|
||||
->toMatch('/\[data-navigation-bar\]\[data-tall\] \[data-navigation-bar-items\] \{\s+min-height: 5rem;/')
|
||||
// The vertical layout is the base — a compact bar and a tall one at any width share it —
|
||||
// and only the short bar's horizontal layout is behind the 600px container query, so no
|
||||
// rule inside one reaches an item without saying `:not([data-tall])` first.
|
||||
->and(preg_match_all('/@container \(width [<>]=? 37\.5rem\) \{\n(.*?)\n \}/s', $css, $blocks) > 0)->toBeTrue()
|
||||
->and(implode("\n", $blocks[1]))->not->toMatch('/^ \[data-navigation-bar-item/m');
|
||||
expect($css->declarations('[data-md-navigation-bar][data-md-tall] [data-md-navigation-bar-items]'))
|
||||
->toBe(['min-height' => '80px']);
|
||||
|
||||
// The vertical layout is the base — a compact bar and a tall one at any width share it — and
|
||||
// only the short bar's horizontal layout is behind the 600px container query, so no rule
|
||||
// inside it reaches an item without saying `:not([data-md-tall])` first.
|
||||
$item = ComponentStylesheet::read('navigation-bar-item');
|
||||
|
||||
expect($item->has('[data-md-navigation-bar-item]'))->toBeTrue()
|
||||
->and($item->has('[data-md-navigation-bar]:not([data-md-tall]) [data-md-navigation-bar-item]', ['@container (width >= 600px)']))->toBeTrue();
|
||||
});
|
||||
|
||||
it('hides on a scroll down and springs back on a scroll up', function () {
|
||||
expect((string) $this->blade('<x-navigation-bar hide-on-scroll />'))
|
||||
->toContain('data-hide-on-scroll')
|
||||
->toContain('data-md-hide-on-scroll')
|
||||
->toContain('x-data="materialNavigationBar"')
|
||||
->toContain('x-bind:data-hidden="away ? \'\' : null"')
|
||||
->toContain('x-bind:data-md-hidden="away ? \'\' : null"')
|
||||
// Focus reaching the bar brings it back — the web's nearest answer to M3's "never hide it
|
||||
// while a screen reader is active".
|
||||
->toContain('x-on:focusin="show()"')
|
||||
->and((string) $this->blade('<x-navigation-bar />'))
|
||||
->not->toContain('data-hide-on-scroll')
|
||||
->not->toContain('data-md-hide-on-scroll')
|
||||
->not->toContain('materialNavigationBar');
|
||||
|
||||
expect(file_get_contents(__DIR__.'/../../../resources/css/components/navigation.css'))
|
||||
$css = ComponentStylesheet::read('navigation-bar');
|
||||
|
||||
// The spatial spring, which reduced motion zeroes along with every other duration token.
|
||||
->toMatch('/\[data-navigation-bar\]\[data-hide-on-scroll\] \{\s+transition: translate var\(--md-sys-motion-spatial-default-duration\) var\(--md-sys-motion-spatial-default\);/')
|
||||
->toMatch('/\[data-navigation-bar\]\[data-hide-on-scroll\]\[data-hidden\] \{\s+translate: 0 100%;/')
|
||||
// Unlayered, or the utility <x-scaffold> publishes the offset with would win.
|
||||
->toContain('[data-app-shell]:has([data-navigation-bar][data-hide-on-scroll][data-hidden]) {')
|
||||
->and(Str::of(file_get_contents(__DIR__.'/../../../resources/css/components/navigation.css'))->after('[data-app-shell]:has(')->toString())
|
||||
expect($css->declarations('[data-md-navigation-bar][data-md-hide-on-scroll]'))
|
||||
->toBe(['transition' => 'translate var(--md-sys-motion-spatial-default-duration) var(--md-sys-motion-spatial-default)'])
|
||||
->and($css->declarations('[data-md-navigation-bar][data-md-hide-on-scroll][data-md-hidden]'))
|
||||
->toBe(['translate' => '0 100%'])
|
||||
->and($css->css)
|
||||
// Unlayered, or the Tailwind utility <x-scaffold> still publishes the offset with would win —
|
||||
// its own rewrite has not landed yet, so this one rule stays unlayered until it does.
|
||||
->toContain('[data-md-scaffold]:has([data-md-navigation-bar][data-md-hide-on-scroll][data-md-hidden]) {')
|
||||
->and(Str::of($css->css)->after('[data-md-scaffold]:has(')->toString())
|
||||
->not->toContain('@layer');
|
||||
|
||||
expect(file_get_contents(__DIR__.'/../../../resources/js/navigation.js'))
|
||||
// Never out from under a snackbar, a bottom sheet or a drawer resting on its edge.
|
||||
->toContain("document.querySelectorAll('[data-md-toast-snackbar], [role=\"dialog\"]')");
|
||||
});
|
||||
|
||||
/**
|
||||
* navigation-bar.css is not in NavigationStylesheetsTest.php's dataset: it keeps one rule
|
||||
* unlayered on purpose, so its shape does not match every other stylesheet's single
|
||||
* `@layer material.components` block. These are the same checks, minus that one assumption — the
|
||||
* same reason ErrorPagesTest.php carries error-page.css's.
|
||||
*/
|
||||
it('draws navigation-bar.css shaped like every package stylesheet but its one unlayered rule', function () {
|
||||
$css = ComponentStylesheet::read('navigation-bar');
|
||||
|
||||
expect($css->css)->toStartWith('/*')
|
||||
->and($css->statements()[0] ?? null)->toBe('@layer material.reset, material.tokens, material.base, material.layout, material.components, material.text, material.visibility;')
|
||||
->and(array_slice($css->statements(), 1))->each->toMatch('/^@import \'\.\/[a-z-]+\.css\';$/')
|
||||
->and($css->blocks())->toContain('@layer material.components')
|
||||
->and($css->css)->not->toMatch('/@(?:tailwind|theme|utility|variant|custom-variant|apply|source|config|plugin|reference)\b|--(?:theme|spacing|alpha)\(|\btheme\(/');
|
||||
|
||||
expect(ViewClasses::violations(File::get(__DIR__.'/../../../resources/views/components/navigation-bar.blade.php')))->toBe([]);
|
||||
|
||||
$source = (string) preg_replace('~/\*.*?\*/~s', '', $css->css);
|
||||
|
||||
expect($source)->not->toMatch('/(?:^|[,{};]\s*)(?:html|body|dialog|:root)(?![\w-])(?!\[data-md-|:has\(> \[data-md-)/m');
|
||||
|
||||
$components = File::get(__DIR__.'/../../../resources/css/components.css');
|
||||
$block = substr($components, (int) strpos($components, '/* Navigation */'));
|
||||
|
||||
expect($block)->toContain("@import './components/navigation-bar.css';");
|
||||
});
|
||||
|
||||
@@ -15,12 +15,17 @@ use NoNameWeb\LivewireMaterial\Tests\Support\ViewClasses;
|
||||
* The dataset grows by one name per component commit, the same rule ContainmentStylesheetsTest.php
|
||||
* and the earlier groups follow. `<x-tabs>` and `<x-tab>` share one stylesheet (tabs.css) and one
|
||||
* commit, so `navigationViews()` maps the 'tabs' entry onto both blade views; every other entry is
|
||||
* one view, one stylesheet, as usual.
|
||||
* one view, one stylesheet, as usual. `navigation-bar` is not in this dataset: its stylesheet keeps
|
||||
* one rule unlayered on purpose (still beating a Tailwind utility <x-scaffold> has not lost yet),
|
||||
* so its shape does not match every other entry's single `@layer material.components` block; the
|
||||
* same checks, adjusted for that one rule, are in NavigationBarTest.php instead — the same reason
|
||||
* ContainmentStylesheetsTest.php gives for leaving the error layout to ErrorPagesTest.php.
|
||||
*/
|
||||
dataset('navigation components', [
|
||||
'app-bar',
|
||||
'toolbar',
|
||||
'tabs',
|
||||
'navigation-bar-item',
|
||||
]);
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user