@expressivecss/expressive 0.3.0 → 0.4.0

package/src/sass/components/_sidenav.scss

@@ -1,36 +1,154 @@
 @use "../abstracts" as *;
 
+// Navigation drawer.
+//
+// Overlay is a modal <dialog> (JS wraps a <ul class="sidenav"> in
+// dialog.sidenav-overlay, or the author writes <dialog class="sidenav">).
+// showModal() puts it on the top layer; ::backdrop is the scrim; Escape
+// and a scrim tap close it. Drag writes --md-comp-nav-drawer-shift;
+// this file does the slide.
+//
+// .sidenav-fixed is a breakpoint, not a JS open(): at `large` the host
+// is display: contents so the list is a docked sidebar. Below that it
+// is the same overlay drawer as any other sidenav.
+//
+// Tokens:
+//   --md-comp-nav-drawer-width          300px
+//   --md-comp-nav-drawer-item-height    48px
+//   --md-comp-nav-drawer-duration       250ms
+//   --md-comp-nav-drawer-easing
+//   --md-comp-nav-drawer-shift          0px   (JS, px from fully open)
+//   --md-comp-nav-drawer-open           1     (JS, 0–1 scrim opacity)
+//   --md-comp-nav-drawer-font-size      14px
+//   --md-comp-nav-drawer-padding        16px
+//   --md-comp-nav-drawer-line-height    item height
+
+:root {
+  --md-comp-nav-drawer-width: 300px;
+}
+
+dialog.sidenav-overlay,
+dialog.sidenav {
+  --md-comp-nav-drawer-item-height: 48px;
+  --md-comp-nav-drawer-duration: 250ms;
+  --md-comp-nav-drawer-easing: ease;
+  --md-comp-nav-drawer-shift: 0px;
+  --md-comp-nav-drawer-open: 1;
+  --md-comp-nav-drawer-font-size: 14px;
+  --md-comp-nav-drawer-padding: 16px;
+  --md-comp-nav-drawer-line-height: var(--md-comp-nav-drawer-item-height);
+
+  box-sizing: border-box;
+  width: var(--md-comp-nav-drawer-width);
+  min-width: 0;
+  max-width: none;
+  max-height: none;
+  height: 100dvh;
+  margin: 0;
+  padding: 0;
+  border: none;
+  border-radius: 0;
+  inset: 0 auto 0 0;
+  overflow: hidden;
+  color: var(--md-sys-color-on-surface);
+  background-color: var(--md-sys-color-surface);
+  outline: none;
+  @include z-depth("1");
+
+  transform: translateX(calc(-100% + var(--md-comp-nav-drawer-shift)));
+  transition:
+    transform var(--md-comp-nav-drawer-duration) var(--md-comp-nav-drawer-easing),
+    display var(--md-comp-nav-drawer-duration) allow-discrete,
+    overlay var(--md-comp-nav-drawer-duration) allow-discrete;
+
+  &:modal {
+    display: flex;
+    flex-direction: column;
+    transform: translateX(var(--md-comp-nav-drawer-shift));
+  }
+
+  &.right-aligned {
+    inset: 0 0 0 auto;
+    transform: translateX(calc(100% - var(--md-comp-nav-drawer-shift)));
+
+    &:modal {
+      transform: translateX(calc(-1 * var(--md-comp-nav-drawer-shift)));
+    }
+  }
+
+  &.dragging {
+    transition: none;
+  }
+
+  &::backdrop {
+    background-color: color-mix(in oklab, var(--md-sys-color-scrim) 32%, transparent);
+    opacity: var(--md-comp-nav-drawer-open, 1);
+    backdrop-filter: none;
+    transition:
+      opacity var(--md-comp-nav-drawer-duration) var(--md-comp-nav-drawer-easing),
+      display var(--md-comp-nav-drawer-duration) allow-discrete,
+      overlay var(--md-comp-nav-drawer-duration) allow-discrete;
+  }
+}
+
+@starting-style {
+  :is(dialog.sidenav-overlay, dialog.sidenav):modal {
+    transform: translateX(-100%);
+  }
+
+  :is(dialog.sidenav-overlay, dialog.sidenav).right-aligned:modal {
+    transform: translateX(100%);
+  }
+
+  :is(dialog.sidenav-overlay, dialog.sidenav):modal::backdrop {
+    opacity: 0;
+  }
+}
+
+@media (prefers-reduced-motion: reduce) {
+  dialog.sidenav-overlay,
+  dialog.sidenav {
+    transition: none;
+
+    &::backdrop {
+      transition: none;
+    }
+  }
+}
+
+// Docked sidebar: the host must not be a box, or it would steal the
+// list's position:fixed. Closed, so it is not :modal and does not
+// lock the page.
+@include bp-up("large") {
+  dialog.sidenav-overlay:has(> .sidenav-fixed):not(:modal) {
+    display: contents;
+  }
+}
+
 .sidenav {
-  --sidenav-width: 300px;
-  --sidenav-font-size: 14px;
-  --sidenav-padding: 16px;
-  --sidenav-item-height: 48px;
-  --sidenav-line-height: var(--sidenav-item-height);
+  --md-comp-nav-drawer-item-height: 48px;
+  --md-comp-nav-drawer-font-size: 14px;
+  --md-comp-nav-drawer-padding: 16px;
+  --md-comp-nav-drawer-line-height: var(--md-comp-nav-drawer-item-height);
 
+  box-sizing: border-box;
   position: fixed;
-  width: var(--sidenav-width);
-  left: 0;
-  top: 0;
+  width: var(--md-comp-nav-drawer-width);
+  inset: 0 auto 0 0;
   margin: 0;
-  transform: translateX(-100%);
-  height: 100vh;
   padding: 0;
+  height: 100dvh;
   z-index: 999;
   overflow-y: auto;
-  will-change: transform;
-  backface-visibility: hidden;
-  transform: translateX(-105%); 
+  overscroll-behavior: contain;
   user-select: none;
-  
-  color: var(--md-sys-color-on-secondary-container);
+  color: var(--md-sys-color-on-surface);
   background-color: var(--md-sys-color-surface);
+  transform: translateX(-100%);
   @include z-depth("1");
 
-  // Right Align
   &.right-aligned {
-    right: 0;
-    transform: translateX(105%);
-    left: auto;
+    inset: 0 0 0 auto;
     transform: translateX(100%);
   }
 
@@ -38,92 +156,79 @@
     margin: 0;
   }
 
