@material/web 1.0.0-pre.16 → 1.0.0-pre.17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (291) hide show
  1. package/README.md +5 -5
  2. package/all.d.ts +4 -2
  3. package/all.js +4 -2
  4. package/all.js.map +1 -1
  5. package/button/internal/_elevation.scss +4 -0
  6. package/button/internal/_shared.scss +5 -1
  7. package/button/internal/elevated-styles.css.js +1 -1
  8. package/button/internal/elevated-styles.css.js.map +1 -1
  9. package/button/internal/filled-styles.css.js +1 -1
  10. package/button/internal/filled-styles.css.js.map +1 -1
  11. package/button/internal/filled-tonal-styles.css.js +1 -1
  12. package/button/internal/filled-tonal-styles.css.js.map +1 -1
  13. package/button/internal/outlined-styles.css.js +1 -1
  14. package/button/internal/outlined-styles.css.js.map +1 -1
  15. package/button/internal/shared-elevation-styles.css.js +1 -1
  16. package/button/internal/shared-elevation-styles.css.js.map +1 -1
  17. package/button/internal/shared-styles.css.js +1 -1
  18. package/button/internal/shared-styles.css.js.map +1 -1
  19. package/button/internal/text-styles.css.js +1 -1
  20. package/button/internal/text-styles.css.js.map +1 -1
  21. package/checkbox/internal/_checkbox.scss +1 -1
  22. package/checkbox/internal/checkbox-styles.css.js +1 -1
  23. package/checkbox/internal/checkbox-styles.css.js.map +1 -1
  24. package/chips/internal/_elevated.scss +0 -4
  25. package/chips/internal/_shared.scss +10 -1
  26. package/chips/internal/assist-chip.d.ts +3 -1
  27. package/chips/internal/assist-chip.js +11 -8
  28. package/chips/internal/assist-chip.js.map +1 -1
  29. package/chips/internal/assist-styles.css.js +1 -1
  30. package/chips/internal/assist-styles.css.js.map +1 -1
  31. package/chips/internal/chip.d.ts +18 -10
  32. package/chips/internal/chip.js +38 -33
  33. package/chips/internal/chip.js.map +1 -1
  34. package/chips/internal/elevated-styles.css.js +1 -1
  35. package/chips/internal/elevated-styles.css.js.map +1 -1
  36. package/chips/internal/filter-chip.d.ts +6 -7
  37. package/chips/internal/filter-chip.js +13 -14
  38. package/chips/internal/filter-chip.js.map +1 -1
  39. package/chips/internal/filter-styles.css.js +1 -1
  40. package/chips/internal/filter-styles.css.js.map +1 -1
  41. package/chips/internal/input-chip.d.ts +4 -2
  42. package/chips/internal/input-chip.js +16 -12
  43. package/chips/internal/input-chip.js.map +1 -1
  44. package/chips/internal/input-styles.css.js +1 -1
  45. package/chips/internal/input-styles.css.js.map +1 -1
  46. package/chips/internal/multi-action-chip.d.ts +2 -3
  47. package/chips/internal/multi-action-chip.js +3 -3
  48. package/chips/internal/multi-action-chip.js.map +1 -1
  49. package/chips/internal/shared-styles.css.js +1 -1
  50. package/chips/internal/shared-styles.css.js.map +1 -1
  51. package/chips/internal/suggestion-styles.css.js +1 -1
  52. package/chips/internal/suggestion-styles.css.js.map +1 -1
  53. package/color/_color.scss +193 -0
  54. package/common.d.ts +2 -2
  55. package/common.js +2 -2
  56. package/common.js.map +1 -1
  57. package/dialog/internal/_dialog.scss +19 -4
  58. package/dialog/internal/dialog-styles.css.js +1 -1
  59. package/dialog/internal/dialog-styles.css.js.map +1 -1
  60. package/dialog/internal/dialog.d.ts +6 -0
  61. package/dialog/internal/dialog.js +36 -4
  62. package/dialog/internal/dialog.js.map +1 -1
  63. package/elevation/internal/elevation.d.ts +1 -0
  64. package/elevation/internal/elevation.js +6 -0
  65. package/elevation/internal/elevation.js.map +1 -1
  66. package/fab/internal/_shared.scss +4 -1
  67. package/fab/internal/fab-branded-styles.css.js +1 -1
  68. package/fab/internal/fab-branded-styles.css.js.map +1 -1
  69. package/fab/internal/fab-styles.css.js +1 -1
  70. package/fab/internal/fab-styles.css.js.map +1 -1
  71. package/fab/internal/shared-styles.css.js +1 -1
  72. package/fab/internal/shared-styles.css.js.map +1 -1
  73. package/field/internal/_content.scss +9 -1
  74. package/field/internal/_filled-field.scss +12 -0
  75. package/field/internal/_label.scss +4 -1
  76. package/field/internal/_outlined-field.scss +33 -0
  77. package/field/internal/_shared.scss +14 -6
  78. package/field/internal/_supporting-text.scss +4 -1
  79. package/field/internal/field.d.ts +2 -0
  80. package/field/internal/field.js +19 -0
  81. package/field/internal/field.js.map +1 -1
  82. package/field/internal/filled-styles.css.js +1 -1
  83. package/field/internal/filled-styles.css.js.map +1 -1
  84. package/field/internal/outlined-styles.css.js +1 -1
  85. package/field/internal/outlined-styles.css.js.map +1 -1
  86. package/field/internal/shared-styles.css.js +1 -1
  87. package/field/internal/shared-styles.css.js.map +1 -1
  88. package/focus/internal/focus-ring.d.ts +3 -1
  89. package/focus/internal/focus-ring.js +9 -0
  90. package/focus/internal/focus-ring.js.map +1 -1
  91. package/icon/internal/icon.js +4 -0
  92. package/icon/internal/icon.js.map +1 -1
  93. package/iconbutton/internal/_icon-button.scss +8 -0
  94. package/iconbutton/internal/icon-button.d.ts +3 -3
  95. package/iconbutton/internal/icon-button.js +4 -4
  96. package/iconbutton/internal/icon-button.js.map +1 -1
  97. package/iconbutton/internal/standard-styles.css.js +1 -1
  98. package/iconbutton/internal/standard-styles.css.js.map +1 -1
  99. package/internal/aria/aria.d.ts +52 -1
  100. package/internal/aria/aria.js +146 -0
  101. package/internal/aria/aria.js.map +1 -1
  102. package/internal/controller/attachable-controller.d.ts +5 -4
  103. package/internal/controller/attachable-controller.js +8 -0
  104. package/internal/controller/attachable-controller.js.map +1 -1
  105. package/labs/badge/internal/_badge.scss +5 -1
  106. package/labs/badge/internal/badge-styles.css.js +1 -1
  107. package/labs/badge/internal/badge-styles.css.js.map +1 -1
  108. package/labs/navigationbar/internal/navigation-bar-styles.css.js +1 -1
  109. package/labs/navigationbar/internal/navigation-bar-styles.css.js.map +1 -1
  110. package/labs/navigationtab/internal/_navigation-tab.scss +4 -1
  111. package/labs/navigationtab/internal/navigation-tab-styles.css.js +1 -1
  112. package/labs/navigationtab/internal/navigation-tab-styles.css.js.map +1 -1
  113. package/labs/segmentedbutton/internal/_shared.scss +4 -1
  114. package/labs/segmentedbutton/internal/outlined-styles.css.js +1 -1
  115. package/labs/segmentedbutton/internal/outlined-styles.css.js.map +1 -1
  116. package/labs/segmentedbutton/internal/shared-styles.css.js +1 -1
  117. package/labs/segmentedbutton/internal/shared-styles.css.js.map +1 -1
  118. package/labs/segmentedbuttonset/internal/outlined-styles.css.js +1 -1
  119. package/labs/segmentedbuttonset/internal/outlined-styles.css.js.map +1 -1
  120. package/list/harness.js +1 -1
  121. package/list/harness.js.map +1 -1
  122. package/list/internal/_list.scss +1 -4
  123. package/list/internal/list-styles.css.js +1 -1
  124. package/list/internal/list-styles.css.js.map +1 -1
  125. package/list/internal/list.d.ts +1 -2
  126. package/list/internal/list.js +4 -6
  127. package/list/internal/list.js.map +1 -1
  128. package/list/internal/listitem/_list-item.scss +17 -5
  129. package/list/internal/listitem/list-item-styles.css.js +1 -1
  130. package/list/internal/listitem/list-item-styles.css.js.map +1 -1
  131. package/menu/harness.d.ts +1 -1
  132. package/menu/harness.js +3 -4
  133. package/menu/harness.js.map +1 -1
  134. package/menu/internal/_menu.scss +32 -26
  135. package/menu/internal/menu-styles.css.js +1 -1
  136. package/menu/internal/menu-styles.css.js.map +1 -1
  137. package/menu/internal/menu.d.ts +15 -4
  138. package/menu/internal/menu.js +27 -4
  139. package/menu/internal/menu.js.map +1 -1
  140. package/menu/internal/menuitem/menu-item.js +1 -1
  141. package/menu/internal/menuitem/menu-item.js.map +1 -1
  142. package/menu/internal/submenuitem/sub-menu-item.d.ts +3 -0
  143. package/menu/internal/submenuitem/sub-menu-item.js +42 -12
  144. package/menu/internal/submenuitem/sub-menu-item.js.map +1 -1
  145. package/menu/internal/typeaheadController.js +2 -1
  146. package/menu/internal/typeaheadController.js.map +1 -1
  147. package/menu/menu.d.ts +12 -5
  148. package/menu/menu.js +12 -5
  149. package/menu/menu.js.map +1 -1
  150. package/menu/sub-menu-item.d.ts +3 -4
  151. package/menu/sub-menu-item.js +3 -4
  152. package/menu/sub-menu-item.js.map +1 -1
  153. package/package.json +10 -2
  154. package/progress/internal/_circular-progress.scss +4 -2
  155. package/progress/internal/_linear-progress.scss +2 -2
  156. package/progress/internal/circular-progress-styles.css.js +1 -1
  157. package/progress/internal/circular-progress-styles.css.js.map +1 -1
  158. package/radio/harness.d.ts +1 -1
  159. package/radio/harness.js +1 -1
  160. package/radio/harness.js.map +1 -1
  161. package/radio/internal/_radio.scss +4 -4
  162. package/radio/internal/radio-styles.css.js +1 -1
  163. package/radio/internal/radio-styles.css.js.map +1 -1
  164. package/radio/internal/radio.d.ts +3 -5
  165. package/radio/internal/radio.js +37 -32
  166. package/radio/internal/radio.js.map +1 -1
  167. package/radio/internal/single-selection-controller.js +4 -3
  168. package/radio/internal/single-selection-controller.js.map +1 -1
  169. package/ripple/internal/ripple.d.ts +3 -1
  170. package/ripple/internal/ripple.js +9 -0
  171. package/ripple/internal/ripple.js.map +1 -1
  172. package/select/harness.d.ts +1 -1
  173. package/select/harness.js +1 -3
  174. package/select/harness.js.map +1 -1
  175. package/select/internal/_filled-select.scss +13 -3
  176. package/select/internal/_outlined-select.scss +13 -3
  177. package/select/internal/filled-select-styles.css.js +1 -1
  178. package/select/internal/filled-select-styles.css.js.map +1 -1
  179. package/select/internal/outlined-select-styles.css.js +1 -1
  180. package/select/internal/outlined-select-styles.css.js.map +1 -1
  181. package/select/internal/select.d.ts +8 -2
  182. package/select/internal/select.js +21 -8
  183. package/select/internal/select.js.map +1 -1
  184. package/slider/internal/_slider.scss +9 -4
  185. package/slider/internal/forced-colors-styles.css.js +1 -1
  186. package/slider/internal/forced-colors-styles.css.js.map +1 -1
  187. package/slider/internal/forced-colors-styles.scss +31 -4
  188. package/slider/internal/slider-styles.css.js +1 -1
  189. package/slider/internal/slider-styles.css.js.map +1 -1
  190. package/switch/harness.d.ts +1 -1
  191. package/switch/harness.js +1 -1
  192. package/switch/harness.js.map +1 -1
  193. package/switch/internal/_handle.scss +22 -21
  194. package/switch/internal/_icon.scss +12 -12
  195. package/switch/internal/_switch.scss +11 -19
  196. package/switch/internal/_track.scss +12 -12
  197. package/switch/internal/forced-colors-styles.css.js +1 -1
  198. package/switch/internal/forced-colors-styles.css.js.map +1 -1
  199. package/switch/internal/forced-colors-styles.scss +1 -0
  200. package/switch/internal/switch-styles.css.js +1 -1
  201. package/switch/internal/switch-styles.css.js.map +1 -1
  202. package/switch/internal/switch.d.ts +72 -2
  203. package/switch/internal/switch.js +144 -30
  204. package/switch/internal/switch.js.map +1 -1
  205. package/tabs/{_tab.scss → _primary-tab.scss} +1 -1
  206. package/tabs/_secondary-tab.scss +6 -0
  207. package/tabs/harness.d.ts +2 -2
  208. package/tabs/harness.js +1 -2
  209. package/tabs/harness.js.map +1 -1
  210. package/tabs/internal/_primary-tab.scss +70 -0
  211. package/tabs/internal/_secondary-tab.scss +61 -0
  212. package/tabs/internal/_tab.scss +8 -157
  213. package/tabs/internal/_tabs.scss +9 -10
  214. package/tabs/internal/primary-tab-styles.css.d.ts +1 -0
  215. package/tabs/internal/primary-tab-styles.css.js +9 -0
  216. package/tabs/internal/primary-tab-styles.css.js.map +1 -0
  217. package/tabs/internal/primary-tab-styles.scss +10 -0
  218. package/tabs/internal/primary-tab.d.ts +20 -0
  219. package/tabs/internal/primary-tab.js +30 -0
  220. package/tabs/internal/primary-tab.js.map +1 -0
  221. package/tabs/internal/secondary-tab-styles.css.d.ts +1 -0
  222. package/tabs/internal/secondary-tab-styles.css.js +9 -0
  223. package/tabs/internal/secondary-tab-styles.css.js.map +1 -0
  224. package/tabs/internal/secondary-tab-styles.scss +10 -0
  225. package/tabs/internal/secondary-tab.d.ts +12 -0
  226. package/tabs/internal/secondary-tab.js +16 -0
  227. package/tabs/internal/secondary-tab.js.map +1 -0
  228. package/tabs/internal/tab-styles.css.js +1 -1
  229. package/tabs/internal/tab-styles.css.js.map +1 -1
  230. package/tabs/internal/tab.d.ts +16 -34
  231. package/tabs/internal/tab.js +81 -80
  232. package/tabs/internal/tab.js.map +1 -1
  233. package/tabs/internal/tabs-styles.css.js +1 -1
  234. package/tabs/internal/tabs-styles.css.js.map +1 -1
  235. package/tabs/internal/tabs.d.ts +6 -20
  236. package/tabs/internal/tabs.js +33 -66
  237. package/tabs/internal/tabs.js.map +1 -1
  238. package/tabs/{tab.d.ts → primary-tab.d.ts} +3 -4
  239. package/tabs/primary-tab.js +23 -0
  240. package/tabs/primary-tab.js.map +1 -0
  241. package/tabs/secondary-tab.d.ts +18 -0
  242. package/tabs/secondary-tab.js +23 -0
  243. package/tabs/secondary-tab.js.map +1 -0
  244. package/tabs/tabs.d.ts +0 -2
  245. package/tabs/tabs.js +0 -2
  246. package/tabs/tabs.js.map +1 -1
  247. package/textfield/internal/_filled-text-field.scss +12 -3
  248. package/textfield/internal/_outlined-text-field.scss +12 -3
  249. package/textfield/internal/filled-styles.css.js +1 -1
  250. package/textfield/internal/filled-styles.css.js.map +1 -1
  251. package/textfield/internal/outlined-styles.css.js +1 -1
  252. package/textfield/internal/outlined-styles.css.js.map +1 -1
  253. package/textfield/internal/text-field.d.ts +19 -0
  254. package/textfield/internal/text-field.js +20 -0
  255. package/textfield/internal/text-field.js.map +1 -1
  256. package/tokens/_index.scss +5 -6
  257. package/tokens/_md-comp-assist-chip.scss +6 -14
  258. package/tokens/_md-comp-badge.scss +1 -14
  259. package/tokens/{_md-comp-circular-progress-indicator.scss → _md-comp-circular-progress.scss} +3 -1
  260. package/tokens/_md-comp-dialog.scss +10 -17
  261. package/tokens/_md-comp-elevated-button.scss +5 -13
  262. package/tokens/_md-comp-fab-branded.scss +9 -10
  263. package/tokens/_md-comp-fab.scss +9 -10
  264. package/tokens/_md-comp-filled-button.scss +5 -13
  265. package/tokens/_md-comp-filled-field.scss +25 -6
  266. package/tokens/_md-comp-filled-select.scss +15 -15
  267. package/tokens/_md-comp-filled-text-field.scss +15 -19
  268. package/tokens/_md-comp-filled-tonal-button.scss +5 -13
  269. package/tokens/_md-comp-filter-chip.scss +5 -13
  270. package/tokens/_md-comp-input-chip.scss +5 -13
  271. package/tokens/_md-comp-list-item.scss +18 -37
  272. package/tokens/_md-comp-outlined-button.scss +5 -13
  273. package/tokens/_md-comp-outlined-field.scss +25 -6
  274. package/tokens/_md-comp-outlined-segmented-button.scss +5 -13
  275. package/tokens/_md-comp-outlined-select.scss +15 -15
  276. package/tokens/_md-comp-outlined-text-field.scss +15 -19
  277. package/tokens/_md-comp-primary-tab.scss +132 -0
  278. package/tokens/_md-comp-secondary-tab.scss +139 -0
  279. package/tokens/_md-comp-slider.scss +16 -16
  280. package/tokens/_md-comp-suggestion-chip.scss +5 -13
  281. package/tokens/_md-comp-test-table.scss +13 -2
  282. package/tokens/_md-comp-text-button.scss +5 -13
  283. package/tokens/_md-ref-palette.scss +101 -1
  284. package/tokens/_md-ref-typeface.scss +3 -0
  285. package/tokens/_md-sys-color.scss +57 -2
  286. package/tokens/_md-sys-typescale.scss +66 -5
  287. package/tabs/tab.js +0 -22
  288. package/tabs/tab.js.map +0 -1
  289. package/tokens/_md-comp-tab.scss +0 -285
  290. /package/tokens/{_md-comp-linear-progress-indicator.scss → _md-comp-linear-progress.scss} +0 -0
  291. /package/tokens/{_md-comp-radio-button.scss → _md-comp-radio.scss} +0 -0
