refactor: continue using primary as a palette key

Author: andrewseguin

src/material/core/theming/_definition.scss

@@ -53,8 +53,14 @@ $theme-version: 1;
   $system-variables-prefix: map.get($config, system-variables-prefix) or $system-level-prefix;
   sass-utils.$use-system-color-variables: map.get($config, use-system-variables) or false;
 
-  $palettes: map.set(
-      $primary, tertiary, map.remove($tertiary, neutral, neutral-variant, secondary, error));
+  $palettes: (
+    primary: map.remove($primary, neutral, neutral-variant, secondary),
+    secondary: map.get($primary, secondary),
+    tertiary: map.remove($tertiary, neutral, neutral-variant, secondary, error),
+    neutral: map.get($primary, neutral),
+    neutral-variant: map.get($primary, neutral-variant),
+    error: map.get($primary, error),
+  );
 
   @return (
     $internals: (

src/material/core/tokens/_m3-system.scss

@@ -259,9 +259,11 @@
 // system fallback variables referencing Material's system keys.
 // Includes density token fallbacks where density is 0.
 @function create-system-fallbacks() {
+  $palettes: m3.md-sys-color-values-light(palettes.$blue-palette);
+  $palettes: map.set($palettes, primary, palettes.$blue-palette);
   $app-vars: (
     'md-sys-color':
-        _create-system-app-vars-map(m3.md-sys-color-values-light(palettes.$blue-palette)),
+        _create-system-app-vars-map(m3.md-sys-color-values-light($palettes)),
     'md-sys-typescale':
         _create-system-app-vars-map(m3.md-sys-typescale-values((
           brand: (Roboto),

src/material/core/tokens/m3/_md-sys-color.scss

@@ -6,23 +6,23 @@
 @use 'sass:map';
 
 // Indicates whether alternative tokens should be used
-$_alternate-tokens: false;
+$_alternate-tokens: true;
 
 @function md-sys-color-values-dark($palettes) {
   $values: (
     background: map.get($palettes, neutral, 6),
     error: map.get($palettes, error, 80),
     error-container: map.get($palettes, error, 30),
     inverse-on-surface: map.get($palettes, neutral, 20),
-    inverse-primary: map.get($palettes, 40),
+    inverse-primary: map.get($palettes, primary, 40),
     inverse-surface: map.get($palettes, neutral, 90),
     on-background: map.get($palettes, neutral, 90),
     on-error: map.get($palettes, error, 20),
     on-error-container: map.get($palettes, error, 90),
-    on-primary: map.get($palettes, 20),
-    on-primary-container: map.get($palettes, 90),
-    on-primary-fixed: map.get($palettes, 10),
-    on-primary-fixed-variant: map.get($palettes, 30),
+    on-primary: map.get($palettes, primary, 20),
+    on-primary-container: map.get($palettes, primary, 90),
+    on-primary-fixed: map.get($palettes, primary, 10),
+    on-primary-fixed-variant: map.get($palettes, primary, 30),
     on-secondary: map.get($palettes, secondary, 20),
     on-secondary-container: map.get($palettes, secondary, 90),
     on-secondary-fixed: map.get($palettes, secondary, 10),
@@ -35,10 +35,10 @@ $_alternate-tokens: false;
     on-tertiary-fixed-variant: map.get($palettes, tertiary, 30),
     outline: map.get($palettes, neutral-variant, 60),
     outline-variant: map.get($palettes, neutral-variant, 30),
-    primary: map.get($palettes, 80),
-    primary-container: map.get($palettes, 30),
-    primary-fixed: map.get($palettes, 90),
-    primary-fixed-dim: map.get($palettes, 80),
+    primary: map.get($palettes, primary, 80),
+    primary-container: map.get($palettes, primary, 30),
+    primary-fixed: map.get($palettes, primary, 90),
+    primary-fixed-dim: map.get($palettes, primary, 80),
     scrim: map.get($palettes, neutral, 0),
     secondary: map.get($palettes, secondary, 80),
     secondary-container: map.get($palettes, secondary, 30),
@@ -53,7 +53,7 @@ $_alternate-tokens: false;
     surface-container-low: map.get($palettes, neutral, 10),
     surface-container-lowest: map.get($palettes, neutral, 4),
     surface-dim: map.get($palettes, neutral, 6),
-    surface-tint: map.get($palettes, 80),
+    surface-tint: map.get($palettes, primary, 80),
     surface-variant: map.get($palettes, neutral-variant, 30),
     tertiary: map.get($palettes, tertiary, 80),
     tertiary-container: map.get($palettes, tertiary, 30),
@@ -86,15 +86,15 @@ $_alternate-tokens: false;
     error: map.get($palettes, error, 40),
     error-container: map.get($palettes, error, 90),
     inverse-on-surface: map.get($palettes, neutral, 95),
-    inverse-primary: map.get($palettes, 80),
+    inverse-primary: map.get($palettes, primary, 80),
     inverse-surface: map.get($palettes, neutral, 20),
     on-background: map.get($palettes, neutral, 10),
     on-error: map.get($palettes, error, 100),
     on-error-container: map.get($palettes, error, 30),
-    on-primary: map.get($palettes, 100),
-    on-primary-container: map.get($palettes, 30),
-    on-primary-fixed: map.get($palettes, 10),
-    on-primary-fixed-variant: map.get($palettes, 30),
+    on-primary: map.get($palettes, primary, 100),
+    on-primary-container: map.get($palettes, primary, 30),
+    on-primary-fixed: map.get($palettes, primary, 10),
+    on-primary-fixed-variant: map.get($palettes, primary, 30),
     on-secondary: map.get($palettes, secondary, 100),
     on-secondary-container: map.get($palettes, secondary, 30),
     on-secondary-fixed: map.get($palettes, secondary, 10),
@@ -107,10 +107,10 @@ $_alternate-tokens: false;
     on-tertiary-fixed-variant: map.get($palettes, tertiary, 30),
     outline: map.get($palettes, neutral-variant, 50),
     outline-variant: map.get($palettes, neutral-variant, 80),
-    primary: map.get($palettes, 40),
-    primary-container: map.get($palettes, 90),
-    primary-fixed: map.get($palettes, 90),
-    primary-fixed-dim: map.get($palettes, 80),
+    primary: map.get($palettes, primary, 40),
+    primary-container: map.get($palettes, primary, 90),
+    primary-fixed: map.get($palettes, primary, 90),
+    primary-fixed-dim: map.get($palettes, primary, 80),
     scrim: map.get($palettes, neutral, 0),
     secondary: map.get($palettes, secondary, 40),
     secondary-container: map.get($palettes, secondary, 90),
@@ -125,7 +125,7 @@ $_alternate-tokens: false;
     surface-container-low: map.get($palettes, neutral, 96),
     surface-container-lowest: map.get($palettes, neutral, 100),
     surface-dim: map.get($palettes, neutral, 87),
-    surface-tint: map.get($palettes, 40),
+    surface-tint: map.get($palettes, primary, 40),
     surface-variant: map.get($palettes, neutral-variant, 90),
     tertiary: map.get($palettes, tertiary, 40),
     tertiary-container: map.get($palettes, tertiary, 90),
@@ -137,7 +137,7 @@ $_alternate-tokens: false;
     $values: map.merge($values, (
       background: map.get($palettes, neutral, 100),
       on-error-container: map.get($palettes, error, 10),
-      on-primary-container: map.get($palettes, 10),
+      on-primary-container: map.get($palettes, primary, 10),
       on-secondary-container: map.get($palettes, secondary, 10),
       on-tertiary-container: map.get($palettes, tertiary, 10),
       surface: map.get($palettes, neutral, 100),
@@ -146,7 +146,7 @@ $_alternate-tokens: false;
       surface-container-high: #e9eef6,
       surface-container-highest: #dde3ea,
       surface-container-low: #f8fafd,
-      surface-container-lowest: map.get($palettes, 100),
+      surface-container-lowest: map.get($palettes, primary, 100),
       surface-dim: #d3dbe5,
       surface-tint: #6991d6,
     ));