Skip to content

Commit 7a17fe9

Browse files
authored
fix(material/core): move internal tokens (#31907)
1 parent 8c69bbf commit 7a17fe9

File tree

8 files changed

+48
-49
lines changed

8 files changed

+48
-49
lines changed

src/material/core/tokens/m2/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ sass_library(
77
srcs = [
88
"_index.scss",
99
"_md-sys-color.scss",
10+
"_md-sys-color-internal.scss",
1011
"_md-sys-elevation.scss",
1112
"_md-sys-motion.scss",
1213
"_md-sys-shape.scss",
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// Dark system color values that are google3-internal and diverge from the
2+
// external Material Design spec.
3+
@function values-dark($palettes) {
4+
@return ();
5+
}
6+
7+
// Light system color values that are google3-internal and diverge from the
8+
// external Material Design spec.
9+
@function values-light($palettes) {
10+
@return ();
11+
}

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
@use 'sass:map';
22
@use '../../m2/palette';
3+
@use './md-sys-color-internal';
34

45
@function md-sys-color-values-dark($palettes) {
5-
@return (
6+
$values: (
67
primary: map.get($palettes, primary, default),
78
on-primary: map.get($palettes, primary, default-contrast),
89
inverse-primary: map.get($palettes, primary, 600),
@@ -55,10 +56,14 @@
5556
tertiary-fixed: map.get($palettes, accent, default),
5657
tertiary-fixed-dim: map.get($palettes, accent, default),
5758
);
59+
60+
$values: map.merge($values, md-sys-color-internal.values-dark($palettes));
61+
62+
@return $values;
5863
}
5964

6065
@function md-sys-color-values-light($palettes) {
61-
@return (
66+
$values: (
6267
primary: map.get($palettes, primary, default),
6368
on-primary: map.get($palettes, primary, default-contrast),
6469
inverse-primary: map.get($palettes, primary, 300),
@@ -111,4 +116,8 @@
111116
tertiary-fixed: map.get($palettes, accent, default),
112117
tertiary-fixed-dim: map.get($palettes, accent, default),
113118
);
119+
120+
$values: map.merge($values, md-sys-color-internal.values-light($palettes));
121+
122+
@return $values;
114123
}

src/material/core/tokens/m3/BUILD.bazel

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@ sass_library(
77
srcs = [
88
"_index.scss",
99
"_md-sys-color.scss",
10+
"_md-sys-color-internal.scss",
1011
"_md-sys-elevation.scss",
1112
"_md-sys-motion.scss",
1213
"_md-sys-shape.scss",
1314
"_md-sys-state.scss",
1415
"_md-sys-typescale.scss",
16+
"_md-sys-typescale-internal.scss",
1517
"_theme.scss",
1618
],
1719
)
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// Dark system color values that are internal-only and diverge from the
2+
// external Material Design spec.
3+
@function values-dark($palettes) {
4+
@return ();
5+
}
6+
7+
// Light system color values that are internal-only and diverge from the
8+
// external Material Design spec.
9+
@function values-light($palettes) {
10+
@return ();
11+
}

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

Lines changed: 5 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
@use 'sass:map';
2-
3-
// Indicates whether alternative tokens should be used
4-
$_alternate-tokens: false;
2+
@use './md-sys-color-internal';
53

64
@function md-sys-color-values-dark($palettes: ()) {
75
$values: (
@@ -53,22 +51,10 @@ $_alternate-tokens: false;
5351
tertiary: map.get($palettes, tertiary, 80),
5452
tertiary-container: map.get($palettes, tertiary, 30),
5553
tertiary-fixed: map.get($palettes, tertiary, 90),
56-
tertiary-fixed-dim: map.get($palettes, tertiary, 80)
54+
tertiary-fixed-dim: map.get($palettes, tertiary, 80),
5755
);
5856

59-
@if ($_alternate-tokens) {
60-
$values: map.merge($values, (
61-
on-surface-variant: map.get($palettes, neutral-variant, 80),
62-
surface-bright: #37393b,
63-
surface-container: #1e1f20,
64-
surface-container-high: #282a2c,
65-
surface-container-highest: #333537,
66-
surface-container-low: #1b1b1b,
67-
surface-container-lowest: #0e0e0e,
68-
surface-dim: #131313,
69-
surface-tint: #d1e1ff,
70-
));
71-
}
57+
$values: map.merge($values, md-sys-color-internal.values-dark($palettes));
7258

7359
@return $values;
7460
}
@@ -123,22 +109,10 @@ $_alternate-tokens: false;
123109
tertiary: map.get($palettes, tertiary, 40),
124110
tertiary-container: map.get($palettes, tertiary, 90),
125111
tertiary-fixed: map.get($palettes, tertiary, 90),
126-
tertiary-fixed-dim: map.get($palettes, tertiary, 80)
112+
tertiary-fixed-dim: map.get($palettes, tertiary, 80),
127113
);
128114

129-
@if ($_alternate-tokens) {
130-
$values: map.merge($values, (
131-
background: map.get($palettes, neutral, 100),
132-
surface: map.get($palettes, neutral, 100),
133-
surface-bright: map.get($palettes, neutral, 100),
134-
surface-container: #f0f4f9,
135-
surface-container-high: #e9eef6,
136-
surface-container-highest: #dde3ea,
137-
surface-container-low: #f8fafd,
138-
surface-dim: #d3dbe5,
139-
surface-tint: #6991d6,
140-
));
141-
}
115+
$values: map.merge($values, md-sys-color-internal.values-light($palettes));
142116

143117
@return $values;
144118
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
// System typescale values that are internal-only and diverge from the
2+
// external Material Design spec.
3+
@function values($typography) {
4+
@return ();
5+
}

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

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
//
55

66
@use 'sass:map';
7-
8-
// Indicates whether alternative tokens should be used
9-
$_alternate-tokens: false;
7+
@use './md-sys-typescale-internal';
108

119
@function md-sys-typescale-values($typography: ()) {
1210
$plain: map.get($typography, plain);
@@ -110,19 +108,7 @@ $_alternate-tokens: false;
110108
title-small-weight: $medium
111109
);
112110

113-
@if ($_alternate-tokens) {
114-
$values: map.merge($values, (
115-
body-large-tracking: 0,
116-
body-medium-tracking: 0,
117-
body-small-tracking: 0.006rem,
118-
display-large-tracking: 0,
119-
label-large-tracking: 0,
120-
label-medium-tracking: 0.006rem,
121-
label-small-tracking: 0.006rem,
122-
title-medium-tracking: 0,
123-
title-small-tracking: 0,
124-
));
125-
}
111+
$values: map.merge($values, md-sys-typescale-internal.values($typography));
126112

127113
@return $values;
128114
}

0 commit comments

Comments
 (0)