From c95369ace8dab7bacf364462c84c61e9c78d5d9a Mon Sep 17 00:00:00 2001 From: Aakansha Doshi Date: Wed, 6 Sep 2023 11:23:07 +0530 Subject: [PATCH] upgrade mermaid-to-excalidraw --- package.json | 2 +- src/components/MermaidToExcalidraw.tsx | 30 +++++++++++--------------- yarn.lock | 8 +++---- 3 files changed, 18 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index 5d940cc62..d6369a292 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ }, "dependencies": { "@braintree/sanitize-url": "6.0.2", - "@excalidraw/mermaid-to-excalidraw": "0.1.0-fix-ff-safari", + "@excalidraw/mermaid-to-excalidraw": "0.1.0-api", "@excalidraw/random-username": "1.0.0", "@radix-ui/react-popover": "1.0.3", "@radix-ui/react-tabs": "1.0.2", diff --git a/src/components/MermaidToExcalidraw.tsx b/src/components/MermaidToExcalidraw.tsx index f0ae14888..7b6b2540e 100644 --- a/src/components/MermaidToExcalidraw.tsx +++ b/src/components/MermaidToExcalidraw.tsx @@ -116,29 +116,19 @@ const MermaidToExcalidraw = ({ useEffect(() => { const renderExcalidrawPreview = async () => { - let mermaidGraphData; const canvasNode = canvasRef.current; if (!canvasNode) { return; } try { - mermaidGraphData = await mermaidToExcalidrawLib.current.parseMermaid( - deferredText, - { - fontSize: DEFAULT_FONT_SIZE, - }, - ); - setError(null); - } catch (e: any) { - console.error(e.message); - resetPreview(); - if (deferredText) { - setError(e.message); - } - } - if (mermaidGraphData) { const { elements, files } = - mermaidToExcalidrawLib.current.graphToExcalidraw(mermaidGraphData); + await mermaidToExcalidrawLib.current.parseMermaidToExcalidraw( + deferredText, + { + fontSize: DEFAULT_FONT_SIZE, + }, + ); + setError(null); data.current = { elements: convertToExcalidrawElements(elements, { @@ -164,6 +154,12 @@ const MermaidToExcalidraw = ({ await canvasToBlob(canvas); parent.style.background = "#fff"; canvasNode.replaceChildren(canvas); + } catch (e: any) { + console.error(e.message); + resetPreview(); + if (deferredText) { + setError(e.message); + } } }; renderExcalidrawPreview(); diff --git a/yarn.lock b/yarn.lock index 9487c7169..eae987d66 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1532,10 +1532,10 @@ resolved "https://registry.yarnpkg.com/@excalidraw/markdown-to-text/-/markdown-to-text-0.1.2.tgz#1703705e7da608cf478f17bfe96fb295f55a23eb" integrity sha512-1nDXBNAojfi3oSFwJswKREkFm5wrSjqay81QlyRv2pkITG/XYB5v+oChENVBQLcxQwX4IUATWvXM5BcaNhPiIg== -"@excalidraw/mermaid-to-excalidraw@0.1.0-fix-ff-safari": - version "0.1.0-fix-ff-safari" - resolved "https://registry.yarnpkg.com/@excalidraw/mermaid-to-excalidraw/-/mermaid-to-excalidraw-0.1.0-fix-ff-safari.tgz#523551e57a6837c8737f5079871c1d45ac623c98" - integrity sha512-6nvEMCyAm0J8q/9j7nKwozAYuI5LmSNZN7W0hWTnZU2kkGW94WjHgJlby6xMgswHRw+XASyy69SAv0QMOFMdCQ== +"@excalidraw/mermaid-to-excalidraw@0.1.0-api": + version "0.1.0-api" + resolved "https://registry.yarnpkg.com/@excalidraw/mermaid-to-excalidraw/-/mermaid-to-excalidraw-0.1.0-api.tgz#456b03587bdb071f517cc80685470a744475fb46" + integrity sha512-taCgev1frQ/eR4Eenq2HboFCncGbhPgyReV9+JTzazDkzNg4P6YOoFCcQHEHw+nee9NsK1TrKYGorRbEEJOROA== dependencies: "@excalidraw/markdown-to-text" "0.1.2" mermaid "10.2.3"