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
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user