m3-svelte 5.15.5 → 6.0.1

package/package/forms/TextFieldOutlinedMultiline.svelte

@@ -38,18 +38,16 @@
 
 <div class="m3-container" class:leading-icon={leadingIcon} class:error use:resize>
   <textarea
-    class="focus-none m3-font-body-large"
+    class="focus-none"
     placeholder=" "
     bind:value
     {id}
     {disabled}
     {required}
     {...extra}
-    defaultValue={extra.defaultValue}
   ></textarea>
-  <!-- TODO/deprecated: once https://github.com/sveltejs/svelte/pull/16481 is finished, remove the defaultvalue thing -->
   <div class="layer"></div>
-  <label class="m3-font-body-large" for={id}>{label}</label>
+  <label for={id}>{label}</label>
   {#if leadingIcon}
     <Icon icon={leadingIcon} />
   {/if}
@@ -58,25 +56,22 @@
 <style>
   /*
   want to customize the label's background?
-  do this: <TextFieldOutlinedMultiline --m3-util-background="rgb(var(--m3-scheme-surface-container))" />
+  do this: <TextFieldOutlinedMultiline --m3v-background="var(--m3c-surface-container)" />
   */
   @layer tokens {
     :root {
-      /* "textfield" is deprecated */
-      --m3-field-outlined-shape: var(
-        --m3-textfield-outlined-shape,
-        var(--m3-util-rounding-extra-small)
-      );
+      --m3-field-outlined-shape: var(--m3-shape-extra-small);
     }
   }
   .m3-container {
     display: inline-flex;
     position: relative;
     align-items: center;
-    min-height: calc(5rem + var(--m3-util-density-term));
+    min-height: --m3-density(5rem);
     min-width: 15rem;
   }
   textarea {
+    @apply --m3-body-large;
     position: absolute;
     inset: 0;
     width: 100%;
@@ -86,31 +81,30 @@
     padding: 1rem;
     border-radius: var(--m3-field-outlined-shape);
     background-color: transparent;
-    color: rgb(var(--m3-scheme-on-surface));
+    color: var(--m3c-on-surface);
     resize: none;
   }
   label {
+    @apply --m3-body-large;
     position: absolute;
     inset-inline-start: 0.75rem;
     top: 50%;
     translate: 0 -50%;
-    color: rgb(var(--error, var(--m3-scheme-on-surface-variant)));
-    background-color: var(--m3-util-background, rgb(var(--m3-scheme-surface)));
+    color: var(--error, var(--m3c-on-surface-variant));
+    background-color: var(--m3v-background);
     padding: 0 0.25rem;
     &:is(textarea:hover ~ label) {
-      color: rgb(var(--error, var(--m3-scheme-on-surface)));
+      color: var(--error, var(--m3c-on-surface));
     }
     &:is(textarea:focus ~ label) {
-      color: rgb(var(--error, var(--m3-scheme-primary)));
+      color: var(--error, var(--m3c-primary));
     }
     &:is(textarea:disabled ~ label) {
-      color: rgb(var(--m3-scheme-on-surface) / 0.38);
+      color: --translucent(var(--m3c-on-surface), 0.38);
     }
     &:is(textarea:focus ~ label, textarea:not(:placeholder-shown) ~ label) {
+      @apply --m3-body-small;
       top: 0;
-      font-size: var(--m3-font-body-small-size);
-      line-height: var(--m3-font-body-small-height);
-      letter-spacing: var(--m3-font-body-small-tracking);
     }
     pointer-events: none;
     transition:
@@ -123,15 +117,15 @@
   .layer {
     position: absolute;
     inset: 0;
-    border: 1px solid rgb(var(--error, var(--m3-scheme-outline)));
+    border: 1px solid var(--error, var(--m3c-outline));
     border-radius: var(--m3-field-outlined-shape);
     pointer-events: none;
     transition: all 100ms;
     &:is(textarea:enabled:hover ~ .layer) {
-      border-color: rgb(var(--error, var(--m3-scheme-on-surface)));
+      border-color: var(--error, var(--m3c-on-surface));
     }
     &:is(textarea:enabled:focus ~ .layer) {
-      border-color: rgb(var(--error, var(--m3-scheme-primary)));
+      border-color: var(--error, var(--m3c-primary));
       border-width: 0.125rem;
     }
   }
@@ -140,7 +134,7 @@
     width: 1.5rem;
     height: 1.5rem;
     margin-inline-start: 0.75rem;
-    color: rgb(var(--m3-scheme-on-surface-variant));
+    color: var(--m3c-on-surface-variant);
     pointer-events: none;
   }
 
@@ -152,21 +146,21 @@
   }
 
   .error {
-    --error: var(--m3-scheme-error);
+    --error: var(--m3c-error);
   }
   .error > textarea:hover ~ label,
   .error > textarea:hover ~ .layer {
-    --error: var(--m3-scheme-on-error-container);
+    --error: var(--m3c-on-error-container);
   }
 
   textarea:disabled {
-    color: rgb(var(--m3-scheme-on-surface) / 0.38);
+    color: --translucent(var(--m3c-on-surface), 0.38);
   }
   textarea:disabled ~ .layer {
-    border-color: rgb(var(--m3-scheme-on-surface) / 0.38);
+    border-color: --translucent(var(--m3c-on-surface), 0.38);
   }
   textarea:disabled ~ :global(svg) {
-    color: rgb(var(--m3-scheme-on-surface) / 0.38);
+    color: --translucent(var(--m3c-on-surface), 0.38);
   }
 
   .m3-container {

package/package/forms/WavyLinearProgress.svelte

@@ -36,12 +36,7 @@
 </script>
 
 <svg viewBox="0 0 {width} {height}">
-  <path
-    fill="none"
-    stroke="rgb(var(--m3-scheme-primary))"
-    stroke-width={thickness}
-    stroke-linecap="round"
-  >
+  <path fill="none" stroke="var(--m3c-primary)" stroke-width={thickness} stroke-linecap="round">
     <animate
       attributeName="d"
       dur="1s"
@@ -51,7 +46,7 @@
   </path>
   <line
     fill="none"
-    stroke="rgb(var(--m3-scheme-secondary-container))"
+    stroke="var(--m3c-secondary-container)"
     stroke-width={thickness}
     stroke-linecap="round"
     x1={percentX + thickness + 4}

package/package/forms/WavyLinearProgressEstimate.svelte

@@ -59,12 +59,7 @@
 </script>
 
 <svg viewBox="0 0 {width} {height}">
-  <path
-    fill="none"
-    stroke="rgb(var(--m3-scheme-primary))"
-    stroke-width={thickness}
-    stroke-linecap="round"
-  >
+  <path fill="none" stroke="var(--m3c-primary)" stroke-width={thickness} stroke-linecap="round">
     <animate attributeName="d" dur="{endTime}s" values={expressiveSMIL} />
     <animate
       attributeName="d"
@@ -76,7 +71,7 @@
   </path>
   <line
     fill="none"
-    stroke="rgb(var(--m3-scheme-secondary-container))"
+    stroke="var(--m3c-secondary-container)"
     stroke-width={thickness}
     stroke-linecap="round"
     y1={height / 2}

package/package/forms/_picker/CalendarPicker.svelte

@@ -34,7 +34,7 @@
 
 <div class="m3-container">
   {#each "SMTWTFS" as day}
-    <div class="day m3-font-body-small">{day}</div>
+    <div class="day">{day}</div>
   {/each}
   {#each makeCalendar(focusedYear, focusedMonth) as day (day.iso + (day.disabled ? "-disabled" : ""))}
     <Item
@@ -58,6 +58,7 @@
     gap: 0.25rem;
   }
   .day {
+    @apply --m3-body-small;
     display: inline-flex;
     width: 2.5rem;
     height: 2.5rem;
@@ -65,6 +66,6 @@
     align-items: center;
     justify-content: center;
 
-    color: rgb(var(--m3-scheme-on-surface));
+    color: var(--m3c-on-surface);
   }
 </style>

package/package/forms/_picker/FocusPicker.svelte

@@ -16,12 +16,7 @@
 
 <div class="m3-container">
   {#each options as { name, selected, activate }}
-    <button
-      type="button"
-      class="m3-font-body-large"
-      onclick={activate}
-      use:conditionalScroll={selected}
-    >
+    <button type="button" onclick={activate} use:conditionalScroll={selected}>
       <Layer />
       {#if selected}
         <Icon icon={iconCheck} />
@@ -40,6 +35,7 @@
     margin-bottom: 1.25rem;
   }
   button {
+    @apply --m3-body-large;
     display: inline-flex;
     align-items: center;
     height: 3rem;
@@ -47,7 +43,7 @@
     flex-shrink: 0;
 
     background-color: transparent;
-    color: rgb(var(--m3-scheme-on-surface));
+    color: var(--m3c-on-surface);
     border: none;
     cursor: pointer;
     position: relative;

package/package/forms/_picker/Header.svelte

@@ -37,7 +37,7 @@
     </button>
     <button
       type="button"
-      class="chooser m3-font-label-large"
+      class="chooser"
       onclick={monthClick}
       disabled={currentView == "year"}
     >
@@ -62,7 +62,7 @@
     </button>
     <button
       type="button"
-      class="chooser m3-font-label-large"
+      class="chooser"
       onclick={yearClick}
       disabled={currentView == "month"}
     >
@@ -100,7 +100,7 @@
     justify-content: center;
 
     background-color: transparent;
-    color: rgb(var(--m3-scheme-on-surface-variant));
+    color: var(--m3c-on-surface-variant);
     border: none;
     padding: 0;
     cursor: pointer;
@@ -108,10 +108,11 @@
   }
   button:disabled {
     cursor: auto;
-    color: rgb(var(--m3-scheme-on-surface-variant) / 0.38);
+    color: --translucent(var(--m3c-on-surface-variant), 0.38);
   }
 
   .chooser {
+    @apply --m3-label-large;
     flex-grow: 1;
   }
   .chooser :global(svg) {
@@ -129,7 +130,7 @@
   }
 
   .choosing {
-    border-color: rgb(var(--m3-scheme-outline-variant));
+    border-color: var(--m3c-outline-variant);
   }
   .choosing .arrow {
     opacity: 0;

package/package/forms/_picker/Item.svelte

@@ -18,7 +18,7 @@
 
 <button
   type="button"
-  class="item m3-font-body-small"
+  class="item"
   {disabled}
   class:today
   class:selected
@@ -30,6 +30,7 @@
 
 <style>
   .item {
+    @apply --m3-body-small;
     display: inline-flex;
     width: 2.5rem;
     height: 2.5rem;
@@ -38,22 +39,22 @@
     justify-content: center;
 
     background-color: transparent;
-    color: rgb(var(--m3-scheme-on-surface));
+    color: var(--m3c-on-surface);
     border: none;
     cursor: pointer;
-    transition: var(--m3-util-easing-fast);
+    transition: var(--m3-easing-fast);
     position: relative;
   }
   button:disabled {
     cursor: auto;
-    color: rgb(var(--m3-scheme-on-surface-variant) / 0.38);
+    color: --translucent(var(--m3c-on-surface-variant), 0.38);
   }
   .today {
-    border: solid 1px rgb(var(--m3-scheme-primary));
-    color: rgb(var(--m3-scheme-primary));
+    border: solid 1px var(--m3c-primary);
+    color: var(--m3c-primary);
   }
   .selected {
-    background-color: rgb(var(--m3-scheme-primary)) !important;
-    color: rgb(var(--m3-scheme-on-primary));
+    background-color: var(--m3c-primary) !important;
+    color: var(--m3c-on-primary);
   }
 </style>

package/package/index.d.ts

@@ -1,3 +1,5 @@
+export { default as ChipChooser } from "./misc/ChipChooser.svelte";
+export { default as Divider } from "./misc/Divider.svelte";
 export { default as Icon } from "./misc/Icon.svelte";
 export { default as Layer } from "./misc/Layer.svelte";
 export * from "./misc/animation.js";
@@ -6,6 +8,7 @@ export * from "./misc/shapes.js";
 export * from "./misc/shapesAnimatable.js";
 export * from "./misc/utils.js";
 export * from "./misc/easing.js";
+export * from "./misc/badge.js";
 export { default as Button } from "./buttons/Button.svelte";
 export { default as ConnectedButtons } from "./buttons/ConnectedButtons.svelte";
 export { default as FAB } from "./buttons/FAB.svelte";
@@ -17,21 +20,17 @@ export { default as Dialog } from "./containers/Dialog.svelte";
 export { default as ListItem } from "./containers/ListItem.svelte";
 export { default as Menu } from "./containers/Menu.svelte";
 export { default as MenuItem } from "./containers/MenuItem.svelte";
-export { default as Snackbar } from "./containers/Snackbar.svelte";
-export type { SnackbarIn } from "./containers/Snackbar.svelte";
+export { default as Snackbar, snackbar } from "./containers/Snackbar.svelte";
 export { default as SnackbarItem } from "./containers/SnackbarItem.svelte";
-export { default as NewSnackbar, snackbar } from "./containers/NewSnackbar.svelte";
 export { default as Checkbox } from "./forms/Checkbox.svelte";
 export { default as Chip } from "./forms/Chip.svelte";
 export { default as CircularProgress } from "./forms/CircularProgress.svelte";
 export { default as CircularProgressEstimate } from "./forms/CircularProgressEstimate.svelte";
-export { default as CircularProgressIndeterminate } from "./forms/CircularProgressIndeterminate.svelte";
 export { default as DateField } from "./forms/DateField.svelte";
 export { default as DateFieldOutlined } from "./forms/DateFieldOutlined.svelte";
 export { default as DatePickerDocked } from "./forms/DatePickerDocked.svelte";
 export { default as LinearProgress } from "./forms/LinearProgress.svelte";
 export { default as LinearProgressEstimate } from "./forms/LinearProgressEstimate.svelte";
-export { default as LinearProgressIndeterminate } from "./forms/LinearProgressIndeterminate.svelte";
 export { default as LoadingIndicator } from "./forms/LoadingIndicator.svelte";
 export { default as RadioAnim1 } from "./forms/RadioAnim1.svelte";
 export { default as RadioAnim2 } from "./forms/RadioAnim2.svelte";
@@ -52,6 +51,3 @@ export { default as Tabs } from "./nav/Tabs.svelte";
 export { default as TabsLink } from "./nav/TabsLink.svelte";
 export { default as VariableTabs } from "./nav/VariableTabs.svelte";
 export { default as VariableTabsLink } from "./nav/VariableTabsLink.svelte";
-export * from "./utils/badge.js";
-export { default as ChipChooser } from "./utils/ChipChooser.svelte";
-export { default as Divider } from "./utils/Divider.svelte";

package/package/index.js

@@ -1,3 +1,5 @@
+export { default as ChipChooser } from "./misc/ChipChooser.svelte";
+export { default as Divider } from "./misc/Divider.svelte";
 export { default as Icon } from "./misc/Icon.svelte";
 export { default as Layer } from "./misc/Layer.svelte";
 export * from "./misc/animation.js";
@@ -6,6 +8,7 @@ export * from "./misc/shapes.js";
 export * from "./misc/shapesAnimatable.js";
 export * from "./misc/utils.js";
 export * from "./misc/easing.js";
+export * from "./misc/badge.js";
 export { default as Button } from "./buttons/Button.svelte";
 export { default as ConnectedButtons } from "./buttons/ConnectedButtons.svelte";
 export { default as FAB } from "./buttons/FAB.svelte";
@@ -17,20 +20,17 @@ export { default as Dialog } from "./containers/Dialog.svelte";
 export { default as ListItem } from "./containers/ListItem.svelte";
 export { default as Menu } from "./containers/Menu.svelte";
 export { default as MenuItem } from "./containers/MenuItem.svelte";
-export { default as Snackbar } from "./containers/Snackbar.svelte";
+export { default as Snackbar, snackbar } from "./containers/Snackbar.svelte";
 export { default as SnackbarItem } from "./containers/SnackbarItem.svelte";
-export { default as NewSnackbar, snackbar } from "./containers/NewSnackbar.svelte";
 export { default as Checkbox } from "./forms/Checkbox.svelte";
 export { default as Chip } from "./forms/Chip.svelte";
 export { default as CircularProgress } from "./forms/CircularProgress.svelte";
 export { default as CircularProgressEstimate } from "./forms/CircularProgressEstimate.svelte";
-export { default as CircularProgressIndeterminate } from "./forms/CircularProgressIndeterminate.svelte";
 export { default as DateField } from "./forms/DateField.svelte";
 export { default as DateFieldOutlined } from "./forms/DateFieldOutlined.svelte";
 export { default as DatePickerDocked } from "./forms/DatePickerDocked.svelte";
 export { default as LinearProgress } from "./forms/LinearProgress.svelte";
 export { default as LinearProgressEstimate } from "./forms/LinearProgressEstimate.svelte";
-export { default as LinearProgressIndeterminate } from "./forms/LinearProgressIndeterminate.svelte";
 export { default as LoadingIndicator } from "./forms/LoadingIndicator.svelte";
 export { default as RadioAnim1 } from "./forms/RadioAnim1.svelte";
 export { default as RadioAnim2 } from "./forms/RadioAnim2.svelte";
@@ -51,6 +51,3 @@ export { default as Tabs } from "./nav/Tabs.svelte";
 export { default as TabsLink } from "./nav/TabsLink.svelte";
 export { default as VariableTabs } from "./nav/VariableTabs.svelte";
 export { default as VariableTabsLink } from "./nav/VariableTabsLink.svelte";
-export * from "./utils/badge.js";
-export { default as ChipChooser } from "./utils/ChipChooser.svelte";
-export { default as Divider } from "./utils/Divider.svelte";

package/package/{utils → misc}/Divider.svelte

@@ -13,7 +13,7 @@
     margin: 0;
     height: 0;
     border: none;
-    border-bottom: solid 1px rgb(var(--m3-scheme-outline-variant));
+    border-bottom: solid 1px var(--m3c-outline-variant);
   }
   .inset {
     margin-left: 1rem;

package/package/misc/Icon.svelte

@@ -16,7 +16,6 @@
   width={size || "1em"}
   height={size || "1em"}
   viewBox="0 0 {icon.width} {icon.height}"
-  data-badge={icon.body.includes("<!--badge-->") ? "" : undefined}
   {...extra}
 >
   {@html icon.body}
@@ -25,9 +24,6 @@
 <style>
   svg {
     flex-shrink: 0;
-  }
-  /* deprecated: eventually want to just do this for all icons */
-  svg[data-badge] {
     overflow: visible;
   }
 </style>

package/package/misc/Layer.svelte

@@ -189,7 +189,7 @@
 
     background-color: currentColor;
     opacity: 0;
-    transition: opacity var(--m3-util-easing-fast);
+    transition: opacity var(--m3-easing-fast);
 
     &:not(
       :global(input:disabled + label) > .tint,

package/package/{utils → misc}/badge.js

@@ -10,18 +10,21 @@ export const addBadge = (icon, n) => {
         const text = n > max ? `${max}+` : n.toString();
         badge =
             `<!--badge--><foreignObject x="${x}" y="${y}" width="40" height="16">` +
-                `<div class="m3-font-label-small" style="${[
-                    "background-color:rgb(var(--m3-scheme-error))",
-                    "color:rgb(var(--m3-scheme-on-error))",
+                `<div style="${[
+                    "font-size:0.688rem",
+                    "letter-spacing:0.031rem",
+                    "font-weight:500",
+                    "background-color:var(--m3c-error)",
+                    "color:var(--m3c-on-error)",
                     "width:max-content",
                     "padding-inline:4px",
-                    "border-radius:var(--m3-util-rounding-full)",
+                    "border-radius:var(--m3-shape-full)",
                 ].join(";")}">` +
                 text +
                 `</div>`;
     }
     else {
-        badge = `<circle cx="${width - 3}" cy="3" r="3" fill="rgb(var(--m3-scheme-error))"/>`;
+        badge = `<circle cx="${width - 3}" cy="3" r="3" fill="var(--m3c-error)"/>`;
     }
     return {
         ...icon,

package/package/misc/recommended-styles.css

@@ -1,10 +1,10 @@
 @layer tokens {
   :root {
-    --m3-util-refocus: refocus-outward 0.6s cubic-bezier(0.14, 5.63, 0.4, 0.5) forwards;
+    --m3-refocus: refocus-outward 0.6s cubic-bezier(0.14, 5.63, 0.4, 0.5) forwards;
   }
 }
 :focus-visible:not(.focus-inset, .focus-none) {
-  animation: var(--m3-util-refocus);
+  animation: var(--m3-refocus);
   outline: none;
 }
 :focus-visible:is(.focus-inset):not(.focus-none) {
@@ -16,26 +16,26 @@
 }
 @keyframes refocus-outward {
   0% {
-    box-shadow: 0 0 0 0px rgb(var(--m3-scheme-secondary));
+    box-shadow: 0 0 0 0px var(--m3c-secondary);
   }
   100% {
-    box-shadow: 0 0 0 3px rgb(var(--m3-scheme-secondary));
+    box-shadow: 0 0 0 3px var(--m3c-secondary);
   }
 }
 @keyframes refocus-inward {
   0% {
-    box-shadow: inset 0 0 0 0px rgb(var(--m3-scheme-secondary));
+    box-shadow: inset 0 0 0 0px var(--m3c-secondary);
   }
   100% {
-    box-shadow: inset 0 0 0 3px rgb(var(--m3-scheme-secondary));
+    box-shadow: inset 0 0 0 3px var(--m3c-secondary);
   }
 }
 
 [placeholder]::placeholder {
-  color: rgb(var(--m3-scheme-on-background) / 0.5);
+  color: --translucent(var(--m3c-on-background), 0.5);
   opacity: 1;
 }
 ::selection {
-  background-color: rgb(var(--m3-scheme-tertiary-container));
-  color: rgb(var(--m3-scheme-on-tertiary-container));
+  background-color: var(--m3c-tertiary-container);
+  color: var(--m3c-on-tertiary-container);
 }