Create a FontOptions interface and extend other interfaces appropriately

gitbrent · Jan 22, 2020 · ec2fcb5 · ec2fcb5
1 parent 1c5634f
commit ec2fcb5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 28 deletions.
diff --git a/src/core-interfaces.ts b/src/core-interfaces.ts
@@ -23,6 +23,10 @@ export type ShapeFill = Color | { type: string; color: Color; alpha?: number }
 export type BkgdOpts = { src?: string; path?: string; data?: string }
 type MediaType = 'audio' | 'online' | 'video'
 
+export interface FontOptions {
+	fontFace?: string
+	fontSize?: number
+}
 export interface PositionOptions {
 	x?: Coord
 	y?: Coord
@@ -253,11 +257,9 @@ export interface IShapeOptions extends PositionOptions {
 	shadow?: IShadowOptions
 }
 
-export interface IChartTitleOpts {
+export interface IChartTitleOpts extends FontOptions {
 	title: string
 	color?: String
-	fontSize?: number
-	fontFace?: string
 	rotate?: number
 	titleAlign?: string
 	titlePos?: { x: number; y: number }
@@ -286,7 +288,7 @@ export interface ITableToSlidesOpts extends ITableOptions {
 	slideMargin?: Margin
 	verbose?: boolean // Undocumented; shows verbose output
 }
-export interface ITableCellOpts {
+export interface ITableCellOpts extends FontOptions {
 	autoPageCharWeight?: number
 	autoPageLineWeight?: number
 	align?: HAlign
@@ -295,13 +297,11 @@ export interface ITableCellOpts {
 	color?: Color
 	colspan?: number
 	fill?: ShapeFill
-	fontFace?: string
-	fontSize?: number
 	margin?: Margin
 	rowspan?: number
 	valign?: VAlign
 }
-export interface ITableOptions extends PositionOptions {
+export interface ITableOptions extends PositionOptions, FontOptions {
 	align?: HAlign
 	autoPage?: boolean
 	autoPageCharWeight?: number
@@ -311,7 +311,6 @@ export interface ITableOptions extends PositionOptions {
 	colspan?: number
 	colW?: number | number[]
 	fill?: Color
-	fontSize?: number
 	margin?: Margin
 	newSlideStartY?: number
 	rowW?: number | number[]
@@ -341,7 +340,7 @@ export interface TableRowSlide {
 	rows: ITableRow[]
 }
 
-export interface ITextOpts extends PositionOptions, OptsDataOrPath {
+export interface ITextOpts extends PositionOptions, OptsDataOrPath, FontOptions {
 	align?: HAlign
 	autoFit?: boolean
 	bodyProp?: {
@@ -362,8 +361,6 @@ export interface ITextOpts extends PositionOptions, OptsDataOrPath {
 	charSpacing?: number
 	color?: string
 	fill?: ShapeFill
-	fontFace?: string
-	fontSize?: number
 	glow?: IGlowOptions
 	hyperlink?: HyperLink
 	indentLevel?: number
@@ -413,9 +410,7 @@ export interface IUserLayout {
 	width: number
 	height: number
 }
-export interface ISlideNumber extends PositionOptions {
-	fontFace?: string
-	fontSize?: number
+export interface ISlideNumber extends PositionOptions, FontOptions {
 	color?: string
 }
 export interface ISlideMasterOptions {

diff --git a/types/index.d.ts b/types/index.d.ts
@@ -156,6 +156,10 @@ declare namespace PptxGenJS {
 	export type BkgdOpts = { src?: string; path?: string; data?: string }
 	type MediaType = 'audio' | 'online' | 'video'
 
+	export interface FontOptions {
+		fontFace?: string
+		fontSize?: number
+	}
 	export interface PositionOptions {
 		x?: Coord
 		y?: Coord
@@ -377,11 +381,9 @@ declare namespace PptxGenJS {
 		shadow?: IShadowOptions
 	}
 
-	export interface IChartTitleOpts {
+	export interface IChartTitleOpts extends FontOptions {
 		title: string
 		color?: String
-		fontSize?: number
-		fontFace?: string
 		rotate?: number
 		titleAlign?: string
 		titlePos?: { x: number; y: number }
@@ -410,7 +412,7 @@ declare namespace PptxGenJS {
 		slideMargin?: Margin
 		verbose?: boolean // Undocumented; shows verbose output
 	}
-	export interface ITableCellOpts {
+	export interface ITableCellOpts extends FontOptions {
 		autoPageCharWeight?: number
 		autoPageLineWeight?: number
 		align?: HAlign
@@ -419,13 +421,11 @@ declare namespace PptxGenJS {
 		color?: Color
 		colspan?: number
 		fill?: ShapeFill
-		fontFace?: string
-		fontSize?: number
 		margin?: Margin
 		rowspan?: number
 		valign?: VAlign
 	}
-	export interface ITableOptions extends PositionOptions {
+	export interface ITableOptions extends PositionOptions, FontOptions {
 		align?: HAlign
 		autoPage?: boolean
 		autoPageCharWeight?: number
@@ -435,7 +435,6 @@ declare namespace PptxGenJS {
 		colspan?: number
 		colW?: number | number[]
 		fill?: Color
-		fontSize?: number
 		margin?: Margin
 		newSlideStartY?: number
 		rowW?: number | number[]
@@ -465,7 +464,7 @@ declare namespace PptxGenJS {
 		rows: ITableRow[]
 	}
 
-	export interface ITextOpts extends PositionOptions, OptsDataOrPath {
+	export interface ITextOpts extends PositionOptions, OptsDataOrPath, FontOptions {
 		align?: HAlign
 		autoFit?: boolean
 		bodyProp?: {
@@ -486,8 +485,6 @@ declare namespace PptxGenJS {
 		charSpacing?: number
 		color?: string
 		fill?: ShapeFill
-		fontFace?: string
-		fontSize?: number
 		glow?: IGlowOptions
 		hyperlink?: HyperLink
 		indentLevel?: number
@@ -537,9 +534,7 @@ declare namespace PptxGenJS {
 		width: number
 		height: number
 	}
-	export interface ISlideNumber extends PositionOptions {
-		fontFace?: string
-		fontSize?: number
+	export interface ISlideNumber extends PositionOptions, FontOptions {
 		color?: string
 	}
 	export interface ISlideMasterOptions {