mirror/html2canvas
1
0
Fork 0
mirror of https://github.com/niklasvh/html2canvas.git synced 2023-08-10 21:13:10 +03:00
Code Issues Projects Releases Wiki Activity

Correct dereferencing of createFontStyle return value

Browse Source
This commit is contained in:
Dan Hansen 2022-02-17 16:14:01 -08:00
parent 6020386bbe
commit 3245da2f15
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/render/canvas/canvas-renderer.ts
View File

@ -388,10 +388,10 @@ export class CanvasRenderer extends Renderer {
} }
if (isTextInputElement(container) && container.value.length) { if (isTextInputElement(container) && container.value.length) {
const [fontFamily, fontSize] = this.createFontStyle(styles); const [font, fontFamily, fontSize] = this.createFontStyle(styles);
const {baseline} = this.fontMetrics.getMetrics(fontFamily, fontSize); const {baseline} = this.fontMetrics.getMetrics(fontFamily, fontSize);
this.ctx.font = fontFamily; this.ctx.font = font;
this.ctx.fillStyle = asString(styles.color); this.ctx.fillStyle = asString(styles.color);
this.ctx.textBaseline = 'alphabetic'; this.ctx.textBaseline = 'alphabetic';
@ -445,9 +445,9 @@ export class CanvasRenderer extends Renderer {
} }
} }
} else if (paint.listValue && container.styles.listStyleType !== LIST_STYLE_TYPE.NONE) { } else if (paint.listValue && container.styles.listStyleType !== LIST_STYLE_TYPE.NONE) {
const [fontFamily] = this.createFontStyle(styles); const [font] = this.createFontStyle(styles);
this.ctx.font = fontFamily; this.ctx.font = font;
this.ctx.fillStyle = asString(styles.color); this.ctx.fillStyle = asString(styles.color);
this.ctx.textBaseline = 'middle'; this.ctx.textBaseline = 'middle';