Merge remote-tracking branch 'grahamkane/master' into issue-1948-test-coverage

This commit is contained in:
James Addison 2020-04-13 22:06:50 +01:00
commit 5211ab4065

View File

@ -157,7 +157,9 @@ export class CanvasRenderer {
const fontVariant = styles.fontVariant
.filter(variant => variant === 'normal' || variant === 'small-caps')
.join('');
const fontFamily = styles.fontFamily.join(', ');
const fontFamily = styles.fontFamily.map(fontName => {
return fontName.indexOf(' ') === -1 ? fontName : `"${fontName}"`;
}).join(', ');
const fontSize = isDimensionToken(styles.fontSize)
? `${styles.fontSize.number}${styles.fontSize.unit}`
: `${styles.fontSize.number}px`;