Merge remote-tracking branch 'origin/master' into aakansha-baseline

This commit is contained in:
Aakansha Doshi
2023-03-31 16:01:52 +05:30
8 changed files with 83 additions and 30 deletions

View File

@@ -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);
});

View File

@@ -929,7 +929,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];