@expressivecss/expressive 0.15.0 → 0.16.0

package/src/sass/components/_navbar.scss

@@ -51,7 +51,7 @@
 $_bar: ":is(nav:not(.tabs, .navigation-bar, .navigation-rail), .bar)";
 $_heading: ":is(h1, h2, h3, h4, h5, h6)";
 $_title: ":is(#{$_heading}, hgroup)";
-$_search: ":is(.search-bar, .searchbar)";
+$_search: ".search-bar";
 
 header:has(> #{$_bar}) {
   --md-comp-top-app-bar-container-color: var(--md-sys-color-surface);
@@ -63,8 +63,8 @@ header:has(> #{$_bar}) {
   // the headline; trailing is everything after it.
   --md-comp-top-app-bar-leading-icon-color: inherit;
   --md-comp-top-app-bar-trailing-icon-color: inherit;
-  --md-comp-top-app-bar-container-height: 64px;
-  --md-comp-top-app-bar-leading-icon-size: 24px;
+  --md-comp-top-app-bar-container-height: #{rem(64px)};
+  --md-comp-top-app-bar-leading-icon-size: #{rem(24px)};
   --md-comp-top-app-bar-container-shape: 0;
 
   background-color: color-mix(
@@ -87,6 +87,22 @@ header:has(> #{$_bar}) {
     margin: 0;
   }
 
+  // Destinations that do not fit beside the title move to a row of their
+  // own, rather than squeezing the title down to its first letter. On one
+  // row both stretch to the bar and the title stays centred, so the sizes
+  // below only show once the row wraps.
+  > #{$_bar}:has(> :is(menu, ul)) {
+    flex-wrap: wrap;
+
+    > #{$_title} {
+      padding-block: 8px;
+    }
+
+    > :is(menu, ul) {
+      min-height: rem(48px);
+    }
+  }
+
   > #{$_bar} > #{$_title} {
     flex: 1 1 auto;
     min-width: 0;
@@ -135,8 +151,8 @@ header:has(> #{$_bar}) {
     flex: 0 0 auto;
     align-items: center;
     justify-content: center;
-    width: 48px;
-    height: 48px;
+    width: rem(48px);
+    height: rem(48px);
     padding: 0;
     // Leave margin-inline-start unset so a medium/large bar can push
     // the first trailing action to the end with margin-inline-start: auto.
@@ -161,11 +177,11 @@ header:has(> #{$_bar}) {
     }
 
     &:hover {
-      background-color: color-mix(in oklab, currentColor 8%, transparent);
+      background-color: state-layer(currentColor, "hover");
     }
 
     &:active {
-      background-color: color-mix(in oklab, currentColor 10%, transparent);
+      background-color: state-layer(currentColor, "pressed");
     }
   }
 
@@ -236,10 +252,7 @@ header:has(> #{$_bar}) {
       background: transparent;
       box-shadow: none;
       color: inherit;
-      font-family: var(--md-sys-typescale-body-large-font-family-name);
-      font-size: var(--md-sys-typescale-body-large-font-size);
-      font-weight: var(--md-sys-typescale-body-large-font-weight);
-      line-height: var(--md-sys-typescale-body-large-line-height);
+      @include typescale("body-large");
 
       &:focus,
       &:focus-visible {
@@ -277,11 +290,12 @@ header:has(> #{$_bar}) {
   @include focus-visible;
 
   &:hover:not(.active) {
-    background-color: color-mix(in oklab, currentColor 8%, transparent);
+    background-color: state-layer(currentColor, "hover");
   }
 
   &.active {
-    background-color: color-mix(in oklab, currentColor 10%, transparent);
+    background-color: state-layer(currentColor, "pressed");
+    @include forced-colors-selected;
   }
 }
 
@@ -327,7 +341,7 @@ header.large:has(> #{$_bar}) > #{$_bar} {
   &::before {
     content: "";
     flex: 0 0 0;
-    height: 48px;
+    height: rem(48px);
   }
 
   > #{$_title} {
@@ -357,7 +371,7 @@ header.large:has(> #{$_bar}) > #{$_bar} {
 }
 
 header.medium:has(> #{$_bar}) > #{$_bar} {
-  min-height: 112px;
+  min-height: rem(112px);
   padding-bottom: 20px;
 
   > #{$_title} {
@@ -375,11 +389,11 @@ header.medium:has(> #{$_bar}) > #{$_bar} {
 }
 
 header.medium:has(> #{$_bar} > hgroup > p) > #{$_bar} {
-  min-height: 136px;
+  min-height: rem(136px);
 }
 
 header.large:has(> #{$_bar}) > #{$_bar} {
-  min-height: 120px;
+  min-height: rem(120px);
   padding-bottom: 20px;
 
   > #{$_title} {
@@ -397,7 +411,7 @@ header.large:has(> #{$_bar}) > #{$_bar} {
 }
 
 header.large:has(> #{$_bar} > hgroup > p) > #{$_bar} {
-  min-height: 152px;
+  min-height: rem(152px);
   padding-bottom: 28px;
 }
 
@@ -416,7 +430,7 @@ header.large.collapsed:has(> #{$_bar}) > #{$_bar} {
   flex-wrap: nowrap;
   align-content: center;
   align-items: center;
-  min-height: 64px;
+  min-height: rem(64px);
   padding-top: 0;
   padding-bottom: 0;
 
@@ -464,7 +478,7 @@ header.large.collapsed:has(> #{$_bar}) > #{$_bar} {
 header:has(> #{$_bar}) {
   position: sticky;
   top: 0;
-  z-index: 997;
+  z-index: var(--expressive-z-app-bar);
 
   @supports (animation-timeline: scroll()) {
     animation: top-app-bar-scroll linear both;

package/src/sass/components/_navigation-bar.scss

@@ -2,7 +2,7 @@
 
 // Navigation bar. Destinations, not the app bar (header:has(> nav)).
 // Anatomy is the HTML: a nav.navigation-bar of <a> or <button> items.
-// A leading <i> is the icon; the remaining text is the label.
+// A leading icon is the icon; the remaining text is the label.
 // aria-current (or .active) is the selected destination.
 //
 // Two layouts (M3 Expressive):
@@ -32,7 +32,7 @@
   // 56 here, which is the rail's value copied onto the bar.
   --md-comp-nav-bar-indicator-width: 64px;
   --md-comp-nav-bar-indicator-height: 32px;
-  --md-comp-nav-bar-indicator-shape: 16px;
+  --md-comp-nav-bar-indicator-shape: var(--md-sys-shape-corner-large);
   --md-comp-nav-bar-active-indicator-color: var(--md-sys-color-secondary-container);
   --md-comp-nav-bar-active-color: var(--md-sys-color-on-secondary-container);
 
@@ -70,51 +70,12 @@
     @include typescale("label-medium");
     @include focus-visible;
 
-    > #{$icon} {
-      display: flex;
-      flex-shrink: 0;
-      align-items: center;
-      justify-content: center;
-      box-sizing: border-box;
-      width: var(--md-comp-nav-bar-indicator-width);
-      height: var(--md-comp-nav-bar-indicator-height);
-      border-radius: var(--md-comp-nav-bar-indicator-shape);
-      font-size: var(--md-comp-nav-bar-icon-size);
-      color: inherit;
-      transition: background-color 0.2s ease-out;
-    }
-
-    &:hover:not(.active, [aria-current]) > #{$icon} {
-      background-color: color-mix(in oklab, var(--md-sys-color-on-surface) state-opacity("hover"), transparent);
-    }
-
-    &.active,
-    &[aria-current] {
-      color: var(--md-sys-color-on-surface);
-
-      > #{$icon} {
-        background-color: var(--md-comp-nav-bar-active-indicator-color);
-        color: var(--md-comp-nav-bar-active-color);
-        --md-icon-fill: 1;
-      }
-    }
-
-    &.disabled,
-    &[aria-disabled="true"] {
-      pointer-events: none;
-      color: color-mix(in oklab, var(--md-sys-color-on-surface) 38%, transparent);
-    }
-
     // Sibling badge. Child-of-icon is handled in _badges.scss.
-    > .badge {
-      position: absolute;
-      z-index: 1;
-      top: calc(4px + (var(--md-comp-nav-bar-indicator-height) - 24px) / 2);
-      inset-inline-start: calc(50% + 12px);
-      transform: translate(-50%, -50%);
-
-      &:dir(rtl) {
-        transform: translate(50%, -50%);
+    @include nav-destination("nav-bar", 4px, background-color var(--md-sys-motion-duration-short4) ease-out) {
+      &.disabled,
+      &[aria-disabled="true"] {
+        pointer-events: none;
+        color: color-mix(in oklab, var(--md-sys-color-on-surface) 38%, transparent);
       }
     }
   }
@@ -131,40 +92,11 @@
       padding: 8px 16px;
       border-radius: var(--md-comp-nav-bar-indicator-shape);
 
-      > #{$icon} {
-        width: var(--md-comp-nav-bar-icon-size);
-        height: var(--md-comp-nav-bar-icon-size);
-        border-radius: 0;
-      }
+      @include nav-destination-row("nav-bar");
 
       > .badge {
         top: calc(50% - 12px);
-        left: auto;
         inset-inline-start: calc(16px + 24px);
-        transform: translate(-50%, -50%);
-
-        &:dir(rtl) {
-          transform: translate(50%, -50%);
-        }
-      }
-
-      &:hover:not(.active, [aria-current]) {
-        background-color: color-mix(in oklab, var(--md-sys-color-on-surface) state-opacity("hover"), transparent);
-
-        > #{$icon} {
-          background-color: transparent;
-        }
-      }
-
-      &.active,
-      &[aria-current] {
-        background-color: var(--md-comp-nav-bar-active-indicator-color);
-        color: var(--md-comp-nav-bar-active-color);
-
-        > #{$icon} {
-          background-color: transparent;
-          color: inherit;
-        }
       }
     }
   }
@@ -172,6 +104,12 @@
   &.fixed {
     position: sticky;
     bottom: 0;
-    z-index: 997;
+    z-index: var(--expressive-z-app-bar);
   }
 }
+
+// Navigation does nothing on paper. Important so a size or state rule that sets
+// `display` cannot bring it back; see base/_print.scss for the page itself.
+@media print {
+  .navigation-bar { display: none !important; }
+}

package/src/sass/components/_navigation-rail.scss

@@ -4,11 +4,16 @@
 // navigation bar.
 //
 // Anatomy is the HTML: a nav.navigation-rail. The first
-// button:not(.button) is the menu toggle. A .button child is the
-// optional FAB. Other <a>/<button> are destinations (leading <i>,
+// button:not(.button) is the menu toggle, unless it opens a side
+// panel. A .button child is the optional FAB. Other <a>/<button> are destinations (leading icon,
 // remaining text is the label, optional .badge). A heading is a
 // section header (expanded only). aria-current / .active is selected.
 //
+// Side panel: a destination <button popovertarget> followed by its
+// .navigation-rail-panel [popover]. The panel docks beside the rail at full
+// height and holds links, headings and <details> groups. The browser owns
+// click, light dismiss, Escape and the expanded state; JS opens it on hover.
+//
 // .expanded widens the rail (icon+label on one row, extended FAB).
 // Below `small`, .expanded is modal (scrim). .modal forces that
 // overlay at every breakpoint. JS toggles .expanded from the menu
@@ -21,6 +26,7 @@
 //   --md-comp-nav-rail-indicator-width     56px
 //   --md-comp-nav-rail-indicator-height    32px / 56px expanded
 //   --md-comp-nav-rail-fab-size            56px
+//   --md-comp-nav-rail-panel-width         256px
 //
 // Nest descendants inside this block.
 
@@ -32,8 +38,9 @@
 // Expanded rail as an overlay with a scrim.
 @mixin _modal-rail {
   position: fixed;
-  inset: 0 auto 0 0;
-  z-index: 998;
+  inset-block: 0;
+  inset-inline: 0 auto;
+  z-index: var(--expressive-z-modal-rail);
   @include z-depth("1");
 
   // A blurred rail would become the containing block of the fixed scrim
@@ -54,11 +61,16 @@
   --md-comp-nav-rail-icon-size: 24px;
   --md-comp-nav-rail-indicator-width: 56px;
   --md-comp-nav-rail-indicator-height: 32px;
-  --md-comp-nav-rail-indicator-shape: 16px;
+  --md-comp-nav-rail-indicator-shape: var(--md-sys-shape-corner-large);
   --md-comp-nav-rail-fab-size: 56px;
   --md-comp-nav-rail-active-indicator-color: var(--md-sys-color-secondary-container);
   --md-comp-nav-rail-active-color: var(--md-sys-color-on-secondary-container);
-  --md-comp-nav-rail-duration: 250ms;
+  --md-comp-nav-rail-duration: var(--md-sys-motion-duration-medium1);
+  // Expanding and collapsing resize the rail, so they run on the default
+  // spatial spring and follow the motion="expressive" switch. The rail grows
+  // from its docked edge, so an overshoot only widens it for a moment.
+  --md-comp-nav-rail-motion: var(--md-sys-motion-spring-default-spatial);
+  --md-comp-nav-rail-motion-duration: var(--md-sys-motion-spring-default-spatial-duration);
 
   box-sizing: border-box;
   display: flex;
@@ -75,13 +87,13 @@
   overscroll-behavior: contain;
   background-color: var(--md-sys-color-surface-container);
   color: var(--md-sys-color-on-surface);
-  transition: width var(--md-comp-nav-rail-duration) ease,
-    min-width var(--md-comp-nav-rail-duration) ease,
-    padding var(--md-comp-nav-rail-duration) ease;
+  transition: width var(--md-comp-nav-rail-motion-duration) var(--md-comp-nav-rail-motion),
+    min-width var(--md-comp-nav-rail-motion-duration) var(--md-comp-nav-rail-motion),
+    padding var(--md-comp-nav-rail-motion-duration) var(--md-comp-nav-rail-motion);
   @include glass(var(--md-sys-color-surface-container));
 
   // Menu toggle.
-  > button:not(.button, .icon-button):first-child {
+  > button:not(.button, .icon-button, [popovertarget]):first-child {
     display: flex;
     flex: 0 0 auto;
     align-items: center;
@@ -105,12 +117,14 @@
     }
 
     &:hover {
-      background-color: color-mix(in oklab, var(--md-sys-color-on-surface) state-opacity("hover"), transparent);
+      background-color: state-layer(var(--md-sys-color-on-surface), "hover");
     }
   }
 
   // Optional FAB. Collapsed: icon-only 56dp. Expanded: extended.
   > :is(a, button).button {
+    --md-comp-filled-button-icon-size: 24px;
+
     display: inline-flex;
     flex: 0 0 auto;
     align-items: center;
@@ -122,23 +136,19 @@
     margin: 4px 0 16px;
     padding: 0;
     overflow: hidden;
-    border-radius: 16px;
+    border-radius: var(--md-sys-shape-corner-large);
     color: var(--md-sys-color-on-primary-container);
     background-color: var(--md-sys-color-primary-container);
     text-decoration: none;
 
     > :not(#{$icon}) {
-      position: absolute;
-      width: 1px;
-      height: 1px;
-      overflow: hidden;
-      clip-path: inset(50%);
+      @include visually-hidden;
     }
   }
 
   // Destinations.
   > a:not(.button, .icon-button),
-  > button:not(.button, .icon-button):not(:first-child) {
+  > button:not(.button, .icon-button):is(:not(:first-child), [popovertarget]) {
     position: relative;
     display: flex;
     flex: 0 0 auto;
@@ -148,6 +158,8 @@
     gap: 4px;
     box-sizing: border-box;
     width: 100%;
+    // A <button> destination would keep the default button's 40px height.
+    height: auto;
     margin: 0;
     padding: 6px 0;
     border: 0;
@@ -160,48 +172,9 @@
     @include typescale("label-medium");
     @include focus-visible;
 
-    > #{$icon} {
-      display: flex;
-      flex-shrink: 0;
-      align-items: center;
-      justify-content: center;
-      box-sizing: border-box;
-      width: var(--md-comp-nav-rail-indicator-width);
-      height: var(--md-comp-nav-rail-indicator-height);
-      border-radius: var(--md-comp-nav-rail-indicator-shape);
-      font-size: var(--md-comp-nav-rail-icon-size);
-      color: inherit;
-      transition: background-color var(--md-comp-nav-rail-duration) ease;
-    }
-
-    &:hover:not(.active, [aria-current]) > #{$icon} {
-      background-color: color-mix(in oklab, var(--md-sys-color-on-surface) state-opacity("hover"), transparent);
-    }
-
-    &.active,
-    &[aria-current] {
-      color: var(--md-sys-color-on-surface);
-
-      > #{$icon} {
-        background-color: var(--md-comp-nav-rail-active-indicator-color);
-        color: var(--md-comp-nav-rail-active-color);
-        --md-icon-fill: 1;
-      }
-    }
-
     // Sibling badge (icon + label + .badge). Child-of-icon is handled
-    // in _badges.scss. Sit on the upper trailing corner of the 24dp glyph.
-    > .badge {
-      position: absolute;
-      z-index: 1;
-      top: calc(6px + (var(--md-comp-nav-rail-indicator-height) - 24px) / 2);
-      inset-inline-start: calc(50% + 12px);
-      transform: translate(-50%, -50%);
-
-      &:dir(rtl) {
-        transform: translate(50%, -50%);
-      }
-    }
+    // in _badges.scss.
+    @include nav-destination("nav-rail", 6px, background-color var(--md-comp-nav-rail-duration) ease);
   }
 
   > :is(h1, h2, h3, h4, h5, h6) {
@@ -216,14 +189,14 @@
 
   &.expanded {
     --md-comp-nav-rail-indicator-height: 56px;
-    --md-comp-nav-rail-indicator-shape: 28px;
+    --md-comp-nav-rail-indicator-shape: var(--md-sys-shape-corner-extra-large);
 
     align-items: stretch;
     width: clamp(220px, var(--md-comp-nav-rail-expanded-width), 360px);
     min-width: 220px;
     padding-inline: 16px;
 
-    > button:not(.button, .icon-button):first-child {
+    > button:not(.button, .icon-button, [popovertarget]):first-child {
       justify-content: flex-start;
       width: auto;
       padding-inline: 16px;
@@ -240,6 +213,7 @@
         position: static;
         width: auto;
         height: auto;
+        margin: 0;
         overflow: visible;
         clip-path: none;
         @include typescale("label-large");
@@ -247,7 +221,7 @@
     }
 
     > a:not(.button, .icon-button),
-    > button:not(.button, .icon-button):not(:first-child) {
+    > button:not(.button, .icon-button):is(:not(:first-child), [popovertarget]) {
       flex-direction: row;
       justify-content: flex-start;
       gap: 12px;
@@ -256,46 +230,21 @@
       border-radius: var(--md-comp-nav-rail-indicator-shape);
       text-align: start;
 
-      > #{$icon} {
-        width: var(--md-comp-nav-rail-icon-size);
-        height: var(--md-comp-nav-rail-icon-size);
-        border-radius: 0;
-      }
-
-      &:hover:not(.active, [aria-current]) {
-        background-color: color-mix(in oklab, var(--md-sys-color-on-surface) state-opacity("hover"), transparent);
-
-        > #{$icon} {
-          background-color: transparent;
-        }
-      }
-
-      &.active,
-      &[aria-current] {
-        background-color: var(--md-comp-nav-rail-active-indicator-color);
-        color: var(--md-comp-nav-rail-active-color);
-
-        > #{$icon} {
-          background-color: transparent;
-          color: inherit;
-        }
-      }
+      @include nav-destination-row("nav-rail");
 
       > .badge {
         top: calc((var(--md-comp-nav-rail-indicator-height) - 24px) / 2);
-        left: auto;
         inset-inline-start: calc(16px + 24px);
-        transform: translate(-50%, -50%);
-
-        &:dir(rtl) {
-          transform: translate(50%, -50%);
-        }
       }
     }
 
     > :is(h1, h2, h3, h4, h5, h6) {
       display: block;
     }
+
+    > .navigation-rail-panel {
+      --_nav-rail-panel-offset: 16px;
+    }
   }
 
   &.expanded.modal {
@@ -309,8 +258,118 @@
   }
 }
 
