From 25549374ecec391abfddcd16d933f574b26bb33a Mon Sep 17 00:00:00 2001 From: Andreas Reinhold / reini Date: Tue, 15 Sep 2026 00:09:06 +0200 Subject: [PATCH] Draw the navigation rail without Tailwind MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Plan step 36 (navigation group, second batch): 's, 's and 's class lists move into navigation-rail.css, navigation-rail-item.css and navigation-rail-section.css, keyed on data-md-navigation-rail (the mode, data-md-width, data-md-align, data-md-hide-when-collapsed, data-md-divider, data-md-fill, data-md-open), data-md-navigation-rail- item (data-md-active) and data-md-navigation-rail-section. Every Tailwind wrapper class in the view — the menu row's centring padding, the FAB row, the two swapped menu glyphs, the brand's visibility — becomes a hook the stylesheet draws instead; the menu button itself renders the shared md-state-layer/md-focus-ring/md-touch-target classes (N-01's pattern) since it draws its own layer on itself, not a child. `` and `` take size and floating props instead of size/position classes; a small data-md-navigation-icon hook (the shared navigation-item.css) replaces the ad hoc "relative inline-flex" wrapper a floating badge anchors to. `rail-collapsed` (a Tailwind @custom-variant, forbidden in Phase F) is reproduced as plain selectors, branch for branch: the three width- independent conditions (a fixed collapsed mode; a collapsible rail the visitor collapsed and not open; a modal rail not open) merge into one :where() group, provably the same match set as three separate rules since :where(A, B, C) on an element is true exactly when :where(A) or :where(B) or :where(C) is; the four width-gated conditions stay separate media blocks, since CSS cannot merge different `@media` queries. Every rem length becomes px, since these are dp-based M3 tokens, not a text measure (unlike 's rem widths). The FAB overrides for a rail's header — elevation 0 (N-03), morphing into an extended FAB instead of swapping two by display (N-23) — move from unlayered into this file's own material.components, like toolbar.css's FAB override: fab.css's `[data-md-fab]` is one attribute, so a doubled selector here always outranks it without needing to sit outside the layer. navigation.js: the arriving-indicator stylesheet and every code comment follow the new hooks; resources/css/components/navigation.css is deleted (nothing imports it any more) and its line in tailwind.css with it. Behaviour is unchanged except one thing Tailwind's `rail-collapsed:` variant could do that plain CSS in this shape cannot: it is gone for consuming applications too, since the definition lived only in the file this commit removes. The development skill's guidance for it is rewritten to point at navigation-rail.css's own selectors instead of teaching a Tailwind variant that no longer exists. Co-Authored-By: Claude Sonnet 5 Claude-Session: https://claude.ai/code/session_01Qwx5USif3wFFmxtHg5U1g9 --- resources/css/components.css | 3 + .../css/components/navigation-rail-item.css | 645 +++++++++++ .../components/navigation-rail-section.css | 114 ++ resources/css/components/navigation-rail.css | 1019 +++++++++++++++++ resources/js/navigation.js | 15 +- .../components/navigation-rail-item.blade.php | 18 +- .../navigation-rail-section.blade.php | 4 +- .../components/navigation-rail.blade.php | 61 +- .../Feature/Components/NavigationRailTest.php | 199 ++-- .../Components/NavigationStylesheetsTest.php | 3 + 10 files changed, 1961 insertions(+), 120 deletions(-) create mode 100644 resources/css/components/navigation-rail-item.css create mode 100644 resources/css/components/navigation-rail-section.css create mode 100644 resources/css/components/navigation-rail.css diff --git a/resources/css/components.css b/resources/css/components.css index f244ec77..34ba6668 100644 --- a/resources/css/components.css +++ b/resources/css/components.css @@ -75,3 +75,6 @@ @import './components/navigation-item.css'; @import './components/navigation-bar.css'; @import './components/navigation-bar-item.css'; +@import './components/navigation-rail.css'; +@import './components/navigation-rail-item.css'; +@import './components/navigation-rail-section.css'; diff --git a/resources/css/components/navigation-rail-item.css b/resources/css/components/navigation-rail-item.css new file mode 100644 index 00000000..48b4a250 --- /dev/null +++ b/resources/css/components/navigation-rail-item.css @@ -0,0 +1,645 @@ +/* + * ``: one destination in an ``, drawn in whichever + * shape the rail has (NavigationRailVerticalItemTokens.kt, NavigationRailHorizontalItemTokens.kt, + * NavigationRailBaselineItemTokens.kt, NavigationRailColorTokens.kt, androidx Compose Material 3, + * Apache-2.0). + * + * [data-md-navigation-rail-item] data-md-active; the link or button itself + * [data-md-navigation-indicator] the 56×32 indicator, collapsed only + * [data-md-navigation-icon] the floating badge's anchor (navigation-item.css) + * [data-md-navigation-badge-icon] the small/large badge, collapsed only + * [data-md-navigation-label] + * [data-md-navigation-badge-end] the large badge at the label's end, expanded only + * + * Expanded, a 56px full-width pill: the icon, the label-large label beside it (up to two lines, + * collapsed) and a count at its end. Collapsed, the icon sits in a 56×32 `CornerFull` indicator + * over a label-medium label, with the count on the icon instead — badges move from the icon + * (collapsed) to the label end (expanded), M3's stated rule. + * + * The item's own state layer is split in two: while expanded the layer paints the whole item (the + * 56px pill *is* the indicator); while collapsed it paints only the 56×32 box. A CSS variant + * selector cannot follow a pseudo-element, so `--navigation-item-layer`/`--navigation-indicator-layer` + * hand `--navigation-layer` (navigation-item.css) on through variables, and each rule below + * outweighs navigation-item.css's shared one with a doubled `[data-md-navigation-rail-item]` + * attribute, the same specificity trick `navigation-rail.css` uses for the header's FAB. + */ + +@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-rail-item] { + --navigation-layer: 0; + --navigation-item-layer: var(--navigation-layer); + --navigation-indicator-layer: 0; + + position: relative; + isolation: isolate; + display: flex; + flex-shrink: 0; + align-items: center; + gap: 8px; + height: 56px; + margin-inline: 20px; + padding-inline: 16px; + border-radius: var(--md-sys-shape-corner-full); + color: var(--md-sys-color-on-surface-variant); + font: var(--md-sys-typescale-label-lg); + letter-spacing: var(--md-sys-typescale-label-lg-tracking); + text-align: start; + text-decoration: none; + white-space: nowrap; + cursor: pointer; + outline: none; + -webkit-tap-highlight-color: transparent; + } + + [data-md-navigation-rail-item][data-md-navigation-rail-item]::before { + background-color: var(--md-sys-color-on-secondary-container); + opacity: var(--navigation-item-layer); + } + + [data-md-navigation-rail-item][data-md-navigation-rail-item] [data-md-navigation-indicator]::before { + background-color: var(--md-sys-color-on-secondary-container); + opacity: var(--navigation-indicator-layer); + } + + [data-md-navigation-rail-item][data-md-active] { + 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-rail-item] [data-md-navigation-indicator] { + position: relative; + isolation: isolate; + display: flex; + flex-shrink: 0; + align-items: center; + justify-content: center; + border-radius: var(--md-sys-shape-corner-full); + } + + [data-md-navigation-rail-item] [data-md-navigation-label] { + flex: 1 1 auto; + min-width: 0; + overflow: hidden; + text-overflow: ellipsis; + } + + [data-md-navigation-rail-item]:focus-visible { + outline: 3px solid var(--md-sys-color-secondary); + outline-offset: 2px; + } + + /* The large badge at the label's end, expanded only — collapsed, the badge moves onto the + icon instead (`[data-md-navigation-badge-icon]`, `display: contents` there). */ + [data-md-navigation-badge-end] { + display: flex; + flex-shrink: 0; + } + + [data-md-navigation-badge-icon] { + display: none; + } + + /* ---- Collapsed: icon over label, the 56×32 indicator, badge back on the icon. ---- */ + + [data-md-navigation-rail-item] { + &:where( + [data-md-navigation-rail='collapsed'], + [data-md-navigation-rail='collapsed'] *, + [data-rail='collapsed'] [data-md-navigation-rail='collapsible']:not([data-md-open]), + [data-rail='collapsed'] [data-md-navigation-rail='collapsible']:not([data-md-open]) *, + [data-md-navigation-rail='modal']:not([data-md-open]), + [data-md-navigation-rail='modal']:not([data-md-open]) * + ) { + flex-direction: column; + justify-content: center; + gap: 4px; + height: auto; + min-height: 64px; + margin-inline: 0; + padding: 6px 4px; + border-radius: 0; + font: var(--md-sys-typescale-label-md); + letter-spacing: var(--md-sys-typescale-label-md-tracking); + white-space: normal; + } + + @media (width < 600px) { + &:where([data-md-navigation-rail='collapsible']:not([data-md-open]), [data-md-navigation-rail='collapsible']:not([data-md-open]) *) { + flex-direction: column; + justify-content: center; + gap: 4px; + height: auto; + min-height: 64px; + margin-inline: 0; + padding: 6px 4px; + border-radius: 0; + font: var(--md-sys-typescale-label-md); + letter-spacing: var(--md-sys-typescale-label-md-tracking); + white-space: normal; + } + } + + @media (width < 840px) { + &:where([data-md-navigation-rail='adaptive']:not([data-md-open]), [data-md-navigation-rail='adaptive']:not([data-md-open]) *) { + flex-direction: column; + justify-content: center; + gap: 4px; + height: auto; + min-height: 64px; + margin-inline: 0; + padding: 6px 4px; + border-radius: 0; + font: var(--md-sys-typescale-label-md); + letter-spacing: var(--md-sys-typescale-label-md-tracking); + white-space: normal; + } + } + + @media (840px <= width < 1200px) { + &:where( + :is([data-rail='collapsed'], [data-rail-auto]) [data-md-navigation-rail='adaptive']:not([data-md-open]), + :is([data-rail='collapsed'], [data-rail-auto]) [data-md-navigation-rail='adaptive']:not([data-md-open]) * + ) { + flex-direction: column; + justify-content: center; + gap: 4px; + height: auto; + min-height: 64px; + margin-inline: 0; + padding: 6px 4px; + border-radius: 0; + font: var(--md-sys-typescale-label-md); + letter-spacing: var(--md-sys-typescale-label-md-tracking); + white-space: normal; + } + } + + @media (width >= 1200px) { + &:where( + [data-rail='collapsed'] [data-md-navigation-rail='adaptive']:not([data-md-open]), + [data-rail='collapsed'] [data-md-navigation-rail='adaptive']:not([data-md-open]) * + ) { + flex-direction: column; + justify-content: center; + gap: 4px; + height: auto; + min-height: 64px; + margin-inline: 0; + padding: 6px 4px; + border-radius: 0; + font: var(--md-sys-typescale-label-md); + letter-spacing: var(--md-sys-typescale-label-md-tracking); + white-space: normal; + } + } + } + + [data-md-navigation-rail-item] { + &:where( + [data-md-navigation-rail='collapsed'], + [data-md-navigation-rail='collapsed'] *, + [data-rail='collapsed'] [data-md-navigation-rail='collapsible']:not([data-md-open]), + [data-rail='collapsed'] [data-md-navigation-rail='collapsible']:not([data-md-open]) *, + [data-md-navigation-rail='modal']:not([data-md-open]), + [data-md-navigation-rail='modal']:not([data-md-open]) * + ) { + --navigation-item-layer: 0; + --navigation-indicator-layer: var(--navigation-layer); + } + + @media (width < 600px) { + &:where([data-md-navigation-rail='collapsible']:not([data-md-open]), [data-md-navigation-rail='collapsible']:not([data-md-open]) *) { + --navigation-item-layer: 0; + --navigation-indicator-layer: var(--navigation-layer); + } + } + + @media (width < 840px) { + &:where([data-md-navigation-rail='adaptive']:not([data-md-open]), [data-md-navigation-rail='adaptive']:not([data-md-open]) *) { + --navigation-item-layer: 0; + --navigation-indicator-layer: var(--navigation-layer); + } + } + + @media (840px <= width < 1200px) { + &:where( + :is([data-rail='collapsed'], [data-rail-auto]) [data-md-navigation-rail='adaptive']:not([data-md-open]), + :is([data-rail='collapsed'], [data-rail-auto]) [data-md-navigation-rail='adaptive']:not([data-md-open]) * + ) { + --navigation-item-layer: 0; + --navigation-indicator-layer: var(--navigation-layer); + } + } + + @media (width >= 1200px) { + &:where( + [data-rail='collapsed'] [data-md-navigation-rail='adaptive']:not([data-md-open]), + [data-rail='collapsed'] [data-md-navigation-rail='adaptive']:not([data-md-open]) * + ) { + --navigation-item-layer: 0; + --navigation-indicator-layer: var(--navigation-layer); + } + } + } + + [data-md-navigation-rail-item] [data-md-navigation-label] { + &:where( + [data-md-navigation-rail='collapsed'], + [data-md-navigation-rail='collapsed'] *, + [data-rail='collapsed'] [data-md-navigation-rail='collapsible']:not([data-md-open]), + [data-rail='collapsed'] [data-md-navigation-rail='collapsible']:not([data-md-open]) *, + [data-md-navigation-rail='modal']:not([data-md-open]), + [data-md-navigation-rail='modal']:not([data-md-open]) * + ) { + flex: none; + display: -webkit-box; + max-width: 100%; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + text-align: center; + overflow-wrap: anywhere; + } + + @media (width < 600px) { + &:where([data-md-navigation-rail='collapsible']:not([data-md-open]), [data-md-navigation-rail='collapsible']:not([data-md-open]) *) { + flex: none; + display: -webkit-box; + max-width: 100%; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + text-align: center; + overflow-wrap: anywhere; + } + } + + @media (width < 840px) { + &:where([data-md-navigation-rail='adaptive']:not([data-md-open]), [data-md-navigation-rail='adaptive']:not([data-md-open]) *) { + flex: none; + display: -webkit-box; + max-width: 100%; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + text-align: center; + overflow-wrap: anywhere; + } + } + + @media (840px <= width < 1200px) { + &:where( + :is([data-rail='collapsed'], [data-rail-auto]) [data-md-navigation-rail='adaptive']:not([data-md-open]), + :is([data-rail='collapsed'], [data-rail-auto]) [data-md-navigation-rail='adaptive']:not([data-md-open]) * + ) { + flex: none; + display: -webkit-box; + max-width: 100%; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + text-align: center; + overflow-wrap: anywhere; + } + } + + @media (width >= 1200px) { + &:where( + [data-rail='collapsed'] [data-md-navigation-rail='adaptive']:not([data-md-open]), + [data-rail='collapsed'] [data-md-navigation-rail='adaptive']:not([data-md-open]) * + ) { + flex: none; + display: -webkit-box; + max-width: 100%; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + text-align: center; + overflow-wrap: anywhere; + } + } + } + + [data-md-navigation-rail-item][data-md-active] { + &:where( + [data-md-navigation-rail='collapsed'], + [data-md-navigation-rail='collapsed'] *, + [data-rail='collapsed'] [data-md-navigation-rail='collapsible']:not([data-md-open]), + [data-rail='collapsed'] [data-md-navigation-rail='collapsible']:not([data-md-open]) *, + [data-md-navigation-rail='modal']:not([data-md-open]), + [data-md-navigation-rail='modal']:not([data-md-open]) * + ) { + background-image: none; + color: var(--md-sys-color-secondary); + } + + @media (width < 600px) { + &:where([data-md-navigation-rail='collapsible']:not([data-md-open]), [data-md-navigation-rail='collapsible']:not([data-md-open]) *) { + background-image: none; + color: var(--md-sys-color-secondary); + } + } + + @media (width < 840px) { + &:where([data-md-navigation-rail='adaptive']:not([data-md-open]), [data-md-navigation-rail='adaptive']:not([data-md-open]) *) { + background-image: none; + color: var(--md-sys-color-secondary); + } + } + + @media (840px <= width < 1200px) { + &:where( + :is([data-rail='collapsed'], [data-rail-auto]) [data-md-navigation-rail='adaptive']:not([data-md-open]), + :is([data-rail='collapsed'], [data-rail-auto]) [data-md-navigation-rail='adaptive']:not([data-md-open]) * + ) { + background-image: none; + color: var(--md-sys-color-secondary); + } + } + + @media (width >= 1200px) { + &:where( + [data-rail='collapsed'] [data-md-navigation-rail='adaptive']:not([data-md-open]), + [data-rail='collapsed'] [data-md-navigation-rail='adaptive']:not([data-md-open]) * + ) { + background-image: none; + color: var(--md-sys-color-secondary); + } + } + } + + [data-md-navigation-rail-item] [data-md-navigation-indicator] { + &:where( + [data-md-navigation-rail='collapsed'], + [data-md-navigation-rail='collapsed'] *, + [data-rail='collapsed'] [data-md-navigation-rail='collapsible']:not([data-md-open]), + [data-rail='collapsed'] [data-md-navigation-rail='collapsible']:not([data-md-open]) *, + [data-md-navigation-rail='modal']:not([data-md-open]), + [data-md-navigation-rail='modal']:not([data-md-open]) * + ) { + width: 56px; + height: 32px; + } + + @media (width < 600px) { + &:where([data-md-navigation-rail='collapsible']:not([data-md-open]), [data-md-navigation-rail='collapsible']:not([data-md-open]) *) { + width: 56px; + height: 32px; + } + } + + @media (width < 840px) { + &:where([data-md-navigation-rail='adaptive']:not([data-md-open]), [data-md-navigation-rail='adaptive']:not([data-md-open]) *) { + width: 56px; + height: 32px; + } + } + + @media (840px <= width < 1200px) { + &:where( + :is([data-rail='collapsed'], [data-rail-auto]) [data-md-navigation-rail='adaptive']:not([data-md-open]), + :is([data-rail='collapsed'], [data-rail-auto]) [data-md-navigation-rail='adaptive']:not([data-md-open]) * + ) { + width: 56px; + height: 32px; + } + } + + @media (width >= 1200px) { + &:where( + [data-rail='collapsed'] [data-md-navigation-rail='adaptive']:not([data-md-open]), + [data-rail='collapsed'] [data-md-navigation-rail='adaptive']:not([data-md-open]) * + ) { + width: 56px; + height: 32px; + } + } + } + + [data-md-navigation-rail-item][data-md-active] [data-md-navigation-indicator] { + &:where( + [data-md-navigation-rail='collapsed'], + [data-md-navigation-rail='collapsed'] *, + [data-rail='collapsed'] [data-md-navigation-rail='collapsible']:not([data-md-open]), + [data-rail='collapsed'] [data-md-navigation-rail='collapsible']:not([data-md-open]) *, + [data-md-navigation-rail='modal']:not([data-md-open]), + [data-md-navigation-rail='modal']:not([data-md-open]) * + ) { + background-image: linear-gradient(var(--md-sys-color-secondary-container), var(--md-sys-color-secondary-container)); + color: var(--md-sys-color-on-secondary-container); + } + + @media (width < 600px) { + &:where([data-md-navigation-rail='collapsible']:not([data-md-open]), [data-md-navigation-rail='collapsible']:not([data-md-open]) *) { + background-image: linear-gradient(var(--md-sys-color-secondary-container), var(--md-sys-color-secondary-container)); + color: var(--md-sys-color-on-secondary-container); + } + } + + @media (width < 840px) { + &:where([data-md-navigation-rail='adaptive']:not([data-md-open]), [data-md-navigation-rail='adaptive']:not([data-md-open]) *) { + background-image: linear-gradient(var(--md-sys-color-secondary-container), var(--md-sys-color-secondary-container)); + color: var(--md-sys-color-on-secondary-container); + } + } + + @media (840px <= width < 1200px) { + &:where( + :is([data-rail='collapsed'], [data-rail-auto]) [data-md-navigation-rail='adaptive']:not([data-md-open]), + :is([data-rail='collapsed'], [data-rail-auto]) [data-md-navigation-rail='adaptive']:not([data-md-open]) * + ) { + background-image: linear-gradient(var(--md-sys-color-secondary-container), var(--md-sys-color-secondary-container)); + color: var(--md-sys-color-on-secondary-container); + } + } + + @media (width >= 1200px) { + &:where( + [data-rail='collapsed'] [data-md-navigation-rail='adaptive']:not([data-md-open]), + [data-rail='collapsed'] [data-md-navigation-rail='adaptive']:not([data-md-open]) * + ) { + 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-rail-item]:focus-visible { + &:where( + [data-md-navigation-rail='collapsed'], + [data-md-navigation-rail='collapsed'] *, + [data-rail='collapsed'] [data-md-navigation-rail='collapsible']:not([data-md-open]), + [data-rail='collapsed'] [data-md-navigation-rail='collapsible']:not([data-md-open]) *, + [data-md-navigation-rail='modal']:not([data-md-open]), + [data-md-navigation-rail='modal']:not([data-md-open]) * + ) { + outline: none; + } + + @media (width < 600px) { + &:where([data-md-navigation-rail='collapsible']:not([data-md-open]), [data-md-navigation-rail='collapsible']:not([data-md-open]) *) { + outline: none; + } + } + + @media (width < 840px) { + &:where([data-md-navigation-rail='adaptive']:not([data-md-open]), [data-md-navigation-rail='adaptive']:not([data-md-open]) *) { + outline: none; + } + } + + @media (840px <= width < 1200px) { + &:where( + :is([data-rail='collapsed'], [data-rail-auto]) [data-md-navigation-rail='adaptive']:not([data-md-open]), + :is([data-rail='collapsed'], [data-rail-auto]) [data-md-navigation-rail='adaptive']:not([data-md-open]) * + ) { + outline: none; + } + } + + @media (width >= 1200px) { + &:where( + [data-rail='collapsed'] [data-md-navigation-rail='adaptive']:not([data-md-open]), + [data-rail='collapsed'] [data-md-navigation-rail='adaptive']:not([data-md-open]) * + ) { + outline: none; + } + } + } + + [data-md-navigation-rail-item]:focus-visible [data-md-navigation-indicator] { + &:where( + [data-md-navigation-rail='collapsed'], + [data-md-navigation-rail='collapsed'] *, + [data-rail='collapsed'] [data-md-navigation-rail='collapsible']:not([data-md-open]), + [data-rail='collapsed'] [data-md-navigation-rail='collapsible']:not([data-md-open]) *, + [data-md-navigation-rail='modal']:not([data-md-open]), + [data-md-navigation-rail='modal']:not([data-md-open]) * + ) { + outline: 3px solid var(--md-sys-color-secondary); + outline-offset: 2px; + } + + @media (width < 600px) { + &:where([data-md-navigation-rail='collapsible']:not([data-md-open]), [data-md-navigation-rail='collapsible']:not([data-md-open]) *) { + outline: 3px solid var(--md-sys-color-secondary); + outline-offset: 2px; + } + } + + @media (width < 840px) { + &:where([data-md-navigation-rail='adaptive']:not([data-md-open]), [data-md-navigation-rail='adaptive']:not([data-md-open]) *) { + outline: 3px solid var(--md-sys-color-secondary); + outline-offset: 2px; + } + } + + @media (840px <= width < 1200px) { + &:where( + :is([data-rail='collapsed'], [data-rail-auto]) [data-md-navigation-rail='adaptive']:not([data-md-open]), + :is([data-rail='collapsed'], [data-rail-auto]) [data-md-navigation-rail='adaptive']:not([data-md-open]) * + ) { + outline: 3px solid var(--md-sys-color-secondary); + outline-offset: 2px; + } + } + + @media (width >= 1200px) { + &:where( + [data-rail='collapsed'] [data-md-navigation-rail='adaptive']:not([data-md-open]), + [data-rail='collapsed'] [data-md-navigation-rail='adaptive']:not([data-md-open]) * + ) { + outline: 3px solid var(--md-sys-color-secondary); + outline-offset: 2px; + } + } + } + + [data-md-navigation-badge-end], + [data-md-navigation-badge-icon] { + &:where( + [data-md-navigation-rail='collapsed'], + [data-md-navigation-rail='collapsed'] *, + [data-rail='collapsed'] [data-md-navigation-rail='collapsible']:not([data-md-open]), + [data-rail='collapsed'] [data-md-navigation-rail='collapsible']:not([data-md-open]) *, + [data-md-navigation-rail='modal']:not([data-md-open]), + [data-md-navigation-rail='modal']:not([data-md-open]) * + ) { + display: none; + } + + @media (width < 600px) { + &:where([data-md-navigation-rail='collapsible']:not([data-md-open]), [data-md-navigation-rail='collapsible']:not([data-md-open]) *) { + display: none; + } + } + + @media (width < 840px) { + &:where([data-md-navigation-rail='adaptive']:not([data-md-open]), [data-md-navigation-rail='adaptive']:not([data-md-open]) *) { + display: none; + } + } + + @media (840px <= width < 1200px) { + &:where( + :is([data-rail='collapsed'], [data-rail-auto]) [data-md-navigation-rail='adaptive']:not([data-md-open]), + :is([data-rail='collapsed'], [data-rail-auto]) [data-md-navigation-rail='adaptive']:not([data-md-open]) * + ) { + display: none; + } + } + + @media (width >= 1200px) { + &:where( + [data-rail='collapsed'] [data-md-navigation-rail='adaptive']:not([data-md-open]), + [data-rail='collapsed'] [data-md-navigation-rail='adaptive']:not([data-md-open]) * + ) { + display: none; + } + } + } + + [data-md-navigation-badge-icon] { + &:where( + [data-md-navigation-rail='collapsed'], + [data-md-navigation-rail='collapsed'] *, + [data-rail='collapsed'] [data-md-navigation-rail='collapsible']:not([data-md-open]), + [data-rail='collapsed'] [data-md-navigation-rail='collapsible']:not([data-md-open]) *, + [data-md-navigation-rail='modal']:not([data-md-open]), + [data-md-navigation-rail='modal']:not([data-md-open]) * + ) { + display: contents; + } + + @media (width < 600px) { + &:where([data-md-navigation-rail='collapsible']:not([data-md-open]), [data-md-navigation-rail='collapsible']:not([data-md-open]) *) { + display: contents; + } + } + + @media (width < 840px) { + &:where([data-md-navigation-rail='adaptive']:not([data-md-open]), [data-md-navigation-rail='adaptive']:not([data-md-open]) *) { + display: contents; + } + } + + @media (840px <= width < 1200px) { + &:where( + :is([data-rail='collapsed'], [data-rail-auto]) [data-md-navigation-rail='adaptive']:not([data-md-open]), + :is([data-rail='collapsed'], [data-rail-auto]) [data-md-navigation-rail='adaptive']:not([data-md-open]) * + ) { + display: contents; + } + } + + @media (width >= 1200px) { + &:where( + [data-rail='collapsed'] [data-md-navigation-rail='adaptive']:not([data-md-open]), + [data-rail='collapsed'] [data-md-navigation-rail='adaptive']:not([data-md-open]) * + ) { + display: contents; + } + } + } +} diff --git a/resources/css/components/navigation-rail-section.css b/resources/css/components/navigation-rail-section.css new file mode 100644 index 00000000..187be529 --- /dev/null +++ b/resources/css/components/navigation-rail-section.css @@ -0,0 +1,114 @@ +/* + * ``: a group of ``s under a heading, in an + * ``. M3 draws a section header only while the rail is expanded; collapsed, a + * little space sets the group apart instead, and the heading keeps naming the group for a screen + * reader either way (`role="group"`/`aria-labelledby`, rendered by the view). + */ + +@layer material.reset, material.tokens, material.base, material.layout, material.components, material.text, material.visibility; + +@layer material.components { + [data-md-navigation-rail-section] { + display: flex; + flex-direction: column; + } + + [data-md-navigation-rail-section]:not(:first-child) { + &:where( + [data-md-navigation-rail='collapsed'], + [data-md-navigation-rail='collapsed'] *, + [data-rail='collapsed'] [data-md-navigation-rail='collapsible']:not([data-md-open]), + [data-rail='collapsed'] [data-md-navigation-rail='collapsible']:not([data-md-open]) *, + [data-md-navigation-rail='modal']:not([data-md-open]), + [data-md-navigation-rail='modal']:not([data-md-open]) * + ) { + margin-top: 12px; + } + + @media (width < 600px) { + &:where([data-md-navigation-rail='collapsible']:not([data-md-open]), [data-md-navigation-rail='collapsible']:not([data-md-open]) *) { + margin-top: 12px; + } + } + + @media (width < 840px) { + &:where([data-md-navigation-rail='adaptive']:not([data-md-open]), [data-md-navigation-rail='adaptive']:not([data-md-open]) *) { + margin-top: 12px; + } + } + + @media (840px <= width < 1200px) { + &:where( + :is([data-rail='collapsed'], [data-rail-auto]) [data-md-navigation-rail='adaptive']:not([data-md-open]), + :is([data-rail='collapsed'], [data-rail-auto]) [data-md-navigation-rail='adaptive']:not([data-md-open]) * + ) { + margin-top: 12px; + } + } + + @media (width >= 1200px) { + &:where( + [data-rail='collapsed'] [data-md-navigation-rail='adaptive']:not([data-md-open]), + [data-rail='collapsed'] [data-md-navigation-rail='adaptive']:not([data-md-open]) * + ) { + margin-top: 12px; + } + } + } + + [data-md-navigation-rail-heading] { + display: flex; + align-items: center; + min-height: 48px; + padding-inline: 36px 20px; + overflow: hidden; + 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; + text-overflow: ellipsis; + } + + [data-md-navigation-rail-heading] { + &:where( + [data-md-navigation-rail='collapsed'], + [data-md-navigation-rail='collapsed'] *, + [data-rail='collapsed'] [data-md-navigation-rail='collapsible']:not([data-md-open]), + [data-rail='collapsed'] [data-md-navigation-rail='collapsible']:not([data-md-open]) *, + [data-md-navigation-rail='modal']:not([data-md-open]), + [data-md-navigation-rail='modal']:not([data-md-open]) * + ) { + display: none; + } + + @media (width < 600px) { + &:where([data-md-navigation-rail='collapsible']:not([data-md-open]), [data-md-navigation-rail='collapsible']:not([data-md-open]) *) { + display: none; + } + } + + @media (width < 840px) { + &:where([data-md-navigation-rail='adaptive']:not([data-md-open]), [data-md-navigation-rail='adaptive']:not([data-md-open]) *) { + display: none; + } + } + + @media (840px <= width < 1200px) { + &:where( + :is([data-rail='collapsed'], [data-rail-auto]) [data-md-navigation-rail='adaptive']:not([data-md-open]), + :is([data-rail='collapsed'], [data-rail-auto]) [data-md-navigation-rail='adaptive']:not([data-md-open]) * + ) { + display: none; + } + } + + @media (width >= 1200px) { + &:where( + [data-rail='collapsed'] [data-md-navigation-rail='adaptive']:not([data-md-open]), + [data-rail='collapsed'] [data-md-navigation-rail='adaptive']:not([data-md-open]) * + ) { + display: none; + } + } + } +} diff --git a/resources/css/components/navigation-rail.css b/resources/css/components/navigation-rail.css new file mode 100644 index 00000000..8f222bcb --- /dev/null +++ b/resources/css/components/navigation-rail.css @@ -0,0 +1,1019 @@ +/* + * ``: M3 Expressive's navigation rail, collapsed (96px, icon over label) or + * expanded (a full-width pill, icon beside label) down the start edge of a `medium` or wider + * window (NavigationRailCollapsedTokens.kt, NavigationRailExpandedTokens.kt, androidx Compose + * Material 3, Apache-2.0, and the layout of WideNavigationRail.kt; + * docs/reference/m3/components-navigation-selection-inputs.md § Navigation Rail). + * + * [data-md-navigation-rail="collapsed|expanded|collapsible|modal|adaptive"] data-md-open + * [data-md-navigation-rail-scrim] modal and adaptive rails, open only + * [data-md-navigation-rail-panel] the