From 29f803e25d84589ec9e0dd654cf0ea03227d4bdb Mon Sep 17 00:00:00 2001 From: Herb Caudill Date: Sun, 19 Jul 2020 21:14:45 +0200 Subject: [PATCH] Fix display of some emoji on Windows (#1933) --- src/constants.ts | 2 ++ src/utils.ts | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/constants.ts b/src/constants.ts index 8b045dd15..90dd8c1cc 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -70,6 +70,8 @@ export const FONT_FAMILY = { 3: "Cascadia", } as const; +export const WINDOWS_EMOJI_FALLBACK_FONT = "Segoe UI Emoji"; + export const DEFAULT_FONT_SIZE = 20; export const DEFAULT_FONT_FAMILY: FontFamily = 1; export const DEFAULT_TEXT_ALIGN = "left"; diff --git a/src/utils.ts b/src/utils.ts index 6120bf6b7..1fc571110 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -1,6 +1,10 @@ import { FlooredNumber } from "./types"; import { getZoomOrigin } from "./scene"; -import { CURSOR_TYPE, FONT_FAMILY } from "./constants"; +import { + CURSOR_TYPE, + FONT_FAMILY, + WINDOWS_EMOJI_FALLBACK_FONT, +} from "./constants"; import { FontFamily, FontString } from "./element/types"; export const SVG_NS = "http://www.w3.org/2000/svg"; @@ -66,7 +70,7 @@ export const getFontFamilyString = ({ }: { fontFamily: FontFamily; }) => { - return FONT_FAMILY[fontFamily]; + return `${FONT_FAMILY[fontFamily]}, ${WINDOWS_EMOJI_FALLBACK_FONT}`; }; /** returns fontSize+fontFamily string for assignment to DOM elements */