smig/excalidraw
1
0
Fork 0
mirror of https://github.com/excalidraw/excalidraw.git synced 2025-05-03 10:00:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/release' into danieljgeiger-mathjax

Browse source
This commit is contained in:
Daniel J. Geiger 2023-02-27 14:18:41 -06:00
commit 4c939cefad
85 changed files with 902 additions and 820 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/tests/subtypes.test.tsx
View file

@ -33,7 +33,7 @@ import { actionChangeRoundness } from "../actions/actionProperties";
const MW = 200;
const TWIDTH = 200;
const THEIGHT = 20;
const TBASELINE = 15;
const TBASELINE = 0;
const FONTSIZE = 20;
const DBFONTSIZE = 40;
const TRFONTSIZE = 60;
@ -155,11 +155,7 @@ const prepareTest1Subtype = function (
return { actions, methods };
} as SubtypePrepFn;
const measureTest2: SubtypeMethods["measureText"] = function (
element,
next,
maxWidth,
) {
const measureTest2: SubtypeMethods["measureText"] = function (element, next) {
const text = next?.text ?? element.text;
const customData = next?.customData ?? {};
const fontSize = customData.triple
@ -167,10 +163,10 @@ const measureTest2: SubtypeMethods["measureText"] = function (
: next?.fontSize ?? element.fontSize;
const fontFamily = element.fontFamily;
const fontString = getFontString({ fontSize, fontFamily });
const metrics = textElementUtils.measureText(text, fontString, maxWidth);
const metrics = textElementUtils.measureText(text, fontString);
const width = Math.max(metrics.width - 10, 0);
const height = Math.max(metrics.height - 5, 0);
return { width, height, baseline: metrics.baseline + 1 };
return { width, height, baseline: 1 };
};
const wrapTest2: SubtypeMethods["wrapText"] = function (
@ -450,12 +446,6 @@ describe("subtypes", () => {
height: THEIGHT - 5,
baseline: TBASELINE + 1,
});
const mMetrics = textElementUtils.measureTextElement(el, {}, MW);
expect(mMetrics).toStrictEqual({
width: Math.min(TWIDTH, MW) - 10,
height: THEIGHT - 5,
baseline: TBASELINE + 1,
});
const wrappedText = textElementUtils.wrapTextElement(el, MW);
expect(wrappedText).toEqual(
`${testString.split(" ").join("\n")}\nHello world.`,
@ -482,12 +472,6 @@ describe("subtypes", () => {
height: 2 * THEIGHT - 5,
baseline: 2 * TBASELINE + 1,
});
const nextFMW = textElementUtils.measureTextElement(el, next, MW);
expect(nextFMW).toStrictEqual({
width: Math.min(2 * TWIDTH, MW) - 10,
height: 2 * THEIGHT - 5,
baseline: 2 * TBASELINE + 1,
});
const nextFWrText = textElementUtils.wrapTextElement(el, MW, next);
expect(nextFWrText).toEqual(
`${testString.split(" ").join("\n")}\nHELLO World.`,
@ -501,12 +485,6 @@ describe("subtypes", () => {
height: 3 * THEIGHT - 5,
baseline: 3 * TBASELINE + 1,
});
const nextCDMW = textElementUtils.measureTextElement(el, next, MW);
expect(nextCDMW).toStrictEqual({
width: Math.min(3 * TWIDTH, MW) - 10,
height: 3 * THEIGHT - 5,
baseline: 3 * TBASELINE + 1,
});
const nextCDWrText = textElementUtils.wrapTextElement(el, MW, next);
expect(nextCDWrText).toEqual(
`${testString.split(" ").join("\n")}\nHELLO WORLD.`,