+// A destination whose panel is open keeps its hover state layer.
+.navigation-rail:not(.expanded) > button:has(+ .navigation-rail-panel:popover-open):not(.active, [aria-current]) > #{$icon},
+.navigation-rail.expanded > button:has(+ .navigation-rail-panel:popover-open):not(.active, [aria-current]) {
+  background-color: state-layer(var(--md-sys-color-on-surface), "hover");
+}
+
+// Docks against the trigger's inline end; the offset clears the rail's
+// inline padding so the panel meets the rail's edge. The position area is
+// the space after the trigger, so 100% is what is left of the window.
+.navigation-rail-panel {
+  --_nav-rail-panel-offset: 8px;
+
+  box-sizing: border-box;
+  inline-size: var(--md-comp-nav-rail-panel-width, 256px);
+  max-inline-size: calc(100% - var(--_nav-rail-panel-offset));
+  block-size: auto;
+  inset: auto;
+  margin: 0;
+  margin-inline-start: var(--_nav-rail-panel-offset);
+  overflow: auto;
+  overscroll-behavior: contain;
+  border: 0;
+  border-start-end-radius: var(--md-sys-shape-corner-large);
+  border-end-end-radius: var(--md-sys-shape-corner-large);
+  background-color: var(--md-sys-color-surface-container);
+  color: var(--md-sys-color-on-surface-variant);
+  @include z-depth("1");
+
+  position-area: span-all inline-end;
+  align-self: stretch;
+
+  // Here, not on the base rule, so the global [popover] reset in _menu.scss,
+  // which loads later, cannot clear it.
+  &:popover-open {
+    display: flex;
+    flex-direction: column;
+    padding: 12px;
+  }
+
+  :is(a, summary) {
+    display: flex;
+    flex: none;
+    align-items: center;
+    gap: 12px;
+    box-sizing: border-box;
+    min-block-size: 48px;
+    padding: 0 16px;
+    border-radius: 24px;
+    color: inherit;
+    text-decoration: none;
+    cursor: pointer;
+    @include typescale("label-large");
+    @include focus-visible;
+
+    &:hover:not([aria-current]) {
+      background-color: state-layer(var(--md-sys-color-on-surface), "hover");
+    }
+
+    &[aria-current] {
+      background-color: var(--md-comp-nav-rail-active-indicator-color);
+      color: var(--md-comp-nav-rail-active-color);
+      @include forced-colors-selected;
+    }
+  }
+
+  summary {
+    list-style: none;
+
+    &::-webkit-details-marker {
+      display: none;
+    }
+
+    &::after {
+      content: "";
+      flex: none;
+      inline-size: 18px;
+      block-size: 18px;
+      margin-inline-start: auto;
+      background-color: currentColor;
+      mask: $caret-down center / 18px no-repeat;
+      transition: transform var(--md-sys-motion-duration-short3) ease-out;
+    }
+  }
+
+  details[open] > summary::after {
+    transform: rotate(180deg);
+  }
+
+  details > a {
+    padding-inline-start: 28px;
+  }
+
+  > :is(h1, h2, h3, h4, h5, h6) {
+    margin: 0;
+    padding: 16px 16px 8px;
+    @include typescale("title-small");
+  }
+
+  @media (forced-colors: active) {
+    border: 1px solid CanvasText;
+  }
+}
+
 @media (prefers-reduced-motion: reduce) {
+  .navigation-rail-panel summary::after,
   .navigation-rail {
     transition: none;
   }
 }
+
+// Navigation does nothing on paper. Important so a size or state rule that sets
+// `display` cannot bring it back; see base/_print.scss for the page itself.
+@media print {
+  .navigation-rail { display: none !important; }
+}