From 5b5fde33794dfee76c72b5384edac1825dbfc63a Mon Sep 17 00:00:00 2001 From: Andre Wanlin <67169551+awanlin@users.noreply.github.com> Date: Tue, 11 Jul 2023 06:06:15 -0500 Subject: [PATCH] Changes based on latest feedback Signed-off-by: Andre Wanlin <67169551+awanlin@users.noreply.github.com> --- .changeset/nervous-llamas-tan.md | 5 -- packages/theme/api-report.md | 80 +++++++++---------- .../theme/src/base/createBaseThemeOptions.ts | 4 +- packages/theme/src/base/index.ts | 2 +- packages/theme/src/base/types.ts | 2 +- packages/theme/src/unified/UnifiedTheme.tsx | 4 +- packages/theme/src/v4/types.ts | 4 +- 7 files changed, 48 insertions(+), 53 deletions(-) delete mode 100644 .changeset/nervous-llamas-tan.md diff --git a/.changeset/nervous-llamas-tan.md b/.changeset/nervous-llamas-tan.md deleted file mode 100644 index 90b6f5d0ce..0000000000 --- a/.changeset/nervous-llamas-tan.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/plugin-org': patch ---- - -Removed themed example from `OwnershipCard` Storybook entry diff --git a/packages/theme/api-report.md b/packages/theme/api-report.md index 4b2aad6923..d6380ee6e8 100644 --- a/packages/theme/api-report.md +++ b/packages/theme/api-report.md @@ -112,6 +112,42 @@ export interface BackstageThemeOptions extends ThemeOptions_3 { palette: BackstagePaletteOptions; } +// @public +export type 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: { + fontSize: number; + fontWeight: number; + marginBottom: number; + }; + h5: { + fontSize: number; + fontWeight: number; + marginBottom: number; + }; + h6: { + fontSize: number; + fontWeight: number; + marginBottom: number; + }; +}; + // @public export interface BaseThemeOptionsInput { // (undocumented) @@ -125,7 +161,7 @@ export interface BaseThemeOptionsInput { // (undocumented) palette: PaletteOptions; // (undocumented) - typography?: Typography; + typography?: BackstageTypography; } // @public @@ -136,7 +172,7 @@ export function createBaseThemeOptions( options: BaseThemeOptionsInput, ): { palette: PaletteOptions; - typography: Typography; + typography: BackstageTypography; page: PageTheme; getPageTheme: ({ themeId }: PageThemeSelector) => PageTheme; }; @@ -348,7 +384,7 @@ export type SimpleThemeOptions = { pageTheme?: Record; fontFamily?: string; htmlFontSize?: number; - typography?: Typography; + typography?: BackstageTypography; }; // @public @@ -372,42 +408,6 @@ export function transformV5ComponentThemesToV4( props: ComponentsProps; }; -// @public -export type Typography = { - 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: { - fontSize: number; - fontWeight: number; - marginBottom: number; - }; - h5: { - fontSize: number; - fontWeight: number; - marginBottom: number; - }; - h6: { - fontSize: number; - fontWeight: number; - marginBottom: number; - }; -}; - // @public export interface UnifiedTheme { // (undocumented) @@ -429,7 +429,7 @@ export interface UnifiedThemeOptions { // (undocumented) palette: PaletteOptions & PaletteOptions_2; // (undocumented) - typography?: Typography; + typography?: BackstageTypography; } // @public diff --git a/packages/theme/src/base/createBaseThemeOptions.ts b/packages/theme/src/base/createBaseThemeOptions.ts index b220d6afe7..bca56114d7 100644 --- a/packages/theme/src/base/createBaseThemeOptions.ts +++ b/packages/theme/src/base/createBaseThemeOptions.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { Typography, PageTheme, PageThemeSelector } from './types'; +import { BackstageTypography, PageTheme, PageThemeSelector } from './types'; import { pageTheme as defaultPageThemes } from './pageTheme'; const DEFAULT_HTML_FONT_SIZE = 16; @@ -33,7 +33,7 @@ export interface BaseThemeOptionsInput { pageTheme?: Record; fontFamily?: string; htmlFontSize?: number; - typography?: Typography; + typography?: BackstageTypography; } /** diff --git a/packages/theme/src/base/index.ts b/packages/theme/src/base/index.ts index 1b1ae097b3..2da9fb0fac 100644 --- a/packages/theme/src/base/index.ts +++ b/packages/theme/src/base/index.ts @@ -23,5 +23,5 @@ export type { BackstagePaletteAdditions, PageTheme, PageThemeSelector, - Typography, + BackstageTypography, } from './types'; diff --git a/packages/theme/src/base/types.ts b/packages/theme/src/base/types.ts index 6905f2928c..3e34a0abb7 100644 --- a/packages/theme/src/base/types.ts +++ b/packages/theme/src/base/types.ts @@ -120,7 +120,7 @@ export type BackstageThemeAdditions = { * * @public */ -export type Typography = { +export type BackstageTypography = { htmlFontSize: number; fontFamily: string; h1: { diff --git a/packages/theme/src/unified/UnifiedTheme.tsx b/packages/theme/src/unified/UnifiedTheme.tsx index fedecc982d..aeae9694ee 100644 --- a/packages/theme/src/unified/UnifiedTheme.tsx +++ b/packages/theme/src/unified/UnifiedTheme.tsx @@ -29,7 +29,7 @@ import { createTheme as createV5Theme, } from '@mui/material/styles'; import { createBaseThemeOptions } from '../base/createBaseThemeOptions'; -import { Typography, PageTheme } from '../base/types'; +import { BackstageTypography, PageTheme } from '../base/types'; import { defaultComponentThemes } from '../v5'; import { transformV5ComponentThemesToV4 } from './overrides'; import { SupportedThemes, SupportedVersions, UnifiedTheme } from './types'; @@ -64,7 +64,7 @@ export interface UnifiedThemeOptions { fontFamily?: string; htmlFontSize?: number; components?: ThemeOptionsV5['components']; - typography?: Typography; + typography?: BackstageTypography; } /** diff --git a/packages/theme/src/v4/types.ts b/packages/theme/src/v4/types.ts index 4a5c8efe2f..c5100dab8f 100644 --- a/packages/theme/src/v4/types.ts +++ b/packages/theme/src/v4/types.ts @@ -25,7 +25,7 @@ import type { import { BackstagePaletteAdditions, BackstageThemeAdditions, - Typography, + BackstageTypography, PageTheme, PageThemeSelector, } from '../base/types'; @@ -90,7 +90,7 @@ export type SimpleThemeOptions = { pageTheme?: Record; fontFamily?: string; htmlFontSize?: number; - typography?: Typography; + typography?: BackstageTypography; }; declare module '@material-ui/core/styles/createPalette' {