m3-svelte 5.15.5 → 6.0.1

package/package/forms/Switch.svelte

@@ -70,8 +70,8 @@
 <style>
   @layer tokens {
     :root {
-      --m3-switch-track-shape: var(--m3-util-rounding-full);
-      --m3-switch-handle-shape: var(--m3-util-rounding-full);
+      --m3-switch-track-shape: var(--m3-shape-full);
+      --m3-switch-handle-shape: var(--m3-shape-full);
     }
   }
   .m3-container {
@@ -87,10 +87,10 @@
     margin: 0;
     border-radius: var(--m3-switch-track-shape);
 
-    background-color: rgb(var(--m3-scheme-surface-container-highest));
-    border: solid 0.125rem rgb(var(--m3-scheme-outline));
+    background-color: var(--m3c-surface-container-highest);
+    border: solid 0.125rem var(--m3c-outline);
     cursor: pointer;
-    transition: var(--m3-util-easing);
+    transition: var(--m3-easing);
   }
   .handle {
     position: absolute;
@@ -98,11 +98,10 @@
     height: 1rem;
     border-radius: var(--m3-switch-handle-shape);
 
-    background-color: rgb(var(--m3-scheme-outline));
-    /* Fallback for those without on on primary */
-    color: rgb(var(--m3-scheme-on-on-primary, var(--m3-scheme-on-primary-container)));
+    background-color: var(--m3c-outline);
+    color: var(--m3c-on-on-primary);
     cursor: pointer;
-    transition: var(--m3-util-easing-fast-spatial);
+    transition: var(--m3-easing-fast-spatial);
 
     left: 0.5rem;
     top: 50%;
@@ -116,13 +115,13 @@
     height: 1rem;
     opacity: 0;
     transition:
-      opacity var(--m3-util-easing-fast-spatial),
-      scale var(--m3-util-easing-fast-spatial);
+      opacity var(--m3-easing-fast-spatial),
+      scale var(--m3-easing-fast-spatial);
   }
   input:not(:checked) + :global(.handle:has(:nth-child(2))) {
     scale: 1.5;
     > :global(svg) {
-      color: rgb(var(--m3-scheme-surface-container-highest));
+      color: var(--m3c-surface-container-highest);
       scale: 0.667;
       opacity: 1;
     }
@@ -137,10 +136,10 @@
     position: absolute;
     width: 3rem;
     height: 3rem;
-    border-radius: var(--m3-util-rounding-full);
+    border-radius: var(--m3-shape-full);
 
     cursor: pointer;
-    transition: var(--m3-util-easing-fast);
+    transition: var(--m3-easing-fast);
 
     left: 1rem;
     top: 50%;
@@ -152,26 +151,26 @@
 
   .m3-container:hover > input:not(:checked):not(:disabled) + .handle,
   .m3-container:active > input:not(:checked):not(:disabled) + .handle {
-    background-color: rgb(var(--m3-scheme-on-surface-variant));
+    background-color: var(--m3c-on-surface-variant);
   }
   .m3-container:hover > input:enabled:checked + .handle,
   .m3-container > input:enabled:checked:is(:global(:active, :focus-visible)) + .handle {
-    background-color: rgb(var(--m3-scheme-primary-container));
-    color: rgb(var(--m3-scheme-on-primary-container));
+    background-color: var(--m3c-primary-container);
+    color: var(--m3c-on-primary-container);
   }
   .m3-container:hover > input ~ .hover {
-    background-color: rgb(var(--m3-scheme-on-surface) / 0.08);
+    background-color: --translucent(var(--m3c-on-surface), 0.08);
   }
   .m3-container:hover > input:checked ~ .hover {
-    background-color: rgb(var(--m3-scheme-primary) / 0.08);
+    background-color: --translucent(var(--m3c-primary), 0.08);
   }
 
   input:checked {
-    background-color: rgb(var(--m3-scheme-primary));
-    border-color: rgb(var(--m3-scheme-primary));
+    background-color: var(--m3c-primary);
+    border-color: var(--m3c-primary);
   }
   input:checked + .handle {
-    background-color: rgb(var(--m3-scheme-on-primary));
+    background-color: var(--m3c-on-primary);
     scale: 1.5;
     left: 1.75rem;
   }
@@ -190,23 +189,23 @@
   }
 
   input:disabled {
-    background-color: rgb(var(--m3-scheme-surface-container-highest) / 0.12);
-    border-color: rgb(var(--m3-scheme-outline) / 0.12);
+    background-color: --translucent(var(--m3c-surface-container-highest), 0.12);
+    border-color: --translucent(var(--m3c-outline), 0.12);
     cursor: auto;
   }
   input:disabled:checked {
-    background-color: rgb(var(--m3-scheme-on-surface) / 0.12);
+    background-color: --translucent(var(--m3c-on-surface), 0.12);
     border-color: transparent;
   }
   input:disabled + .handle {
-    background-color: rgb(var(--m3-scheme-on-surface) / 0.38);
+    background-color: --translucent(var(--m3c-on-surface), 0.38);
     cursor: auto;
   }
   input:disabled:checked + .handle {
-    background-color: rgb(var(--m3-scheme-surface));
+    background-color: var(--m3c-surface);
   }
   input:disabled:checked + .handle > :global(svg) {
-    color: rgb(var(--m3-scheme-on-surface) / 0.38);
+    color: --translucent(var(--m3c-on-surface), 0.38);
   }
   input:disabled ~ .hover {
     display: none;

package/package/forms/TextField.svelte

@@ -35,7 +35,7 @@
   class:error
 >
   <input
-    class="focus-none m3-font-body-large"
+    class="focus-none"
     placeholder=" "
     bind:value
     onkeydown={(e) => e.key == "Enter" && enter?.()}
@@ -43,10 +43,8 @@
     {disabled}
     {required}
     {...extra}
-    defaultValue={extra.defaultValue}
   />
-  <!-- TODO/deprecated: once https://github.com/sveltejs/svelte/pull/16481 is finished, remove the defaultvalue thing -->
-  <label class="m3-font-body-large" for={id}>{label}</label>
+  <label for={id}>{label}</label>
   <div class="layer"></div>
   {#if leadingIcon}
     <Icon icon={leadingIcon} class="leading" />
@@ -63,11 +61,7 @@
 <style>
   @layer tokens {
     :root {
-      /* "textfield" is deprecated */
-      --m3-field-filled-shape: var(
-        --m3-textfield-filled-shape,
-        var(--m3-util-rounding-extra-small)
-      );
+      --m3-field-filled-shape: var(--m3-shape-extra-small);
     }
   }
 
@@ -75,10 +69,11 @@
     display: inline-flex;
     position: relative;
     align-items: center;
-    height: calc(3.5rem + var(--m3-util-density-term));
+    height: --m3-density(3.5rem);
     min-width: 15rem;
   }
   input {
+    @apply --m3-body-large;
     position: absolute;
     inset: 0;
     width: 100%;
@@ -87,30 +82,29 @@
     outline: none;
     padding: 1.5rem 1rem 0.5rem 1rem;
     border-radius: var(--m3-field-filled-shape) var(--m3-field-filled-shape) 0 0;
-    background-color: rgb(var(--m3-scheme-surface-container-highest));
-    color: rgb(var(--m3-scheme-on-surface));
+    background-color: var(--m3c-surface-container-highest);
+    color: var(--m3c-on-surface);
   }
   label {
+    @apply --m3-body-large;
     position: absolute;
     inset-inline-start: 1rem;
     top: 50%;
     translate: 0 -50%;
-    color: rgb(var(--error, var(--m3-scheme-on-surface-variant)));
+    color: var(--error, var(--m3c-on-surface-variant));
     &:is(input:hover ~ label) {
-      color: rgb(var(--error, var(--m3-scheme-on-surface)));
+      color: var(--error, var(--m3c-on-surface));
     }
     &:is(input:focus ~ label) {
-      color: rgb(var(--error, var(--m3-scheme-primary)));
+      color: var(--error, var(--m3c-primary));
     }
     &:is(input:disabled ~ label) {
-      color: rgb(var(--m3-scheme-on-surface) / 0.38);
+      color: --translucent(var(--m3c-on-surface), 0.38);
     }
     &:is(input:focus ~ label, input:not(:placeholder-shown) ~ label) {
+      @apply --m3-body-small;
       top: 0.5rem;
       translate: 0 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:
@@ -128,7 +122,7 @@
     pointer-events: none;
     transition: all 100ms;
     &:is(input:enabled:hover ~ .layer) {
-      background-color: rgb(var(--m3-scheme-on-surface) / 0.08);
+      background-color: --translucent(var(--m3c-on-surface), 0.08);
     }
   }
   .layer::after {
@@ -139,13 +133,13 @@
     bottom: 0;
 
     height: 1px;
-    background-color: rgb(var(--error, var(--m3-scheme-on-surface-variant)));
+    background-color: var(--error, var(--m3c-on-surface-variant));
     transition: all 100ms;
   }
   .m3-container :global(svg) {
     width: 1.5rem;
     height: 1.5rem;
-    color: rgb(var(--m3-scheme-on-surface-variant));
+    color: var(--m3c-on-surface-variant);
     pointer-events: none;
   }
   .m3-container > :global(.leading) {
@@ -171,7 +165,7 @@
 
   input:focus ~ .layer::after {
     height: 0.125rem;
-    background-color: rgb(var(--error, var(--m3-scheme-primary)));
+    background-color: var(--error, var(--m3c-primary));
   }
 
   .leading-icon > input {
@@ -184,21 +178,21 @@
     padding-inline-end: 3.25rem;
   }
   .error {
-    --error: var(--m3-scheme-error);
+    --error: var(--m3c-error);
   }
   .error > input:hover ~ label,
   .error > input:hover ~ .layer {
-    --error: var(--m3-scheme-on-error-container);
+    --error: var(--m3c-on-error-container);
   }
   input:disabled {
-    background-color: rgb(var(--m3-scheme-on-surface) / 0.04);
-    color: rgb(var(--m3-scheme-on-surface) / 0.38);
+    background-color: --translucent(var(--m3c-on-surface), 0.04);
+    color: --translucent(var(--m3c-on-surface), 0.38);
   }
   input:disabled ~ .layer::after {
-    background-color: rgb(var(--m3-scheme-on-surface) / 0.38);
+    background-color: --translucent(var(--m3c-on-surface), 0.38);
   }
   input: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/TextFieldMultiline.svelte

@@ -38,17 +38,15 @@
 
 <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 -->
-  <label class="m3-font-body-large" for={id}>{label}</label>
+  <label for={id}>{label}</label>
   <div class="layer"></div>
   {#if leadingIcon}
     <Icon icon={leadingIcon} />
@@ -58,21 +56,18 @@
 <style>
   @layer tokens {
     :root {
-      /* "textfield" is deprecated */
-      --m3-field-filled-shape: var(
-        --m3-textfield-filled-shape,
-        var(--m3-util-rounding-extra-small)
-      );
+      --m3-field-filled-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%;
@@ -81,31 +76,30 @@
     outline: none;
     padding: 1.5rem 1rem 0.5rem 1rem;
     border-radius: var(--m3-field-filled-shape) var(--m3-field-filled-shape) 0 0;
-    background-color: rgb(var(--m3-scheme-surface-container-highest));
-    color: rgb(var(--m3-scheme-on-surface));
+    background-color: var(--m3c-surface-container-highest);
+    color: var(--m3c-on-surface);
     resize: none;
   }
   label {
+    @apply --m3-body-large;
     position: absolute;
     inset-inline-start: 1rem;
     top: 50%;
     translate: 0 -50%;
-    color: rgb(var(--error, var(--m3-scheme-on-surface-variant)));
+    color: var(--error, var(--m3c-on-surface-variant));
     &: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.5rem;
       translate: 0 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,7 +117,7 @@
     pointer-events: none;
     transition: all 100ms;
     &:is(textarea:enabled:hover ~ .layer) {
-      background-color: rgb(var(--m3-scheme-on-surface) / 0.08);
+      background-color: --translucent(var(--m3c-on-surface), 0.08);
     }
   }
   .layer::after {
@@ -134,7 +128,7 @@
     bottom: 0;
 
     height: 1px;
-    background-color: rgb(var(--error, var(--m3-scheme-on-surface-variant)));
+    background-color: var(--error, var(--m3c-on-surface-variant));
     transition: all 100ms;
   }
   .m3-container > :global(svg) {
@@ -142,13 +136,13 @@
     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;
   }
 
   textarea:focus ~ .layer::after {
     height: 0.125rem;
-    background-color: rgb(var(--error, var(--m3-scheme-primary)));
+    background-color: var(--error, var(--m3c-primary));
   }
 
   .leading-icon > textarea {
@@ -158,21 +152,21 @@
     inset-inline-start: 3.25rem;
   }
   .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 {
-    background-color: rgb(var(--m3-scheme-on-surface) / 0.04);
-    color: rgb(var(--m3-scheme-on-surface) / 0.38);
+    background-color: --translucent(var(--m3c-on-surface), 0.04);
+    color: --translucent(var(--m3c-on-surface), 0.38);
   }
   textarea:disabled ~ .layer::after {
-    background-color: rgb(var(--m3-scheme-on-surface) / 0.38);
+    background-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/TextFieldOutlined.svelte

@@ -35,7 +35,7 @@
   class:error
 >
   <input
-    class="focus-none m3-font-body-large"
+    class="focus-none"
     placeholder=" "
     bind:value
     onkeydown={(e) => e.key == "Enter" && enter?.()}
@@ -43,11 +43,9 @@
     {disabled}
     {required}
     {...extra}
-    defaultValue={extra.defaultValue}
   />
-  <!-- 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} class="leading" />
   {/if}
@@ -63,25 +61,22 @@
 <style>
   /*
   want to customize the label's background?
-  do this: <TextFieldOutlined --m3-util-background="rgb(var(--m3-scheme-surface-container))" />
+  do this: <TextFieldOutlined --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;
-    height: calc(3.5rem + var(--m3-util-density-term));
+    height: --m3-density(3.5rem);
     min-width: 15rem;
   }
   input {
+    @apply --m3-body-large;
     position: absolute;
     inset: 0;
     width: 100%;
@@ -91,30 +86,29 @@
     padding: 1rem;
     border-radius: var(--m3-field-outlined-shape);
     background-color: transparent;
-    color: rgb(var(--m3-scheme-on-surface));
+    color: var(--m3c-on-surface);
   }
   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(input:hover ~ label) {
-      color: rgb(var(--error, var(--m3-scheme-on-surface)));
+      color: var(--error, var(--m3c-on-surface));
     }
     &:is(input:enabled:focus ~ label) {
-      color: rgb(var(--error, var(--m3-scheme-primary)));
+      color: var(--error, var(--m3c-primary));
     }
     &:is(input:disabled ~ label) {
-      color: rgb(var(--m3-scheme-on-surface) / 0.38);
+      color: --translucent(var(--m3c-on-surface), 0.38);
     }
     &:is(input:focus ~ label, input: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:
@@ -127,22 +121,22 @@
   .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(input:enabled:hover ~ .layer) {
-      border-color: rgb(var(--error, var(--m3-scheme-on-surface)));
+      border-color: var(--error, var(--m3c-on-surface));
     }
     &:is(input:enabled:focus ~ .layer) {
-      border-color: rgb(var(--error, var(--m3-scheme-primary)));
+      border-color: var(--error, var(--m3c-primary));
       border-width: 0.125rem;
     }
   }
   .m3-container :global(svg) {
     width: 1.5rem;
     height: 1.5rem;
-    color: rgb(var(--m3-scheme-on-surface-variant));
+    color: var(--m3c-on-surface-variant);
     pointer-events: none;
   }
   .m3-container > :global(.leading) {
@@ -177,21 +171,21 @@
   }
 
   .error {
-    --error: var(--m3-scheme-error);
+    --error: var(--m3c-error);
   }
   .error > input:hover ~ label,
   .error > input:hover ~ .layer {
-    --error: var(--m3-scheme-on-error-container);
+    --error: var(--m3c-on-error-container);
   }
 
   input:disabled {
-    color: rgb(var(--m3-scheme-on-surface) / 0.38);
+    color: --translucent(var(--m3c-on-surface), 0.38);
   }
   input:disabled ~ .layer {
-    border-color: rgb(var(--m3-scheme-on-surface) / 0.38);
+    border-color: --translucent(var(--m3c-on-surface), 0.38);
   }
   input:disabled ~ :global(svg) {
-    color: rgb(var(--m3-scheme-on-surface) / 0.38);
+    color: --translucent(var(--m3c-on-surface), 0.38);
   }
 
   .m3-container {