From 239ab25ebcf84eb4bdc1a5451369f4e3c5bc40e7 Mon Sep 17 00:00:00 2001
From: Thomas Cooper <57812123+coopernetes@users.noreply.github.com>
Date: Tue, 3 Oct 2023 19:33:28 -0400
Subject: [PATCH] address review comments

Signed-off-by: Thomas Cooper <57812123+coopernetes@users.noreply.github.com>
---
 .changeset/smooth-rings-mate.md               |  2 +-
 packages/theme/api-report.md                  | 37 +------------------
 .../theme/src/base/createBaseThemeOptions.ts  |  2 +-
 3 files changed, 3 insertions(+), 38 deletions(-)

diff --git a/.changeset/smooth-rings-mate.md b/.changeset/smooth-rings-mate.md
index 4b9a53f71b..f46ef2cb5c 100644
--- a/.changeset/smooth-rings-mate.md
+++ b/.changeset/smooth-rings-mate.md
@@ -2,4 +2,4 @@
 '@backstage/theme': patch
 ---
 
-Fixed a bug to support string fontSize values (`"2.5rem"`) instead of forcing numeric-only values & requiring casts. In addition, added an optional fontFamily prop for h1-h6 BackstageTypography variants to allow further customization.
+Added support for string `fontSize` values (e.g. `"2.5rem"`) in themes in addition to numbers. Also added an optional `fontFamily` prop for header typography variants to allow further customization.
diff --git a/packages/theme/api-report.md b/packages/theme/api-report.md
index bf226d4d9e..4ab05e8770 100644
--- a/packages/theme/api-report.md
+++ b/packages/theme/api-report.md
@@ -178,42 +178,7 @@ export function createBaseThemeOptions<PaletteOptions>(
   options: BaseThemeOptionsInput<PaletteOptions>,
 ): {
   palette: PaletteOptions;
-  typography:
-    | BackstageTypography
-    | {
-        htmlFontSize: number;
-        fontFamily: string;
-        h1: {
-          fontSize: number;
-          fontWeight: number;
-          marginBottom: number;
-        };
-        h2: {
-          fontSize: number;
-          fontWeight: number;
-          marginBottom: number;
-        };
-        h3: {
-          fontSize: number;
-          fontWeight: number;
-          marginBottom: number;
-        };
-        h4: {
-          fontWeight: number;
-          fontSize: number;
-          marginBottom: number;
-        };
-        h5: {
-          fontWeight: number;
-          fontSize: number;
-          marginBottom: number;
-        };
-        h6: {
-          fontWeight: number;
-          fontSize: number;
-          marginBottom: number;
-        };
-      };
+  typography: BackstageTypography;
   page: PageTheme;
   getPageTheme: ({ themeId }: PageThemeSelector) => PageTheme;
 };
diff --git a/packages/theme/src/base/createBaseThemeOptions.ts b/packages/theme/src/base/createBaseThemeOptions.ts
index bca56114d7..f0c8ab5fe9 100644
--- a/packages/theme/src/base/createBaseThemeOptions.ts
+++ b/packages/theme/src/base/createBaseThemeOptions.ts
@@ -57,7 +57,7 @@ export function createBaseThemeOptions<PaletteOptions>(
     throw new Error(`${defaultPageTheme} is not defined in pageTheme.`);
   }
 
-  const defaultTypography = {
+  const defaultTypography: BackstageTypography = {
     htmlFontSize,
     fontFamily,
     h1: {