package/tokens/_md-comp-filled-button.scss CHANGED
@@ -41,7 +41,10 @@ $supported-tokens: (
41
41
  'icon-color',
42
42
  'icon-size',
43
43
  'label-text-color',
44
- 'label-text-type',
44
+ 'label-text-font',
45
+ 'label-text-line-height',
46
+ 'label-text-size',
47
+ 'label-text-weight',
45
48
  'leading-space',
46
49
  'pressed-container-elevation',
47
50
  'pressed-icon-color',
@@ -60,11 +63,8 @@ $unsupported-tokens: (
60
63
  // go/keep-sorted start
61
64
  'focus-state-layer-color',
62
65
  'focus-state-layer-opacity',
63
- 'label-text-font',
64
- 'label-text-line-height',
65
- 'label-text-size',
66
66
  'label-text-tracking',
67
- 'label-text-weight',
67
+ 'label-text-type',
68
68
  // go/keep-sorted end
69
69
  );
70
70
 
@@ -108,13 +108,5 @@ $_default: (
108
108
  )
109
109
  );
110
110
 
111
- // TODO(b/271876162): remove when tokens compiler emits typescale tokens
112
- $tokens: map.merge(
113
- $tokens,
114
- (
115
- 'label-text-type': map.get($deps, 'md-sys-typescale', 'label-large'),
116
- )
117
- );
118
-
119
111
  @return $tokens;