-  /* Hover only on top row */
-  /*a:hover {
-    //color: red;
-    //background-color: var(--md-sys-color-on-secondary-container);
-    //md.sys.color.on-secondary-container
-  }*/
-  a:focus {
-    background-color: rgba(0, 0, 0, 0.12);
+  li {
+    list-style: none;
+    display: grid;
+    align-content: center;
   }
 
-  li.active > a:not(.collapsible-header):not(.btn):not(.btn-large):not(.btn-small):not(.btn-flat):not(.btn-large):not(.btn-floating)  {
-    //color: var(--md-sys-color-on-secondary-container); //var(--md-sys-color-on-secondary-container);
-    //background-color: var(--md-sys-color-secondary-container);
+  li.active > a:not(.button, .circle, .extra) {
     background-color: color-mix(in oklab, var(--md-sys-color-secondary) 10%, transparent);
   }
 
-  .collapsible-body > ul { padding-left: 10px; }
-
-  li {    
-    list-style: none;
-    display: grid;
-    align-content: center;
+  details > div > ul {
+    padding-left: 10px;
   }
+
   li > a {
-    /* https://stackoverflow.com/questions/5848090/full-width-hover-background-for-nested-lists */
-    //padding-left: calc(100% + var(--sidenav-padding));
-    //margin-left: -100%;
-    margin: 0 12px;
-    padding: 0 var(--sidenav-padding);
-    //padding-left: var(--sidenav-padding);
-    // Truncate too long text
-    /*
-    min-width: 0;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    */
     display: flex;
-    height: var(--sidenav-item-height);
-    font-size: var(--sidenav-font-size);
-    font-weight: 500;
     align-items: center;
+    margin: 0 12px;
+    padding: 0 var(--md-comp-nav-drawer-padding);
+    height: var(--md-comp-nav-drawer-item-height);
     overflow: hidden;
     border-radius: 100px;
+    font-size: var(--md-comp-nav-drawer-font-size);
+    font-weight: 500;
 
-    &:not(.btn):not(.button):not(.btn-flat):not(.btn-large):not(.btn-floating) {
+    &:not(.button, .circle, .extra) {
       color: var(--md-sys-color-on-secondary-container);
+
       &:hover {
-        //color: var(--md-sys-color-on-secondary-container);
-        //md.sys.color.on-secondary-container
         background-color: color-mix(in oklab, var(--md-sys-color-on-surface) 8%, transparent);
       }
+
+      @include focus-visible;
     }
 
-    &.btn, &.button, &.btn-large, &.btn-flat, &.btn-floating {
+    &.button,
+    &.circle,
+    &.extra {
       margin: 10px 15px;
     }
 
-    /* TODO: Use special class in future like "mw-icon" */
-    & > :is(.material-symbols, .material-symbols-outlined, .material-symbols-rounded, .material-symbols-sharp, .material-icons) {
+    > :is(
+      .material-symbols,
+      .material-symbols-outlined,
+      .material-symbols-rounded,
+      .material-symbols-sharp,
+      .material-icons
+    ) {
       display: inline-flex;
-      vertical-align: middle;
+      flex-shrink: 0;
       margin-right: 12px;
     }
   }
 
   .divider {
-    margin: calc(var(--sidenav-padding) * 0.5) 0 0 0;
+    margin: calc(var(--md-comp-nav-drawer-padding) * 0.5) 0 0;
   }
 
   .subheader {
     cursor: initial;
     pointer-events: none;
-    color: red;
-    font-size: var(--sidenav-font-size);
+    color: var(--md-sys-color-on-surface-variant);
+    font-size: var(--md-comp-nav-drawer-font-size);
     font-weight: 500;
-    line-height: var(--sidenav-line-height);
+    line-height: var(--md-comp-nav-drawer-line-height);
   }
 
-  // Remove this? is very custom
   .user-view {
     position: relative;
-    padding: calc(var(--sidenav-padding) * 2) calc(var(--sidenav-padding) * 2) 0;
-    margin-bottom: calc(var(--sidenav-padding) * 0.5);
+    padding: calc(var(--md-comp-nav-drawer-padding) * 2) calc(var(--md-comp-nav-drawer-padding) * 2) 0;
+    margin-bottom: calc(var(--md-comp-nav-drawer-padding) * 0.5);
 
-    & > a {
+    > a {
       height: auto;
       padding: 0;
 
@@ -135,14 +240,13 @@
     .background {
       overflow: hidden;
       position: absolute;
-      top: 0;
-      right: 0;
-      bottom: 0;
-      left: 0;
+      inset: 0;
       z-index: -1;
     }
 
-    .circle, .name, .email {
+    .circle,
+    .name,
+    .email {
       display: block;
     }
 
@@ -153,8 +257,8 @@
 
     .name,
     .email {
-      font-size: var(--sidenav-font-size);
-      line-height: calc(var(--sidenav-line-height) * 0.5);
+      font-size: var(--md-comp-nav-drawer-font-size);
+      line-height: calc(var(--md-comp-nav-drawer-line-height) * 0.5);
     }
 
     .name {
@@ -169,68 +273,70 @@
   }
 }
 
-// Touch interaction
-.drag-target {
+// Overlay only: the dialog is the panel, so the list fills it. When the
+// host is `display: contents` (a docked .sidenav-fixed) this must not
+// apply — static positioning would drop the list into the header flow
+// and it would read as part of the app bar.
+dialog.sidenav-overlay:modal > .sidenav {
+  position: static;
+  inset: auto;
+  width: 100%;
   height: 100%;
-  position: fixed;
-  top: 0;
-  left: 0;
-  z-index: 998;
-
-  &.right-aligned {
-    right: 0;
-  }
+  transform: none;
+  box-shadow: none;
+  background-color: transparent;
+  z-index: auto;
 }
 
-// Fixed Sidenav shown
 .sidenav.sidenav-fixed {
-  left: 0;
-  transform: translateX(0);
-  position: fixed;
+  transform: none;
 
   &.right-aligned {
-    right: 0;
-    left: auto;
+    transform: none;
   }
 }
 
-// Fixed Sidenav hide on smaller
 @include bp-down("large") {
-  .sidenav {
-    &.sidenav-fixed {
-      transform: translateX(-105%);
+  // Uninitialized / no-js: keep a fixed drawer off-canvas. Once JS wraps
+  // it, the host's display:none hides the closed drawer and this must
+  // not also hide the list inside an open dialog.
+  .sidenav.sidenav-fixed {
+    transform: translateX(-100%);
 
-      &.right-aligned {
-        transform: translateX(105%);
-      }
-    }
-    > a {
-      padding: 0 var(--sidenav-padding);
-    }
-    .user-view {
-      padding: var(--sidenav-padding) var(--sidenav-padding) 0;
+    &.right-aligned {
+      transform: translateX(100%);
     }
   }
-}
 
-.sidenav .collapsible-body,
-.sidenav details::details-content {
-  padding: 0;
+  .sidenav .user-view {
+    padding: var(--md-comp-nav-drawer-padding) var(--md-comp-nav-drawer-padding) 0;
+  }
 }
 
-.sidenav-overlay {
+.drag-target {
   position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  opacity: 0;
-  height: 120vh;
-  background-color: rgba(0, 0, 0, .5);
-  z-index: 997;
-  display: none;
+  inset: 0 auto 0 0;
+  width: var(--md-comp-nav-drawer-drag-width, 10px);
+  height: 100%;
+  z-index: 998;
+  touch-action: pan-y;
+
+  &.right-aligned {
+    inset: 0 0 0 auto;
+  }
+}
+
+@include bp-up("large") {
+  .drag-target[data-fixed] {
+    display: none;
+    pointer-events: none;
+  }
+}
+
+.sidenav details > :not(summary) {
+  padding: 0;
 }
 
-// Sidenav collapsible styling (Taken from Collapsible.scss)
 .sidenav,
 .sidenav.sidenav-fixed {
   .collapsible {
@@ -240,12 +346,12 @@
     background: transparent;
     box-shadow: none;
   }
-  .collapsible-header,
+
   summary {
     border: none;
   }
-  .collapsible-body,
-  details::details-content {
+
+  details > :not(summary) {
     border: none;
   }
 }

package/src/sass/components/_table_of_contents.scss

@@ -1,7 +1,21 @@
 @use "../abstracts" as *;
 
+// Table of contents. Paired with .scrollspy sections. The current link
+// is .active and aria-current="true".
+//
+// Tokens:
+//   --md-comp-toc-label-color
+//   --md-comp-toc-active-color
+//   --md-comp-toc-indicator
+
 .table-of-contents {
+  --md-comp-toc-label-color: var(--md-sys-color-on-surface-variant);
+  --md-comp-toc-active-color: var(--md-sys-color-primary);
+  --md-comp-toc-indicator: 2px;
+
   list-style: none;
+  margin: 0;
+  padding: 0;
 
   &.fixed {
     position: fixed;
@@ -12,23 +26,25 @@
   }
 
   a {
-    display: inline-block;
-    font-weight: 400;
-    color: var(--md-sys-color-secondary);
-    padding-left: 16px;
-    height: 2rem;
-    line-height: 2rem;
-    border-left: 1px solid var(--md-sys-color-outline-variant);
-    
+    display: inline-flex;
+    align-items: center;
+    box-sizing: border-box;
+    min-height: 2rem;
+    padding-inline-start: 16px;
+    border-inline-start: var(--md-comp-toc-indicator) solid transparent;
+    color: var(--md-comp-toc-label-color);
+    text-decoration: none;
+    @include typescale("label-large");
+    @include focus-visible;
+
     &:hover {
-      color: var(--md-sys-color-on-background);
-      padding-left: 15px;
+      color: var(--md-comp-toc-active-color);
     }
-    &.active {
-      color: var(--md-sys-color-primary);
+
+    &:is(.active, [aria-current="true"]) {
+      color: var(--md-comp-toc-active-color);
       font-weight: 500;
-      padding-left: 14px;
-      border-left: 2px solid var(--md-sys-color-primary);
+      border-inline-start-color: var(--md-comp-toc-active-color);
     }
   }
 }

package/src/sass/components/_tabs.scss

@@ -4,9 +4,8 @@
 //
 // Anatomy is the HTML. A <nav class="tabs"> of <a href="#panel"> is the
 // bar. A heading or <span> is the label; a leading <i> is the icon.
-// .active is the selected tab. ul.tabs > li.tab > a stays as an alias.
-// Helpers: .tabs-secondary, .horizontal / .tabs-horizontal, .max /
-// .tabs-fixed-width, .transparent / .tabs-transparent.
+// .active is the selected tab. Helpers: .tabs-secondary, .horizontal,
+// .max, .transparent.
 //
 // Tokens follow https://m3.material.io/components/tabs/specs
 //   primary     surface, 48dp (64 with stacked icon), title-small
@@ -18,7 +17,13 @@
 //   divider     1dp outline-variant
 //   disabled    38%
 
-$_tab: "> :is(a, .tab > a, li.tab > a)";
+// Comma list of tab-link selectors. Always nest suffixes inside
+// `#{$_tab} { &.foo {} }` — interpolating `#{$_tab}.foo` only
+// attaches `.foo` to the last alternative and leaves `> a` bare
+// (same bug as the icon size classes). That compiled the disabled
+// rule as `.tabs > a, .tabs > .tab > a.disabled`, so every
+// `nav.tabs > a` got pointer-events:none and could not switch panels.
+$_tab: "> a, > .tab > a";
 
 .tabs {
   --md-comp-primary-tab-container-color: var(--md-sys-color-surface);
@@ -49,7 +54,7 @@ $_tab: "> :is(a, .tab > a, li.tab > a)";
     display: none;
   }
 
-  > :is(.tab, li.tab) {
+  > .tab {
     display: flex;
     flex: 0 0 auto;
     list-style: none;
@@ -115,22 +120,40 @@ $_tab: "> :is(a, .tab > a, li.tab > a)";
     &.active:focus {
       background-color: color-mix(in oklab, var(--md-sys-color-primary) 10%, transparent);
     }
+
+    // Disabled — on the <a>. The wrapping `.tab.disabled` case is
+    // below; it cannot live in this block.
+    &.disabled,
+    &[aria-disabled="true"] {
+      color: color-mix(in oklab, var(--md-sys-color-on-surface) 38%, transparent);
+      background-color: transparent;
+      cursor: default;
+      pointer-events: none;
+    }
   }
 
   // Stacked icon + label is 64dp (primary).
-  &:not(.horizontal, .tabs-horizontal) #{$_tab}:has(> i) {
-    min-height: var(--md-comp-primary-tab-with-icon-container-height);
-    padding-block: 8px;
+  &:not(.horizontal) {
+    #{$_tab} {
+      &:has(> i) {
+        min-height: var(--md-comp-primary-tab-with-icon-container-height);
+        padding-block: 8px;
+      }
+    }
   }
 
   // CSS indicator when the JS sliding bar is not present.
-  &:not(:has(> .indicator)) #{$_tab}.active::after {
-    content: "";
-    position: absolute;
-    inset: auto 0 0 0;
-    height: var(--md-comp-primary-tab-active-indicator-height);
-    background-color: var(--md-comp-primary-tab-active-indicator-color);
-    border-radius: var(--md-comp-primary-tab-active-indicator-shape);
+  &:not(:has(> .indicator)) {
+    #{$_tab} {
+      &.active::after {
+        content: "";
+        position: absolute;
+        inset: auto 0 0 0;
+        height: var(--md-comp-primary-tab-active-indicator-height);
+        background-color: var(--md-comp-primary-tab-active-indicator-color);
+        border-radius: var(--md-comp-primary-tab-active-indicator-shape);
+      }
+    }
   }
 
   > .indicator {
@@ -145,10 +168,7 @@ $_tab: "> :is(a, .tab > a, li.tab > a)";
     margin: 0;
   }
 
-  // Disabled — on the <a> or on the wrapping .tab.
-  #{$_tab}.disabled,
-  #{$_tab}[aria-disabled="true"],
-  > :is(.tab, li.tab).disabled > a {
+  > .tab.disabled > a {
     color: color-mix(in oklab, var(--md-sys-color-on-surface) 38%, transparent);
     background-color: transparent;
     cursor: default;
@@ -169,8 +189,7 @@ $_tab: "> :is(a, .tab > a, li.tab > a)";
 }
 
 // Inline icon + label (primary can do this too).
-.tabs.horizontal,
-.tabs.tabs-horizontal {
+.tabs.horizontal {
   #{$_tab} {
     flex-direction: row;
     gap: 8px;
@@ -180,9 +199,8 @@ $_tab: "> :is(a, .tab > a, li.tab > a)";
 }
 
 // Equal-width tabs. Default on compact so a few destinations still fill.
-.tabs.max,
-.tabs.tabs-fixed-width {
-  > :is(a, .tab, li.tab) {
+.tabs.max {
+  > :is(a, .tab) {
     flex: 1 1 0;
     min-width: 0;
   }
@@ -194,7 +212,7 @@ $_tab: "> :is(a, .tab > a, li.tab > a)";
 
 @include bp-down("large") {
   .tabs {
-    > :is(a, .tab, li.tab) {
+    > :is(a, .tab) {
       flex: 1 1 0;
       min-width: 0;
     }
@@ -207,8 +225,7 @@ $_tab: "> :is(a, .tab > a, li.tab > a)";
 }
 
 // On a colored app bar (header.primary > .tabs).
-.tabs.transparent,
-.tabs.tabs-transparent {
+.tabs.transparent {
   --md-comp-primary-tab-container-color: transparent;
   --md-comp-primary-tab-label-text-color: color-mix(
     in oklab,
@@ -219,14 +236,16 @@ $_tab: "> :is(a, .tab > a, li.tab > a)";
   --md-comp-primary-tab-active-indicator-color: var(--md-sys-color-on-primary);
   border-block-end-color: color-mix(in oklab, var(--md-sys-color-on-primary) 20%, transparent);
 
-  #{$_tab}:hover,
-  #{$_tab}:focus {
-    color: var(--md-sys-color-on-primary);
-    background-color: color-mix(in oklab, var(--md-sys-color-on-primary) 8%, transparent);
-  }
+  #{$_tab} {
+    &:hover,
+    &:focus {
+      color: var(--md-sys-color-on-primary);
+      background-color: color-mix(in oklab, var(--md-sys-color-on-primary) 8%, transparent);
+    }
 
-  #{$_tab}.active:hover,
-  #{$_tab}.active:focus {
-    background-color: color-mix(in oklab, var(--md-sys-color-on-primary) 10%, transparent);
+    &.active:hover,
+    &.active:focus {
+      background-color: color-mix(in oklab, var(--md-sys-color-on-primary) 10%, transparent);
+    }
   }
 }