Skip to content

Commit fe646cd

Browse files
committed
fix(material/core): include internal token overrides
1 parent 75713b0 commit fe646cd

File tree

2 files changed

+62
-3
lines changed

2 files changed

+62
-3
lines changed

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

Lines changed: 43 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,14 @@
77

88
@use './md-ref-palette';
99

10+
@use '../../token-definition';
11+
1012
$_default-dark: (
1113
'md-ref-palette': md-ref-palette.values(),
1214
);
1315

1416
@function values-dark($deps: $_default-dark) {
15-
@return (
17+
$values: (
1618
'background': map.get($deps, 'md-ref-palette', 'neutral6'),
1719
'error': map.get($deps, 'md-ref-palette', 'error80'),
1820
'error-container': map.get($deps, 'md-ref-palette', 'error30'),
@@ -64,14 +66,32 @@ $_default-dark: (
6466
'tertiary-fixed': map.get($deps, 'md-ref-palette', 'tertiary90'),
6567
'tertiary-fixed-dim': map.get($deps, 'md-ref-palette', 'tertiary80')
6668
);
69+
70+
@if (token-definition.$private-is-internal-build) {
71+
$values: map.merge($values, (
72+
'background': map.get($deps, 'md-ref-palette', 'neutral10'),
73+
'on-surface-variant': map.get($deps, 'md-ref-palette', 'neutral-variant80'),
74+
'surface': map.get($deps, 'md-ref-palette', 'neutral10'),
75+
'surface-bright': #37393b,
76+
'surface-container': #1e1f20,
77+
'surface-container-high': #282a2c,
78+
'surface-container-highest': #333537,
79+
'surface-container-low': #1b1b1b,
80+
'surface-container-lowest': #0e0e0e,
81+
'surface-dim': #131313,
82+
'surface-tint': #d1e1ff,
83+
))
84+
}
85+
86+
@return $values;
6787
}
6888

6989
$_default-light: (
7090
'md-ref-palette': md-ref-palette.values(),
7191
);
7292

7393
@function values-light($deps: $_default-light) {
74-
@return (
94+
$values: (
7595
'background': map.get($deps, 'md-ref-palette', 'neutral98'),
7696
'error': map.get($deps, 'md-ref-palette', 'error40'),
7797
'error-container': map.get($deps, 'md-ref-palette', 'error90'),
@@ -123,4 +143,25 @@ $_default-light: (
123143
'tertiary-fixed': map.get($deps, 'md-ref-palette', 'tertiary90'),
124144
'tertiary-fixed-dim': map.get($deps, 'md-ref-palette', 'tertiary80')
125145
);
146+
147+
@if (token-definition.$private-is-internal-build) {
148+
$values: map.merge($values, (
149+
'background': map.get($deps, 'md-ref-palette', 'neutral100'),
150+
'on-error-container': map.get($deps, 'md-ref-palette', 'error10'),
151+
'on-primary-container': map.get($deps, 'md-ref-palette', 'primary10'),
152+
'on-secondary-container': map.get($deps, 'md-ref-palette', 'secondary10'),
153+
'on-tertiary-container': map.get($deps, 'md-ref-palette', 'tertiary10'),
154+
'surface': map.get($deps, 'md-ref-palette', 'neutral100'),
155+
'surface-bright': map.get($deps, 'md-ref-palette', 'neutral100'),
156+
'surface-container': #f0f4f9,
157+
'surface-container-high': #e9eef6,
158+
'surface-container-highest': #dde3ea,
159+
'surface-container-low': #f8fafd,
160+
'surface-container-lowest': map.get($deps, 'md-ref-palette', 'primary100'),
161+
'surface-dim': #d3dbe5,
162+
'surface-tint': #6991d6,
163+
))
164+
}
165+
166+
@return $values;
126167
}

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

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,14 @@
77

88
@use './md-ref-typeface';
99

10+
@use '../../token-definition';
11+
1012
$_default: (
1113
'md-ref-typeface': md-ref-typeface.values(),
1214
);
1315

1416
@function values($deps: $_default, $exclude-hardcoded-values: false) {
15-
@return (
17+
$values: (
1618
// Warning: risk of reduced fidelity from using this composite typography token.
1719
// Tokens md.sys.typescale.body-large.tracking cannot be represented in the "font"
1820
// property shorthand. Consider using the discrete properties instead.
@@ -305,4 +307,20 @@ $_default: (
305307
'title-small-tracking': if($exclude-hardcoded-values, null, 0.006rem),
306308
'title-small-weight': map.get($deps, 'md-ref-typeface', 'weight-medium')
307309
);
310+
311+
@if (token-definition.$private-is-internal-build) {
312+
$values: map.merge($values, (
313+
'body-large-tracking': if($exclude-hardcoded-values, null, 0),
314+
'body-medium-tracking': if($exclude-hardcoded-values, null, 0),
315+
'body-small-tracking': if($exclude-hardcoded-values, null, 0.006rem),
316+
'display-large-tracking': if($exclude-hardcoded-values, null, 0),
317+
'label-large-tracking': if($exclude-hardcoded-values, null, 0),
318+
'label-medium-tracking': if($exclude-hardcoded-values, null, 0.006rem),
319+
'label-small-tracking': if($exclude-hardcoded-values, null, 0.006rem),
320+
'title-medium-tracking': if($exclude-hardcoded-values, null, 0),
321+
'title-small-tracking': if($exclude-hardcoded-values, null, 0),
322+
))
323+
}
324+
325+
@return $values;
308326
}

0 commit comments

Comments
 (0)