120
112
  }
package/tokens/_md-comp-filled-field.scss CHANGED
@@ -23,7 +23,10 @@ $supported-tokens: (
23
23
  'container-color',
24
24
  'container-shape',
25
25
  'content-color',
26
- 'content-type',
26
+ 'content-font',
27
+ 'content-line-height',
28
+ 'content-size',
29
+ 'content-weight',
27
30
  'disabled-active-indicator-color',
28
31
  'disabled-active-indicator-height',
29
32
  'disabled-active-indicator-opacity',
@@ -76,16 +79,22 @@ $supported-tokens: (
76
79
  'hover-supporting-text-color',
77
80
  'hover-trailing-content-color',
78
81
  'label-text-color',
82
+ 'label-text-font',
83
+ 'label-text-line-height',
79
84
  'label-text-populated-line-height',
80
85
  'label-text-populated-size',
81
- 'label-text-type',
86
+ 'label-text-size',
87
+ 'label-text-weight',
82
88
  'leading-content-color',
83
89
  'leading-space',
84
90
  'supporting-text-color',
91
+ 'supporting-text-font',
85
92
  'supporting-text-leading-space',
93
+ 'supporting-text-line-height',
94
+ 'supporting-text-size',
86
95
  'supporting-text-top-space',
87
96
  'supporting-text-trailing-space',
88
- 'supporting-text-type',
97
+ 'supporting-text-weight',
89
98
  'top-space',
90
99
  'trailing-content-color',
91
100
  'trailing-space',
@@ -115,7 +124,10 @@ $_default: (
115
124
  'container-color': map.get($text-field, 'container-color'),
116
125
  'container-shape': map.get($text-field, 'container-shape'),
117
126
  'content-color': map.get($text-field, 'input-text-color'),
118
- 'content-type': map.get($text-field, 'input-text-type'),
127
+ 'content-font': map.get($text-field, 'input-text-font'),
128
+ 'content-line-height': map.get($text-field, 'input-text-line-height'),
129
+ 'content-size': map.get($text-field, 'input-text-size'),
130
+ 'content-weight': map.get($text-field, 'input-text-weight'),
119
131
  'disabled-active-indicator-color':
120
132
  map.get($text-field, 'disabled-active-indicator-color'),
121
133
  'disabled-active-indicator-height':
@@ -210,18 +222,25 @@ $_default: (
210
222
  'hover-trailing-content-color':
211
223
  map.get($text-field, 'hover-trailing-icon-color'),
212
224
  'label-text-color': map.get($text-field, 'label-text-color'),
225
+ 'label-text-font': map.get($text-field, 'label-text-font'),
226
+ 'label-text-line-height': map.get($text-field, 'label-text-line-height'),
213
227
  'label-text-populated-line-height':
214
228
  map.get($text-field, 'label-text-populated-line-height'),
215
229
  'label-text-populated-size':
216
230
  map.get($text-field, 'label-text-populated-size'),
217
- 'label-text-type': map.get($text-field, 'label-text-type'),
231
+ 'label-text-size': map.get($text-field, 'label-text-size'),
232
+ 'label-text-weight': map.get($text-field, 'label-text-weight'),
218
233
  'leading-content-color': map.get($text-field, 'leading-icon-color'),
219
234
  'leading-space': if($exclude-hardcoded-values, null, 16px),
220
235
  'supporting-text-color': map.get($text-field, 'supporting-text-color'),
236
+ 'supporting-text-font': map.get($text-field, 'supporting-text-font'),
221
237
  'supporting-text-leading-space': if($exclude-hardcoded-values, null, 16px),
238
+ 'supporting-text-line-height':
239
+ map.get($text-field, 'supporting-text-line-height'),
240
+ 'supporting-text-size': map.get($text-field, 'supporting-text-size'),
222
241
  'supporting-text-top-space': if($exclude-hardcoded-values, null, 4px),
223
242
  'supporting-text-trailing-space': if($exclude-hardcoded-values, null, 16px),
224
- 'supporting-text-type': map.get($text-field, 'supporting-text-type'),
243
+ 'supporting-text-weight': map.get($text-field, 'supporting-text-weight'),
225
244
  'top-space': if($exclude-hardcoded-values, null, 16px),
226
245
  'trailing-content-color': map.get($text-field, 'trailing-icon-color'),
227
246
  'trailing-space': if($exclude-hardcoded-values, null, 16px),
package/tokens/_md-comp-filled-select.scss CHANGED
@@ -74,15 +74,24 @@ $supported-tokens: (
74
74
  'text-field-hover-supporting-text-color',
75
75
  'text-field-hover-trailing-icon-color',
76
76
  'text-field-input-text-color',
77
- 'text-field-input-text-type',
77
+ 'text-field-input-text-font',
78
+ 'text-field-input-text-line-height',
79
+ 'text-field-input-text-size',
80
+ 'text-field-input-text-weight',
78
81
  'text-field-label-text-color',
82
+ 'text-field-label-text-font',
83
+ 'text-field-label-text-line-height',
79
84
  'text-field-label-text-populated-line-height',
80
85
  'text-field-label-text-populated-size',
81
- 'text-field-label-text-type',
86
+ 'text-field-label-text-size',
87
+ 'text-field-label-text-weight',
82
88
  'text-field-leading-icon-color',
83
89
  'text-field-leading-icon-size',
84
90
  'text-field-supporting-text-color',
85
- 'text-field-supporting-text-type',
91
+ 'text-field-supporting-text-font',
92
+ 'text-field-supporting-text-line-height',
93
+ 'text-field-supporting-text-size',
94
+ 'text-field-supporting-text-weight',
86
95
  'text-field-trailing-icon-color',
87
96
  'text-field-trailing-icon-size',
88
97
  // go/keep-sorted end
@@ -111,21 +120,12 @@ $unsupported-tokens: (
111
120
  'menu-list-item-with-leading-icon-leading-icon-size',
112
121
  'menu-list-item-with-trailing-icon-trailing-icon-color',
113
122
  'menu-list-item-with-trailing-icon-trailing-icon-size',
114
- 'text-field-input-text-font',
115
- 'text-field-input-text-line-height',
116
- 'text-field-input-text-size',
117
123
  'text-field-input-text-tracking',
118
- 'text-field-input-text-weight',
119
- 'text-field-label-text-font',
120
- 'text-field-label-text-line-height',
121
- 'text-field-label-text-size',
124
+ 'text-field-input-text-type',
122
125
  'text-field-label-text-tracking',
123
- 'text-field-label-text-weight',
124
- 'text-field-supporting-text-font',
125
- 'text-field-supporting-text-line-height',
126
- 'text-field-supporting-text-size',
126
+ 'text-field-label-text-type',
127
127
  'text-field-supporting-text-tracking',
128
- 'text-field-supporting-text-weight',
128
+ 'text-field-supporting-text-type',
129
129
  // go/keep-sorted end
130
130
  );
131
131
 
package/tokens/_md-comp-filled-text-field.scss CHANGED
@@ -75,18 +75,27 @@ $supported-tokens: (
75
75
  'hover-supporting-text-color',
76
76
  'hover-trailing-icon-color',
77
77
  'input-text-color',
78
+ 'input-text-font',
79
+ 'input-text-line-height',
78
80
  'input-text-placeholder-color',
79
81
  'input-text-prefix-color',
82
+ 'input-text-size',
80
83
  'input-text-suffix-color',
81
- 'input-text-type',
84
+ 'input-text-weight',
82
85
  'label-text-color',
86
+ 'label-text-font',
87
+ 'label-text-line-height',
83
88
  'label-text-populated-line-height',
84
89
  'label-text-populated-size',
85
- 'label-text-type',
90
+ 'label-text-size',
91
+ 'label-text-weight',
86
92
  'leading-icon-color',
87
93
  'leading-icon-size',
88
94
  'supporting-text-color',
89
- 'supporting-text-type',
95
+ 'supporting-text-font',
96
+ 'supporting-text-line-height',
97
+ 'supporting-text-size',
98
+ 'supporting-text-weight',
90
99
  'trailing-icon-color',
91
100
  'trailing-icon-size',
92
101
  // go/keep-sorted end
@@ -94,21 +103,12 @@ $supported-tokens: (
94
103
 
95
104
  $unsupported-tokens: (
96
105
  // go/keep-sorted start
97
- 'input-text-font',
98
- 'input-text-line-height',
99
- 'input-text-size',
100
106
  'input-text-tracking',
101
- 'input-text-weight',
102
- 'label-text-font',
103
- 'label-text-line-height',
104
- 'label-text-size',
107
+ 'input-text-type',
105
108
  'label-text-tracking',
106
- 'label-text-weight',
107
- 'supporting-text-font',
108
- 'supporting-text-line-height',
109
- 'supporting-text-size',
109
+ 'label-text-type',
110
110
  'supporting-text-tracking',
111
- 'supporting-text-weight',
111
+ 'supporting-text-type',
112
112
  // go/keep-sorted end
113
113
  );
114
114
 
@@ -129,10 +129,6 @@ $_default: (
129
129
  $tokens: map.merge(
130
130
  $tokens,
131
131
  (
132
- // TODO(b/271876162): remove when tokens compiler emits typescale tokens
133
- 'input-text-type': map.get($deps, 'md-sys-typescale', 'body-large'),
134
- 'label-text-type': map.get($deps, 'md-sys-typescale', 'body-large'),
135
- 'supporting-text-type': map.get($deps, 'md-sys-typescale', 'body-small'),
136
132
  // TODO(b/259455114): remove when focus tokens update to 3px
137
133
  'focus-active-indicator-height': if($exclude-hardcoded-values, null, 3px)
138
134
  )
package/tokens/_md-comp-filled-tonal-button.scss CHANGED
@@ -41,7 +41,10 @@ $supported-tokens: (
41
41
  'icon-color',
42
42
  'icon-size',
43
43
  'label-text-color',
44
- 'label-text-type',
44
+ 'label-text-font',
45
+ 'label-text-line-height',
46
+ 'label-text-size',
47
+ 'label-text-weight',
45
48
  'leading-space',
46
49
  'pressed-container-elevation',
47
50
  'pressed-icon-color',
@@ -60,11 +63,8 @@ $unsupported-tokens: (
60
63
  // go/keep-sorted start
61
64
  'focus-state-layer-color',
62
65
  'focus-state-layer-opacity',
63
- 'label-text-font',
64
- 'label-text-line-height',
65
- 'label-text-size',
66
66
  'label-text-tracking',
67
- 'label-text-weight',
67
+ 'label-text-type',
68
68
  // go/keep-sorted end
69
69
  );
70
70
 
@@ -108,13 +108,5 @@ $_default: (
108
108
  )
109
109
  );
110
110
 
111
- // TODO(b/271876162): remove when tokens compiler emits typescale tokens
112
- $tokens: map.merge(
113
- $tokens,
114
- (
115
- 'label-text-type': map.get($deps, 'md-sys-typescale', 'label-large'),
116
- )
117
- );
118
-
119
111
  @return $tokens;
120
112
  }
package/tokens/_md-comp-filter-chip.scss CHANGED
@@ -51,7 +51,10 @@ $supported-tokens: (
51
51
  'hover-trailing-icon-color',
52
52
  'icon-size',
53
53
  'label-text-color',
54
- 'label-text-type',
54
+ 'label-text-font',
55
+ 'label-text-line-height',
56
+ 'label-text-size',
57
+ 'label-text-weight',
55
58
  'leading-icon-color',
56
59
  'outline-color',
57
60
  'outline-width',
@@ -95,11 +98,8 @@ $unsupported-tokens: (
95
98
  'focus-state-layer-color',
96
99
  'focus-state-layer-opacity',
97
100
  'hover-container-elevation',
98
- 'label-text-font',
99
- 'label-text-line-height',
100
- 'label-text-size',
101
101
  'label-text-tracking',
102
- 'label-text-weight',
102
+ 'label-text-type',
103
103
  'pressed-container-elevation',
104
104
  'selected-dragged-label-text-color',
105
105
  'selected-dragged-leading-icon-color',
@@ -216,13 +216,5 @@ $_default: (
216
216
  )
217
217
  );
218
218
 
219
- // TODO(b/271876162): remove when tokens compiler emits typescale tokens
220
- $tokens: map.merge(
221
- $tokens,
222
- (
223
- 'label-text-type': map.get($deps, 'md-sys-typescale', 'label-large'),
224
- )
225
- );
226
-
227
219
  @return $tokens;
228
220
  }
package/tokens/_md-comp-input-chip.scss CHANGED
@@ -44,7 +44,10 @@ $supported-tokens: (
44
44
  'hover-trailing-icon-color',
45
45
  'icon-size',
46
46
  'label-text-color',
47
- 'label-text-type',
47
+ 'label-text-font',
48
+ 'label-text-line-height',
49
+ 'label-text-size',
50
+ 'label-text-weight',
48
51
  'leading-icon-color',
49
52
  'outline-color',
50
53
  'outline-width',
@@ -86,11 +89,8 @@ $unsupported-tokens: (
86
89
  'dragged-trailing-icon-color',
87
90
  'focus-state-layer-color',
88
91
  'focus-state-layer-opacity',
89
- 'label-text-font',
90
- 'label-text-line-height',
91
- 'label-text-size',
92
92
  'label-text-tracking',
93
- 'label-text-weight',
93
+ 'label-text-type',
94
94
  'selected-dragged-label-text-color',
95
95
  'selected-dragged-leading-icon-color',
96
96
  'selected-dragged-state-layer-color',
@@ -191,14 +191,6 @@ $_default: (
191
191
  )
192
192
  );
193
193
 
194
- // TODO(b/271876162): remove when tokens compiler emits typescale tokens
195
- $tokens: map.merge(
196
- $tokens,
197
- (
198
- 'label-text-type': map.get($deps, 'md-sys-typescale', 'label-large'),
199
- )
200
- );
201
-
202
194
  // TODO(b/288199264): remove once input chip leading icon color is fixed
203
195
  $tokens: map.set(
204
196
  $tokens,
package/tokens/_md-comp-list-item.scss CHANGED
@@ -37,12 +37,17 @@ $supported-tokens: (
37
37
  'hover-state-layer-opacity',
38
38
  'hover-trailing-icon-icon-color',
39
39
  'label-text-color',
40
+ 'label-text-font',
40
41
  'label-text-line-height',
41
- 'label-text-type',
42
+ 'label-text-size',
43
+ 'label-text-weight',
42
44
  'large-leading-video-height',
43
45
  'leading-avatar-color',
44
46
  'leading-avatar-label-color',
45
- 'leading-avatar-label-type',
47
+ 'leading-avatar-label-font',
48
+ 'leading-avatar-label-line-height',
49
+ 'leading-avatar-label-size',
50
+ 'leading-avatar-label-weight',
46
51
  'leading-avatar-shape',
47
52
  'leading-avatar-size',
48
53
  'leading-element-leading-space',
@@ -63,15 +68,20 @@ $supported-tokens: (
63
68
  'pressed-trailing-icon-icon-color',
64
69
  'small-leading-video-height',
65
70
  'supporting-text-color',
66
- 'supporting-text-type',
71
+ 'supporting-text-font',
72
+ 'supporting-text-line-height',
73
+ 'supporting-text-size',
74
+ 'supporting-text-weight',
67
75
  'three-line-container-height',
68
76
  'trailing-element-headline-trailing-element-space',
69
77
  'trailing-icon-color',
70
78
  'trailing-icon-size',
71
79
  'trailing-space',
72
80
  'trailing-supporting-text-color',
81
+ 'trailing-supporting-text-font',
73
82
  'trailing-supporting-text-line-height',
74
- 'trailing-supporting-text-type',
83
+ 'trailing-supporting-text-size',
84
+ 'trailing-supporting-text-weight',
75
85
  'two-line-container-height',
76
86
  // go/keep-sorted end
77
87
  );
@@ -89,15 +99,10 @@ $unsupported-tokens: (
89
99
  'dragged-trailing-icon-icon-color',
90
100
  'focus-state-layer-color',
91
101
  'focus-state-layer-opacity',
92
- 'label-text-font',
93
- 'label-text-size',
94
102
  'label-text-tracking',
95
- 'label-text-weight',
96
- 'leading-avatar-label-font',
97
- 'leading-avatar-label-line-height',
98
- 'leading-avatar-label-size',
103
+ 'label-text-type',
99
104
  'leading-avatar-label-tracking',
100
- 'leading-avatar-label-weight',
105
+ 'leading-avatar-label-type',
101
106
  'overline-color',
102
107
  'overline-font',
103
108
  'overline-line-height',
@@ -106,15 +111,10 @@ $unsupported-tokens: (
106
111
  'overline-type',
107
112
  'overline-weight',
108
113
  'selected-trailing-icon-color',
109
- 'supporting-text-font',
110
- 'supporting-text-line-height',
111
- 'supporting-text-size',
112
114
  'supporting-text-tracking',
113
- 'supporting-text-weight',
114
- 'trailing-supporting-text-font',
115
- 'trailing-supporting-text-size',
115
+ 'supporting-text-type',
116
116
  'trailing-supporting-text-tracking',
117
- 'trailing-supporting-text-weight',
117
+ 'trailing-supporting-text-type',
118
118
  'unselected-trailing-icon-color',
119
119
  // go/keep-sorted end
120
120
  );
@@ -129,7 +129,6 @@ $_default: (
129
129
 
130
130
  @function values($deps: $_default, $exclude-hardcoded-values: false) {
131
131
  $original-tokens: md-comp-list.values($deps, $exclude-hardcoded-values);
132
- $original-tokens: map.merge($original-tokens, _get-override-tokens($deps));
133
132
 
134
133
  $tokens: values.validate(
135
134
  $original-tokens,
@@ -173,21 +172,3 @@ $_default: (
173
172
  // go/keep-sorted end
174
173
  );
175
174
  }
176
-
177
- @function _get-override-tokens($deps) {
178
- // TODO(b/271876162): remove when tokens compiler emits typescale tokens
179
- @return (
180
- // go/keep-sorted start
181
- 'list-item-label-text-type':
182
- map.get($deps, 'md-sys-typescale', 'body-large'),
183
- 'list-item-leading-avatar-label-type':
184
- map.get($deps, 'md-sys-typescale', 'title-medium'),
185
- // unsupported token
186
- // 'list-item-overline-type': map.get($deps, 'md-sys-typescale', 'label-small'),
187
- 'list-item-supporting-text-type':
188
- map.get($deps, 'md-sys-typescale', 'body-medium'),
189
- 'list-item-trailing-supporting-text-type':
190
- map.get($deps, 'md-sys-typescale', 'label-small'),
191
- // go/keep-sorted end
192
- );
193
- }
package/tokens/_md-comp-outlined-button.scss CHANGED
@@ -34,7 +34,10 @@ $supported-tokens: (
34
34
  'icon-color',
35
35
  'icon-size',
36
36
  'label-text-color',
37
- 'label-text-type',
37
+ 'label-text-font',
38
+ 'label-text-line-height',
39
+ 'label-text-size',
40
+ 'label-text-weight',
38
41
  'leading-space',
39
42
  'outline-color',
40
43
  'outline-width',
@@ -57,11 +60,8 @@ $unsupported-tokens: (
57
60
  'focus-state-layer-color',
58
61
  'focus-state-layer-opacity',
59
62
  'hover-outline-color',
60
- 'label-text-font',
61
- 'label-text-line-height',
62
- 'label-text-size',
63
63
  'label-text-tracking',
64
- 'label-text-weight',
64
+ 'label-text-type',
65
65
  // go/keep-sorted end
66
66
  );
67
67
 
@@ -104,13 +104,5 @@ $_default: (
104
104
  )
105
105
  );
106
106
 
107
- // TODO(b/271876162): remove when tokens compiler emits typescale tokens
108
- $tokens: map.merge(
109
- $tokens,
110
- (
111
- 'label-text-type': map.get($deps, 'md-sys-typescale', 'label-large'),
112
- )
113
- );
114
-
115
107
  @return $tokens;
116
108
  }
package/tokens/_md-comp-outlined-field.scss CHANGED
@@ -20,7 +20,10 @@ $supported-tokens: (
20
20
  'bottom-space',
21
21
  'container-shape',
22
22
  'content-color',
23
- 'content-type',
23
+ 'content-font',
24
+ 'content-line-height',
25
+ 'content-size',
26
+ 'content-weight',
24
27
  'disabled-content-color',
25
28
  'disabled-content-opacity',
26
29
  'disabled-label-text-color',
@@ -67,20 +70,26 @@ $supported-tokens: (
67
70
  'hover-supporting-text-color',
68
71
  'hover-trailing-content-color',
69
72
  'label-text-color',
73
+ 'label-text-font',
74
+ 'label-text-line-height',
70
75
  'label-text-padding-bottom',
71
76
  'label-text-populated-line-height',
72
77
  'label-text-populated-size',
73
- 'label-text-type',
78
+ 'label-text-size',
79
+ 'label-text-weight',
74
80
  'leading-content-color',
75
81
  'leading-space',
76
82
  'outline-color',
77
83
  'outline-label-padding',
78
84
  'outline-width',
79
85
  'supporting-text-color',
86
+ 'supporting-text-font',
80
87
  'supporting-text-leading-space',
88
+ 'supporting-text-line-height',
89
+ 'supporting-text-size',
81
90
  'supporting-text-top-space',
82
91
  'supporting-text-trailing-space',
83
- 'supporting-text-type',
92
+ 'supporting-text-weight',
84
93
  'top-space',
85
94
  'trailing-content-color',
86
95
  'trailing-space',
@@ -105,7 +114,10 @@ $_default: (
105
114
  'bottom-space': if($exclude-hardcoded-values, null, 16px),
106
115
  'container-shape': map.get($text-field, 'container-shape'),
107
116
  'content-color': map.get($text-field, 'input-text-color'),
108
- 'content-type': map.get($text-field, 'input-text-type'),
117
+ 'content-font': map.get($text-field, 'input-text-font'),
118
+ 'content-line-height': map.get($text-field, 'input-text-line-height'),
119
+ 'content-size': map.get($text-field, 'input-text-size'),
120
+ 'content-weight': map.get($text-field, 'input-text-weight'),
109
121
  'disabled-content-color': map.get($text-field, 'disabled-input-text-color'),
110
122
  'disabled-content-opacity':
111
123
  map.get($text-field, 'disabled-input-text-opacity'),
@@ -183,22 +195,29 @@ $_default: (
183
195
  'hover-trailing-content-color':
184
196
  map.get($text-field, 'hover-trailing-icon-color'),
185
197
  'label-text-color': map.get($text-field, 'label-text-color'),
198
+ 'label-text-font': map.get($text-field, 'label-text-font'),
199
+ 'label-text-line-height': map.get($text-field, 'label-text-line-height'),
186
200
  'label-text-padding-bottom': if($exclude-hardcoded-values, null, 8px),
187
201
  'label-text-populated-line-height':
188
202
  map.get($text-field, 'label-text-populated-line-height'),
189
203
  'label-text-populated-size':
190
204
  map.get($text-field, 'label-text-populated-size'),
191
- 'label-text-type': map.get($text-field, 'label-text-type'),
205
+ 'label-text-size': map.get($text-field, 'label-text-size'),
206
+ 'label-text-weight': map.get($text-field, 'label-text-weight'),
192
207
  'leading-content-color': map.get($text-field, 'leading-icon-color'),
193
208
  'leading-space': if($exclude-hardcoded-values, null, 16px),
194
209
  'outline-color': map.get($text-field, 'outline-color'),
195
210
  'outline-label-padding': if($exclude-hardcoded-values, null, 4px),
196
211
  'outline-width': map.get($text-field, 'outline-width'),
197
212
  'supporting-text-color': map.get($text-field, 'supporting-text-color'),
213
+ 'supporting-text-font': map.get($text-field, 'supporting-text-font'),
198
214
  'supporting-text-leading-space': if($exclude-hardcoded-values, null, 16px),
215
+ 'supporting-text-line-height':
216
+ map.get($text-field, 'supporting-text-line-height'),
217
+ 'supporting-text-size': map.get($text-field, 'supporting-text-size'),
199
218
  'supporting-text-top-space': if($exclude-hardcoded-values, null, 4px),
200
219
  'supporting-text-trailing-space': if($exclude-hardcoded-values, null, 16px),
201
- 'supporting-text-type': map.get($text-field, 'supporting-text-type'),
220
+ 'supporting-text-weight': map.get($text-field, 'supporting-text-weight'),
202
221
  'top-space': if($exclude-hardcoded-values, null, 16px),
203
222
  'trailing-content-color': map.get($text-field, 'trailing-icon-color'),
204
223
  'trailing-space': if($exclude-hardcoded-values, null, 16px),
package/tokens/_md-comp-outlined-segmented-button.scss CHANGED
@@ -22,7 +22,10 @@ $supported-tokens: (
22
22
  'disabled-outline-color',
23
23
  'hover-state-layer-opacity',
24
24
  'icon-size',
25
- 'label-text-type',
25
+ 'label-text-font',
26
+ 'label-text-line-height',
27
+ 'label-text-size',
28
+ 'label-text-weight',
26
29
  'outline-color',
27
30
  'pressed-state-layer-opacity',
28
31
  'selected-container-color',
@@ -56,11 +59,8 @@ $unsupported-tokens: (
56
59
  'disabled-label-text-opacity',
57
60
  'disabled-outline-opacity',
58
61
  'focus-state-layer-opacity',
59
- 'label-text-font',
60
- 'label-text-line-height',
61
- 'label-text-size',
62
62
  'label-text-tracking',
63
- 'label-text-weight',
63
+ 'label-text-type',
64
64
  'outline-width',
65
65
  'selected-focus-state-layer-color',
66
66
  'unselected-focus-state-layer-color',
@@ -87,13 +87,5 @@ $_default: (
87
87
  )
88
88
  );
89
89
 
90
- // TODO(b/271876162): remove when tokens compiler emits typescale tokens
91
- $tokens: map.merge(
92
- $tokens,
93
- (
94
- 'label-text-type': map.get($deps, 'md-sys-typescale', 'label-large'),
95
- )
96
- );
97
-
98
90
  @return $tokens;
99
91
  }
package/tokens/_md-comp-outlined-select.scss CHANGED
@@ -66,17 +66,26 @@ $supported-tokens: (
66
66
  'text-field-hover-supporting-text-color',
67
67
  'text-field-hover-trailing-icon-color',
68
68
  'text-field-input-text-color',
69
- 'text-field-input-text-type',
69
+ 'text-field-input-text-font',
70
+ 'text-field-input-text-line-height',
71
+ 'text-field-input-text-size',
72
+ 'text-field-input-text-weight',
70
73
  'text-field-label-text-color',
74
+ 'text-field-label-text-font',
75
+ 'text-field-label-text-line-height',
71
76
  'text-field-label-text-populated-line-height',
72
77
  'text-field-label-text-populated-size',
73
- 'text-field-label-text-type',
78
+ 'text-field-label-text-size',
79
+ 'text-field-label-text-weight',
74
80
  'text-field-leading-icon-color',
75
81
  'text-field-leading-icon-size',
76
82
  'text-field-outline-color',
77
83
  'text-field-outline-width',
78
84
  'text-field-supporting-text-color',
79
- 'text-field-supporting-text-type',
85
+ 'text-field-supporting-text-font',
86
+ 'text-field-supporting-text-line-height',
87
+ 'text-field-supporting-text-size',
88
+ 'text-field-supporting-text-weight',
80
89
  'text-field-trailing-icon-color',
81
90
  'text-field-trailing-icon-size',
82
91
  // go/keep-sorted end
@@ -110,21 +119,12 @@ $unsupported-tokens: (
110
119
  'text-field-error-hover-state-layer-opacity',
111
120
  'text-field-hover-state-layer-color',
112
121
  'text-field-hover-state-layer-opacity',
113
- 'text-field-input-text-font',
114
- 'text-field-input-text-line-height',
115
- 'text-field-input-text-size',
116
122
  'text-field-input-text-tracking',
117
- 'text-field-input-text-weight',
118
- 'text-field-label-text-font',
119
- 'text-field-label-text-line-height',
120
- 'text-field-label-text-size',
123
+ 'text-field-input-text-type',
121
124
  'text-field-label-text-tracking',
122
- 'text-field-label-text-weight',
123
- 'text-field-supporting-text-font',
124
- 'text-field-supporting-text-line-height',
125
- 'text-field-supporting-text-size',
125
+ 'text-field-label-text-type',
126
126
  'text-field-supporting-text-tracking',
127
- 'text-field-supporting-text-weight',
127
+ 'text-field-supporting-text-type',
128
128
  // go/keep-sorted end
129
129
  );
130
130