m3-svelte 5.15.5 → 6.0.1

package/package/containers/Dialog.svelte

@@ -18,14 +18,6 @@
     buttons: Snippet;
     children: Snippet;
     open: boolean;
-    /** @deprecated use closedby instead */
-    closeOnEsc?: boolean;
-    /** @deprecated use closedby instead */
-    closeOnClick?: boolean;
-    /** @deprecated listen to `open` state changes instead of onEsc */
-    onEsc?: () => void;
-    /** @deprecated listen to `open` state changes instead of onClick */
-    onClick?: () => void;
   } & HTMLDialogAttributes = $props();
 
   let dialog: HTMLDialogElement | undefined = $state();
@@ -41,33 +33,16 @@
   ontoggle={(e) => {
     open = e.newState == "open";
   }}
-  oncancel={(e) => {
-    if (e.target != e.currentTarget) return;
-    if (extra.closeOnEsc && extra.onEsc) {
-      extra.onEsc();
-    }
-  }}
-  onclick={(e) => {
-    if (e.target != e.currentTarget) return;
-    if (extra.closeOnClick && extra.onClick) {
-      extra.onClick();
-    }
-  }}
   bind:this={dialog}
-  closedby={closedby ||
-    (extra.closeOnClick == false && extra.closeOnEsc == false
-      ? "none"
-      : extra.closeOnClick == false
-        ? "closerequest"
-        : "any")}
+  {closedby}
   role="alertdialog"
   {...extra}
 >
   {#if icon}
     <Icon {icon} size={24} />
   {/if}
-  <p class="headline m3-font-headline-small" class:center={icon}>{headline}</p>
-  <div class="content m3-font-body-medium">
+  <p class="headline" class:center={icon}>{headline}</p>
+  <div class="content">
     {@render children()}
   </div>
   <form method="dialog" class="buttons">
@@ -78,14 +53,14 @@
 <style>
   @layer tokens {
     :root {
-      --m3-dialog-shape: var(--m3-util-rounding-extra-large);
+      --m3-dialog-shape: var(--m3-shape-extra-large);
     }
   }
   dialog {
     display: flex;
     flex-direction: column;
-    background-color: rgb(var(--m3-scheme-surface-container-high));
-    --m3-util-background: rgb(var(--m3-scheme-surface-container-high));
+    background-color: var(--m3c-surface-container-high);
+    --m3v-background: var(--m3c-surface-container-high);
     border: none;
     border-radius: var(--m3-dialog-shape);
     min-width: 17.5rem;
@@ -93,7 +68,7 @@
     padding: 1.5rem;
     overflow: auto;
     > :global(svg) {
-      color: rgb(var(--m3-scheme-secondary));
+      color: var(--m3c-secondary);
 
       flex-shrink: 0;
       align-self: center;
@@ -101,7 +76,8 @@
     }
   }
   .headline {
-    color: rgb(var(--m3-scheme-on-surface));
+    @apply --m3-headline-small;
+    color: var(--m3c-on-surface);
     margin-top: 0;
     margin-bottom: 1rem;
   }
@@ -109,7 +85,8 @@
     text-align: center;
   }
   .content {
-    color: rgb(var(--m3-scheme-on-surface-variant));
+    @apply --m3-body-medium;
+    color: var(--m3c-on-surface-variant);
     margin-bottom: 1.5rem;
   }
   .buttons {
@@ -125,31 +102,31 @@
     visibility: hidden;
     pointer-events: none;
     transition:
-      opacity var(--m3-util-easing-fast),
-      visibility var(--m3-util-easing-fast);
+      opacity var(--m3-easing-fast),
+      visibility var(--m3-easing-fast);
   }
   dialog[open] {
     opacity: 1;
     visibility: visible;
     pointer-events: auto;
     animation:
-      dialogIn var(--m3-util-curve-decel) 500ms,
-      opacity var(--m3-util-curve-decel) 100ms backwards;
+      dialogIn var(--m3-timing-function-emphasized-decel) 500ms,
+      opacity var(--m3-timing-function-emphasized-decel) 100ms backwards;
   }
   dialog[open] .headline {
-    animation: opacity var(--m3-util-easing-fast);
+    animation: opacity var(--m3-easing-fast);
   }
   dialog[open] .content {
-    animation: opacity var(--m3-util-easing-fast) 50ms backwards;
+    animation: opacity var(--m3-easing-fast) 50ms backwards;
   }
   dialog[open] .buttons {
     animation:
-      buttonsIn var(--m3-util-curve-decel) 500ms,
-      opacity var(--m3-util-easing-fast) 100ms backwards;
+      buttonsIn var(--m3-timing-function-emphasized-decel) 500ms,
+      opacity var(--m3-easing-fast) 100ms backwards;
   }
   dialog::backdrop {
-    background-color: rgb(var(--m3-scheme-scrim) / 0.3);
-    animation: opacity var(--m3-util-curve-decel) 500ms;
+    background-color: --translucent(var(--m3c-scrim), 0.3);
+    animation: opacity var(--m3-timing-function-emphasized-decel) 500ms;
   }
   @keyframes dialogIn {
     0% {

package/package/containers/Dialog.svelte.d.ts

@@ -7,14 +7,6 @@ type $$ComponentProps = {
     buttons: Snippet;
     children: Snippet;
     open: boolean;
-    /** @deprecated use closedby instead */
-    closeOnEsc?: boolean;
-    /** @deprecated use closedby instead */
-    closeOnClick?: boolean;
-    /** @deprecated listen to `open` state changes instead of onEsc */
-    onEsc?: () => void;
-    /** @deprecated listen to `open` state changes instead of onClick */
-    onClick?: () => void;
 } & HTMLDialogAttributes;
 declare const Dialog: import("svelte").Component<$$ComponentProps, {}, "open">;
 type Dialog = ReturnType<typeof Dialog>;

package/package/containers/ListItem.svelte

@@ -37,15 +37,15 @@
   <div class="body">
     {#if overline}
       <!-- Renamed to not conflict with Tailwind -->
-      <p class="overline- m3-font-label-small">{overline}</p>
+      <p class="overline-">{overline}</p>
     {/if}
-    <p class="headline m3-font-body-large">{headline}</p>
+    <p class="headline">{headline}</p>
     {#if supporting}
-      <p class="supporting m3-font-body-medium">{supporting}</p>
+      <p class="supporting">{supporting}</p>
     {/if}
   </div>
   {#if trailing}
-    <div class="trailing m3-font-label-small">
+    <div class="trailing">
       {@render trailing()}
     </div>
   {/if}
@@ -93,13 +93,13 @@
     cursor: pointer;
   }
   .lines-1 {
-    height: calc(3.5rem + var(--m3-util-density-term));
+    height: --m3-density(3.5rem);
   }
   .lines-2 {
-    height: calc(4.5rem + var(--m3-util-density-term));
+    height: --m3-density(4.5rem);
   }
   .lines-3 {
-    height: calc(5.5rem + var(--m3-util-density-term));
+    height: --m3-density(5.5rem);
     padding-top: 0.75rem;
     padding-bottom: 0.75rem;
     align-items: flex-start;
@@ -110,7 +110,10 @@
   .leading,
   .trailing {
     display: contents;
-    color: rgb(var(--m3-scheme-on-surface-variant));
+    color: var(--m3c-on-surface-variant);
+  }
+  .trailing {
+    @apply --m3-label-small;
   }
   .leading > :global(svg),
   .trailing > :global(svg) {
@@ -122,11 +125,16 @@
   p {
     margin: 0;
   }
-  .supporting,
+  .supporting {
+    @apply --m3-body-medium;
+    color: var(--m3c-on-surface-variant);
+  }
   .overline- {
-    color: rgb(var(--m3-scheme-on-surface-variant));
+    @apply --m3-label-small;
+    color: var(--m3c-on-surface-variant);
   }
   .headline {
-    color: rgb(var(--m3-scheme-on-surface));
+    @apply --m3-body-large;
+    color: var(--m3c-on-surface);
   }
 </style>

package/package/containers/Menu.svelte

@@ -11,7 +11,7 @@
 <style>
   @layer tokens {
     :root {
-      --m3-menu-shape: var(--m3-util-rounding-extra-small);
+      --m3-menu-shape: var(--m3-shape-extra-small);
     }
   }
   .m3-container {
@@ -22,8 +22,8 @@
     border-radius: var(--m3-menu-shape);
     min-width: 7rem;
     max-width: 17.5rem;
-    background-color: rgb(var(--m3-scheme-surface-container));
+    background-color: var(--m3c-surface-container);
     z-index: 2;
-    box-shadow: var(--m3-util-elevation-2);
+    box-shadow: var(--m3-elevation-2);
   }
 </style>

package/package/containers/MenuItem.svelte

@@ -17,7 +17,7 @@
   } = $props();
 </script>
 
-<button type="button" class="item focus-inset m3-font-label-large" {disabled} {onclick}>
+<button type="button" class="item focus-inset" {disabled} {onclick}>
   <Layer />
   {#if icon == "space"}
     <span class="icon"></span>
@@ -31,9 +31,10 @@
 
 <style>
   .item {
+    @apply --m3-label-large;
     display: flex;
     align-items: center;
-    height: calc(3rem + var(--m3-util-density-term));
+    height: --m3-density(3rem);
     padding: 0 0.75rem;
     gap: 0.75rem;
     white-space: nowrap;
@@ -41,7 +42,7 @@
     border: none;
     position: relative;
     background-color: transparent;
-    color: rgb(var(--m3-scheme-on-surface));
+    color: var(--m3c-on-surface);
 
     cursor: pointer;
   }
@@ -52,14 +53,14 @@
   .icon > :global(svg) {
     width: 1.5rem;
     height: 1.5rem;
-    color: rgb(var(--m3-scheme-on-surface-variant));
+    color: var(--m3c-on-surface-variant);
   }
 
   .item:disabled {
-    color: rgb(var(--m3-scheme-on-surface) / 0.38);
+    color: --translucent(var(--m3c-on-surface), 0.38);
     cursor: auto;
   }
   .item:disabled > .icon > :global(svg) {
-    color: rgb(var(--m3-scheme-on-surface) / 0.38);
+    color: --translucent(var(--m3c-on-surface), 0.38);
   }
 </style>

package/package/containers/Snackbar.svelte

@@ -1,80 +1,70 @@
-<!--
-@component
-@deprecated use NewSnackbar instead
--->
 <script module lang="ts">
-  export type SnackbarIn = {
-    message: string;
-    actions?: Record<string, () => void>;
-    closable?: boolean;
+  export const snackbar = (
+    message: string,
+    actions?: Record<string, () => void>,
+    closable?: boolean,
     /*
-    timeout: undefined/unset -> 4s timeout
-    timeout: null -> no timeout
-    timeout: 2000 -> 2s timeout
+    undefined/unset -> 4s timeout
+    2000 -> 2s timeout
+    -1 -> no timeout
     */
-    timeout?: number | null;
+    timeout?: number,
+  ) => {
+    _show(message, actions, closable, timeout);
   };
+  let _show: typeof snackbar;
 </script>
 
 <script lang="ts">
-  import { onDestroy, type ComponentProps } from "svelte";
+  import { onDestroy } from "svelte";
   import { fade } from "svelte/transition";
   import iconX from "@ktibow/iconset-material-symbols/close";
   import Icon from "../misc/Icon.svelte";
   import SnackbarItem from "./SnackbarItem.svelte";
   import Layer from "../misc/Layer.svelte";
-  import type { DivAttrs } from "../misc/typing-utils";
 
-  type SnackbarConfig = Omit<ComponentProps<typeof SnackbarItem>, "children">;
-
-  let {
-    config = {},
-    closeButtonTitle = "Close",
-    ...extra
-  }: {
-    config?: SnackbarConfig;
-    closeButtonTitle?: string;
-  } & DivAttrs = $props();
-  export const show = ({ message, actions = {}, closable = false, timeout = 4000 }: SnackbarIn) => {
-    snackbar = { message, actions, closable, timeout };
+  let { closeTitle = "Close" }: { closeTitle?: string } = $props();
+  let shown:
+    | { message: string; actions: Record<string, () => void>; closable: boolean }
+    | undefined = $state();
+  let timeoutId: number;
+  _show = (message, actions = {}, closable = false, timeout = 4000) => {
     clearTimeout(timeoutId);
-    if (timeout)
+    shown = { message, actions, closable };
+    if (timeout && timeout > 0)
       timeoutId = setTimeout(() => {
-        snackbar = undefined;
+        shown = undefined;
       }, timeout);
   };
-
-  let snackbar: Required<SnackbarIn> | undefined = $state();
-  let timeoutId: number;
   onDestroy(() => {
     clearTimeout(timeoutId);
   });
 </script>
 
-{#if snackbar}
-  <div class="holder" out:fade={{ duration: 200 }} {...extra}>
-    {#key snackbar}
-      <SnackbarItem {...config}>
-        <p class="m3-font-body-medium">{snackbar.message}</p>
-        {#each Object.entries(snackbar.actions) as [key, action]}
+{#if shown}
+  <div class="holder" out:fade={{ duration: 200 }}>
+    {#key shown}
+      <SnackbarItem>
+        <p>{shown.message}</p>
+        {#each Object.entries(shown.actions) as [key, action]}
           <button
             type="button"
-            class="action m3-font-label-large"
+            class="action"
             onclick={() => {
-              snackbar = undefined;
+              shown = undefined;
               action();
             }}
           >
             {key}
           </button>
         {/each}
-        {#if snackbar.closable}
+        {#if shown.closable}
           <button
             type="button"
             class="close"
-            title={closeButtonTitle}
+            title={closeTitle}
             onclick={() => {
-              snackbar = undefined;
+              shown = undefined;
             }}
           >
             <Layer />
@@ -90,12 +80,13 @@
   .holder {
     position: fixed;
     padding-bottom: 1rem;
-    bottom: var(--m3-util-bottom-offset);
+    bottom: var(--m3v-bottom-offset);
     left: 50%;
     transform: translate(-50%, 0);
     z-index: 3;
   }
   p {
+    @apply --m3-body-medium;
     margin-right: auto;
   }
   button {
@@ -107,6 +98,7 @@
     border: none;
 
     background-color: transparent;
+    color: unset;
     cursor: pointer;
     position: relative;
   }
@@ -116,11 +108,11 @@
   }
 
   .action {
-    color: var(--m3-scheme-inverse-primary);
+    @apply --m3-label-large;
+    color: var(--m3c-inverse-primary);
     padding: 0 0.5rem;
   }
   .close {
-    color: var(--m3-scheme-inverse-on-surface);
     padding: 0 0.75rem;
     margin-right: -1rem;
   }

package/package/containers/Snackbar.svelte.d.ts

@@ -1,20 +1,7 @@
-export type SnackbarIn = {
-    message: string;
-    actions?: Record<string, () => void>;
-    closable?: boolean;
-    timeout?: number | null;
-};
-import { type ComponentProps } from "svelte";
-import SnackbarItem from "./SnackbarItem.svelte";
-import type { DivAttrs } from "../misc/typing-utils";
-type SnackbarConfig = Omit<ComponentProps<typeof SnackbarItem>, "children">;
+export declare const snackbar: (message: string, actions?: Record<string, () => void>, closable?: boolean, timeout?: number) => void;
 type $$ComponentProps = {
-    config?: SnackbarConfig;
-    closeButtonTitle?: string;
-} & DivAttrs;
-/** @deprecated use NewSnackbar instead */
-declare const Snackbar: import("svelte").Component<$$ComponentProps, {
-    show: ({ message, actions, closable, timeout }: SnackbarIn) => void;
-}, "">;
+    closeTitle?: string;
+};
+declare const Snackbar: import("svelte").Component<$$ComponentProps, {}, "">;
 type Snackbar = ReturnType<typeof Snackbar>;
 export default Snackbar;

package/package/containers/SnackbarItem.svelte

@@ -12,7 +12,7 @@
 <style>
   @layer tokens {
     :root {
-      --m3-snackbar-shape: var(--m3-util-rounding-extra-small);
+      --m3-snackbar-shape: var(--m3-shape-extra-small);
     }
   }
   .m3-container {
@@ -23,12 +23,12 @@
     max-width: 60rem;
     min-height: 3rem;
     border-radius: var(--m3-snackbar-shape);
-    box-shadow: var(--m3-util-elevation-3);
-    background-color: rgb(var(--m3-scheme-inverse-surface));
-    color: rgb(var(--m3-scheme-inverse-on-surface));
+    box-shadow: var(--m3-elevation-3);
+    background-color: var(--m3c-inverse-surface);
+    color: var(--m3c-inverse-on-surface);
     animation:
-      snackbarIn var(--m3-util-curve-decel) 500ms,
-      opacity var(--m3-util-curve-decel) 100ms;
+      snackbarIn var(--m3-timing-function-emphasized-decel) 500ms,
+      opacity var(--m3-timing-function-emphasized-decel) 100ms;
   }
   /*@TODO: Fix animation with different shaping or something*/
   @keyframes snackbarIn {

package/package/containers/StandardSideSheet.svelte

@@ -17,7 +17,7 @@
 
 <div class="m3-container">
   <div class="header">
-    <span class="m3-font-title-large">{headline}</span>
+    <span>{headline}</span>
     <Button variant="text" iconType="full" onclick={close}>
       <Icon icon={iconX} />
     </Button>
@@ -37,7 +37,10 @@
 
     padding: 1.5rem;
   }
+  .header > span {
+    @apply --m3-title-large;
+  }
   .header > :global(button.m3-container) {
-    color: rgb(var(--m3-scheme-on-surface-variant));
+    color: var(--m3c-on-surface-variant);
   }
 </style>

package/package/forms/Checkbox.svelte

@@ -46,8 +46,8 @@
     inset: -0.6875rem;
     width: 2.5rem;
     height: 2.5rem;
-    border-radius: var(--m3-util-rounding-full);
-    color: rgb(var(--m3-scheme-on-surface-variant));
+    border-radius: var(--m3-shape-full);
+    color: var(--m3c-on-surface-variant);
     cursor: pointer;
   }
 
@@ -56,16 +56,16 @@
     inset: 0.6875rem;
     border-radius: 0.125rem;
     border: solid 0.125rem currentColor;
-    transition: var(--m3-util-easing-fast);
+    transition: var(--m3-easing-fast);
   }
 
   svg {
     position: absolute;
     inset: 0;
-    color: rgb(var(--m3-scheme-on-primary));
+    color: var(--m3c-on-primary);
     opacity: 0;
     pointer-events: none;
-    transition: var(--m3-util-easing-fast);
+    transition: var(--m3-easing-fast);
     path {
       stroke-dasharray: 20.874 20.874;
       stroke-dashoffset: 20.874;
@@ -74,26 +74,26 @@
   }
 
   :global(input:focus-visible) + .layer-container {
-    color: rgb(var(--m3-scheme-on-surface));
+    color: var(--m3c-on-surface);
   }
 
   :global(input:checked) + .layer-container {
-    color: rgb(var(--m3-scheme-primary));
+    color: var(--m3c-primary);
   }
   :global(input:checked) + .layer-container .checkbox-box {
-    background-color: rgb(var(--m3-scheme-primary));
+    background-color: var(--m3c-primary);
   }
 
   :global(input:checked) ~ svg {
     opacity: 1;
     path {
       stroke-dashoffset: 0;
-      transition: stroke-dashoffset var(--m3-util-easing-slow);
+      transition: stroke-dashoffset var(--m3-easing-slow);
     }
   }
 
   :global(input:disabled) + .layer-container {
-    color: rgb(var(--m3-scheme-on-surface) / 0.38);
+    color: --translucent(var(--m3c-on-surface), 0.38);
     cursor: not-allowed;
   }
 
@@ -101,11 +101,11 @@
     color: transparent;
   }
   :global(input:disabled:checked) + .layer-container .checkbox-box {
-    background-color: rgb(var(--m3-scheme-on-surface) / 0.38);
+    background-color: --translucent(var(--m3c-on-surface), 0.38);
   }
 
   :global(input:disabled) ~ svg {
-    color: rgb(var(--m3-scheme-surface));
+    color: var(--m3c-surface);
   }
 
   .m3-container {