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-04-10 20:24:03 -05:00
commit fb24221587
15 changed files with 287 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/packages/extensions/ts/mathjax/implementation.tsx
View file

@ -5,6 +5,7 @@ import { getFontString, getFontFamilyString, isRTL } from "../../../../utils";
import {
getBoundTextElement,
getContainerElement,
getDefaultLineHeight,
getMaxContainerWidth,
getTextWidth,
measureText,
@ -859,7 +860,7 @@ const ensureMathElement = (element: Partial<ExcalidrawElement>) => {
const cleanMathElementUpdate = function (updates) {
const oldUpdates = {};
for (const key in updates) {
if (key !== "fontFamily") {
if (key !== "fontFamily" && key !== "lineHeight") {
(oldUpdates as any)[key] = (updates as any)[key];
}
if (key === "customData") {
@ -874,6 +875,7 @@ const cleanMathElementUpdate = function (updates) {
}
}
(updates as any).fontFamily = FONT_FAMILY_MATH;
(updates as any).lineHeight = getDefaultLineHeight(FONT_FAMILY_MATH);
return oldUpdates;
} as SubtypeMethods["clean"];
@ -888,8 +890,8 @@ const measureMathElement = function (element, next) {
ensureMathElement(element);
const isMathJaxLoaded = mathJaxLoaded;
if (!isMathJaxLoaded && isMathElement(element as ExcalidrawElement)) {
const { width, height } = element as ExcalidrawMathElement;
return { width, height };
const { width, height, baseline } = element as ExcalidrawMathElement;
return { width, height, baseline };
}
const fontSize = next?.fontSize ?? element.fontSize;
const lineHeight = element.lineHeight;
@ -903,8 +905,7 @@ const measureMathElement = function (element, next) {
mathProps,
isMathJaxLoaded,
);
const { width, height } = metrics;
return { width, height };
return metrics;
} as SubtypeMethods["measureText"];
const renderMathElement = function (element, context, renderCb) {