From d2b8f4d2f8e79fbe2cddfb06afee82c1f95c0118 Mon Sep 17 00:00:00 2001 From: Coyote <46889283+CoyoteWaltz@users.noreply.github.com> Date: Thu, 30 Mar 2023 03:16:23 +0800 Subject: [PATCH] fix: getDefaultLineHeight should return default font family line height for unknown font (#6399) * fix(getDefaultLineHeight): make getDefaultLineHeight always has a default value * test: add getDefaultLineHeight test case when using unknown font * test: add getDefaultLineHeight test case when using unknown font * Revert "test: add getDefaultLineHeight test case when using unknown font" This reverts commit d41da5493b6edab9e599a13a23c387d38345bf03. * test: add getDefaultLineHeight test case when using unknown font * newline * newline * tweaks * trigger action * trigger action * fix --------- Co-authored-by: Aakansha Doshi --- src/element/textElement.test.ts | 6 ++++++ src/element/textElement.ts | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/element/textElement.test.ts b/src/element/textElement.test.ts index aa7df8ee6a..106ed7beab 100644 --- a/src/element/textElement.test.ts +++ b/src/element/textElement.test.ts @@ -332,6 +332,12 @@ describe("Test getDefaultLineHeight", () => { //@ts-ignore expect(getDefaultLineHeight()).toBe(1.25); }); + + it("should return line height using default font family for unknown font", () => { + const UNKNOWN_FONT = 5; + expect(getDefaultLineHeight(UNKNOWN_FONT)).toBe(1.25); + }); + it("should return correct line height", () => { expect(getDefaultLineHeight(FONT_FAMILY.Cascadia)).toBe(1.2); }); diff --git a/src/element/textElement.ts b/src/element/textElement.ts index fd501c1414..8b3979133e 100644 --- a/src/element/textElement.ts +++ b/src/element/textElement.ts @@ -887,7 +887,7 @@ const DEFAULT_LINE_HEIGHT = { }; export const getDefaultLineHeight = (fontFamily: FontFamilyValues) => { - if (fontFamily) { + if (fontFamily in DEFAULT_LINE_HEIGHT) { return DEFAULT_LINE_HEIGHT[fontFamily]; } return DEFAULT_LINE_HEIGHT[DEFAULT_FONT_FAMILY];