foss/excalidraw
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for math element dimensions before/upon loading MathJax.

Browse Source
This commit is contained in:
Daniel J. Geiger 2023-02-27 15:32:36 -06:00
parent 38b3d90fa6
commit 3fbed86d3e
1 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/packages/extensions/ts/mathjax/implementation.tsx
View File

@ -250,6 +250,10 @@ const loadMathJax = async () => {
// Finalize loading MathJax
mathJaxLoaded = true;
// Clear any caches from before loading MathJax
clearCaches();
if (mathJaxLoadedCallback !== undefined) {
mathJaxLoadedCallback(isMathElement);
}
@ -394,6 +398,29 @@ const metricsCache = {} as {
const svgCache = {} as { [key: string]: string };
// Cache the rendered MathJax images for renderMathElement()
const imageCache = {} as { [key: string]: HTMLImageElement };
// Cache the MathJax-wrapped text strings for wrapMathElement()
const wrappedMathCache: { [key: string]: string } = {};
const clearCaches = () => {
for (const key in mathJaxSvgCacheAM) {
delete mathJaxSvgCacheAM[key];
}
for (const key in mathJaxSvgCacheTex) {
delete mathJaxSvgCacheTex[key];
}
for (const key in metricsCache) {
delete metricsCache[key];
}
for (const key in svgCache) {
delete svgCache[key];
}
for (const key in imageCache) {
delete imageCache[key];
}
for (const key in wrappedMathCache) {
delete wrappedMathCache[key];
}
};
const textAsMjxContainer = (
text: string,
@ -852,6 +879,10 @@ const cleanMathElementUpdate = function (updates) {
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 fontSize = next?.fontSize ?? element.fontSize;
const text = next?.text ?? element.text;
const customData = next?.customData ?? element.customData;
@ -1135,8 +1166,6 @@ const renderSvgMathElement = function (svgRoot, root, element, opt) {
root.appendChild(node);
} as SubtypeMethods["renderSvg"];
const wrappedMathCache: { [key: string]: string } = {};
const wrapMathElement = function (element, containerWidth, next) {
ensureMathElement(element);
const isMathJaxLoaded = mathJaxLoaded;