From 01a99a5cc36cafe11422062d513e38cbf7442e02 Mon Sep 17 00:00:00 2001
From: Elizabeth Mitchell <lizmitchell@google.com>
Date: Wed, 6 Sep 2023 12:49:56 -0700
Subject: [PATCH] fix(testing): remove font shorthand tokens

PiperOrigin-RevId: 563188450
---
 testing/table/internal/_test-table.scss | 10 ++++++++--
 tokens/_md-comp-test-table.scss         | 15 +++++++++++++--
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/testing/table/internal/_test-table.scss b/testing/table/internal/_test-table.scss
index 0c2b5e2e0..9ad860ca8 100644
--- a/testing/table/internal/_test-table.scss
+++ b/testing/table/internal/_test-table.scss
@@ -78,7 +78,10 @@ $dark-theme: tokens.md-comp-test-table-values(
     border-top: none;
     caption-side: bottom;
     color: var(--_header-cell-text-color);
-    font: var(--_header-cell-text-type);
+    font-family: var(--_header-cell-text-font);
+    font-size: var(--_header-cell-text-size);
+    line-height: var(--_header-cell-text-line-height);
+    font-weight: var(--_header-cell-text-weight);
     padding: 8px;
   }
 
@@ -86,7 +89,10 @@ $dark-theme: tokens.md-comp-test-table-values(
     align-items: center;
     color: var(--_cell-text-color);
     display: flex;
-    font: var(--_cell-text-type);
+    font-family: var(--_cell-text-font);
+    font-size: var(--_cell-text-size);
+    line-height: var(--_cell-text-line-height);
+    font-weight: var(--_cell-text-weight);
     justify-content: center;
   }
 
diff --git a/tokens/_md-comp-test-table.scss b/tokens/_md-comp-test-table.scss
index 76efa3f26..62d40b447 100644
--- a/tokens/_md-comp-test-table.scss
+++ b/tokens/_md-comp-test-table.scss
@@ -20,12 +20,23 @@ $_default: (
   @return (
     'cell-color': map.get($deps, 'md-sys-color', 'surface-container-lowest'),
     'cell-text-color': map.get($deps, 'md-sys-color', 'on-surface'),
-    'cell-text-type': map.get($deps, 'md-sys-typescale', 'body-medium'),
+    'cell-text-font': map.get($deps, 'md-sys-typescale', 'body-medium-font'),
+    'cell-text-size': map.get($deps, 'md-sys-typescale', 'body-medium-size'),
+    'cell-text-line-height':
+      map.get($deps, 'md-sys-typescale', 'body-medium-line-height'),
+    'cell-text-weight': map.get($deps, 'md-sys-typescale', 'body-medium-weight'),
     'cell-grid-color': map.get($deps, 'md-sys-color', 'surface-variant'),
     'header-cell-color': map.get($deps, 'md-sys-color', 'surface-variant'),
     'header-cell-text-color':
       map.get($deps, 'md-sys-color', 'on-surface-variant'),
-    'header-cell-text-type': map.get($deps, 'md-sys-typescale', 'title-medium'),
+    'header-cell-text-font':
+      map.get($deps, 'md-sys-typescale', 'title-medium-font'),
+    'header-cell-text-size':
+      map.get($deps, 'md-sys-typescale', 'title-medium-size'),
+    'header-cell-text-line-height':
+      map.get($deps, 'md-sys-typescale', 'title-medium-line-height'),
+    'header-cell-text-weight':
+      map.get($deps, 'md-sys-typescale', 'title-medium-weight'),
     'outline-color': map.get($deps, 'md-sys-color', 'outline')
   );
 }