fix: Case chang

* master:

.eslintrc.cjs

@@ -25,7 +25,7 @@ module.exports = {
   },
   parserOptions: {
     sourceType: 'module',
-		ecmaVersion: 2019,
+    ecmaVersion: 2020,
     tsconfigRootDir: __dirname,
     project: ['./tsconfig.json'],
     extraFileExtensions: ['.svelte'],
@@ -33,8 +33,7 @@ module.exports = {
   },
   env: {
     browser: true,
-		es2017: true,
-		node: true
+    es2020: true
   },
   rules: {
     '@typescript-eslint/ban-ts-comment': [
@@ -45,6 +44,7 @@ module.exports = {
     ],
     '@typescript-eslint/no-unsafe-member-access': 'off',
     '@typescript-eslint/no-unsafe-assignment': 'off',
-		'es/no-regexp-lookbehind-assertions': 'error'
+    'es/no-regexp-lookbehind-assertions': 'error',
+    curly: ['error', 'all']
   }
 };

.git-blame-ignore-revs

@@ -0,0 +1,5 @@
+# .git-blame-ignore-revs
+# Prettier Pass
+6fde9e22a3ba0b80879a1909fb233367ef20b738
+# Tabs -> Spaces
+0ac606b8fbf6f94215cbda1d4511e2dcd30e4655

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: [sidharthv96, knsv]

.github/workflows/stale.yml

@@ -8,13 +8,13 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v5
+      - uses: actions/stale@v6
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           exempt-issue-labels: 'retained'
           exempt-pr-labels: 'retained'
-          stale-issue-message: 'This issue is stale because it has been open 90 days with no activity. Remove stale label or comment or this will be closed in 14 days'
-          stale-pr-message: 'This pr is stale because it has been open 90 days with no activity. Remove stale label or comment or this will be closed in 14 days'
+          stale-issue-message: 'This issue is stale because it has been open 90 days with no activity. Remove stale label or comment or this will be closed in 30 days'
+          stale-pr-message: 'This pr is stale because it has been open 90 days with no activity. Remove stale label or comment or this will be closed in 30 days'
           days-before-stale: 90
-          days-before-close: 14
+          days-before-close: 30
           days-before-pr-close: -1

.github/workflows/tests.yml

@@ -48,3 +48,4 @@ jobs:
           parallel: true
         env:
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
+          CYPRESS_CI: true

.github/workflows/update-browserlist.yml

@@ -1,10 +1,9 @@
 name: Update Browserslist
 on:
-  workflow_dispatch:
   push:
-    branches:
-      - develop
-
+    branches-ignore:
+      - 'develop'
+      - 'master'
 jobs:
   build:
     runs-on: ubuntu-latest

.github/workflows/update-monaco-editor.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: 18
       - name: Update monaco version

.prettierrc

@@ -2,7 +2,6 @@
   "singleQuote": true,
   "svelteSortOrder": "options-scripts-markup-styles",
   "bracketSameLine": true,
-	"useTabs": true,
   "trailingComma": "none",
   "printWidth": 100
 }

.vscode/settings.json

@@ -1,4 +1,9 @@
 {
   "editor.formatOnSave": true,
-	"cSpell.words": ["pako", "Serde", "serdes"]
+  "cSpell.words": ["asyncable", "mindmap", "pako", "Serde", "serdes"],
+  "vitest.commandLine": "yarn test:unit",
+  "vitest.enable": true,
+  "testing.autoRun.mode": "rerun",
+  "svelte.enable-ts-plugin": true,
+  "githubPullRequests.ignoredPullRequestBranches": ["develop"]
 }

Dockerfile

@@ -6,7 +6,7 @@
 # Stop               : press ctrl + c 
 #                                     or 
 #                                        docker stop mermaid-live-editor
-FROM node:18.7.0 as mermaid-live-editor-builder 
+FROM node:18.12.0 as mermaid-live-editor-builder 
 COPY --chown=node:node . /home
 WORKDIR /home
 RUN yarn install

cypress.config.js

@@ -9,7 +9,7 @@ export default defineConfig({
   defaultCommandTimeout: 16000,
   requestTimeout: 16000,
   retries: {
-		runMode: 2,
+    runMode: 4,
     openMode: 0
   },
   e2e: {

cypress/e2e/actions.spec.ts

@@ -1,9 +1,8 @@
-import { disableDebounce } from './util';
+import { verifyFileSize } from './util';
 describe('Check actions', () => {
   beforeEach(() => {
     cy.clearLocalStorage();
     cy.visit('/edit');
-		disableDebounce();
   });
 
   it('should update markdown code', () => {
@@ -27,28 +26,22 @@ describe('Check actions', () => {
 
   it('should download png and svg', () => {
     cy.clock(new Date(2022, 0, 1).getTime());
-		const downloadsFolder = Cypress.config('downloadsFolder');
 
-		const verifyFileSize = (fileType: string, size: number) => {
-			cy.get(`#download${fileType.toUpperCase()}`).click();
-			const fileName = `mermaid-diagram-2022-01-01-000000.${fileType}`;
-			const filePath = `${downloadsFolder}/${fileName}`;
-			cy.verifyDownload(fileName);
-			cy.readFile(filePath, null, {
-				log: false
-			}).then((buffer) => expect((buffer as ArrayBuffer).byteLength).to.be.gt(size));
-			cy.task('deleteFile', filePath);
-		};
+    cy.get(`#downloadPNG`).click();
+    verifyFileSize('diagram', 'png', 21_000);
 
-		verifyFileSize('png', 21_000);
-		verifyFileSize('svg', 11_000);
+    cy.get(`#downloadSVG`).click();
+    verifyFileSize('diagram', 'svg', 10_000);
 
     // Verify downloaded file is different for different diagrams
     cy.contains('Sample Diagrams').click();
-		cy.contains('ER Diagram').click();
+    cy.contains('ER').click();
 
-		verifyFileSize('png', 46_000);
-		verifyFileSize('svg', 12_000);
+    cy.get(`#downloadPNG`).click();
+    verifyFileSize('diagram', 'png', 46_000);
+
+    cy.get(`#downloadSVG`).click();
+    verifyFileSize('diagram', 'svg', 12_000);
 
     cy.clock().invoke('restore');
   });

cypress/e2e/diagramUpdate.spec.ts

@@ -1,17 +1,18 @@
-import { getEditor, cmd, disableDebounce } from './util';
+import { getEditor, cmd } from './util';
 
 describe('Auto sync tests', () => {
   beforeEach(() => {
     cy.clearLocalStorage();
     cy.visit('/');
-		disableDebounce();
   });
 
   it('should dim diagram when code is edited', () => {
     cy.contains('Auto sync').click();
     cy.get('#view').should('not.have.class', 'outOfSync');
-		getEditor().type('  C --> Test');
+    cy.get('#errorContainer').should('not.exist');
+    getEditor({ bottom: true, newline: true }).type('  C --> Test');
     cy.get('#view').should('have.class', 'outOfSync');
+    cy.get('#errorContainer').should('contain.text', 'Diagram out of sync.');
     cy.getLocalStorage('codeStore').snapshot();
   });
 
@@ -20,7 +21,9 @@ describe('Auto sync tests', () => {
     cy.get('#view').should('not.have.class', 'outOfSync');
     getEditor().type('  C --> Test');
     cy.get('#view').should('have.class', 'outOfSync');
+    cy.get('#errorContainer').should('contain.text', 'Diagram out of sync.');
     getEditor().type(`${cmd}{enter}`);
+    cy.get('#errorContainer').should('not.exist');
     cy.get('#view').should('not.have.class', 'outOfSync');
   });
 
@@ -68,11 +71,10 @@ describe('Auto sync tests', () => {
   });
 });
 
-describe.only('Pan and Zoom', () => {
+describe('Pan and Zoom', () => {
   beforeEach(() => {
     cy.clearLocalStorage();
     cy.visit('/');
-		disableDebounce();
   });
   it('should toggle pan and zoom', () => {
     cy.get('#svg-pan-zoom-reset-pan-zoom').should('not.exist');

cypress/e2e/docMap.spec.ts

@@ -13,13 +13,13 @@ describe('Editor docs tests', () => {
   });
 
   it('Test to see if the correct URL loads when changing from one diagram to other', () => {
-		cy.contains('Flow Chart').click();
+    cy.contains('Flow').click();
     cy.get(`[data-cy=docs][href$="/#/flowchart"]`).should('exist');
 
     cy.contains('Config').click();
     cy.get(`[data-cy=docs][href$="/#/flowchart?id=configuration"]`).should('exist');
 
-		cy.contains('Sequence Diagram').click();
+    cy.contains('Sequence').click();
     cy.get(`[data-cy=docs][href$="/#/sequenceDiagram?id=configuration"]`).should('exist');
 
     cy.contains('Code').click();
@@ -27,7 +27,7 @@ describe('Editor docs tests', () => {
   });
 
   it("Test to check URLs for a case where config URL doesn't exist", () => {
-		cy.contains('State Diagram').click();
+    cy.contains('State').click();
     cy.get(`[data-cy=docs][href$="/#/stateDiagram"]`).should('exist');
 
     cy.contains('Config').click();

cypress/e2e/history.spec.ts

@@ -1,15 +1,47 @@
-import { getEditor, disableDebounce } from './util';
+import { getEditor, verifyFileSnapshot } from './util';
 
 describe('Save History', () => {
   beforeEach(() => {
-		cy.clock();
+    cy.clock(new Date(2022, 0, 1).getTime());
     cy.clearLocalStorage();
     cy.visit('/edit');
-		disableDebounce();
+
     cy.contains('Actions').click();
     cy.contains('History').click();
   });
 
+  afterEach(() => {
+    cy.clock().invoke('restore');
+  });
+
+  it('should load history from localstorage', () => {
+    cy.setLocalStorage(
+      'manualHistoryStore',
+      '[{"state":{"code":"graph TD\\n    A[Halloween] -->|Get money| B(Go shopping)","mermaid":"{\\n  \\"theme\\": \\"dark\\"\\n}","autoSync":true,"updateDiagram":false},"time":0,"type":"manual","id":"d7ea820e-21dd-418a-b984-fd58acde09df","name":"hollow-art"},{"state":{"code":"graph TD\\n    A[Christmas] -->|Get money| B(Go shopping)","mermaid":"{\\n  \\"theme\\": \\"dark\\"\\n}","autoSync":true,"updateDiagram":true},"time":0,"type":"manual","id":"b749ffc6-522b-4a44-86cf-7c1ffc3146b3","name":"helpful-ocean"}]'
+    );
+    cy.setLocalStorage(
+      'autoHistoryStore',
+      '[{"state":{"code":"graph TD\\n    A[New Year] -->|Get money| B(Go shopping)","mermaid":"{\\n  \\"theme\\": \\"dark\\"\\n}","autoSync":true,"updateDiagram":false},"time":0,"type":"auto","id":"69ea820e-522b-4a44-86cf-fd58acde09df","name":"barking-dog"},{"state":{"code":"graph TD\\n    A[Christmas] -->|Get money| B(Go shopping)","mermaid":"{\\n  \\"theme\\": \\"dark\\"\\n}","autoSync":true,"updateDiagram":true},"time":0,"type":"manual","id":"x749ffc6-21dd-418a-b984-7c1ffc3146b3","name":"needy-mosquito"}]'
+    );
+    cy.reload();
+    cy.contains('Actions').click();
+    cy.contains('History').click();
+    cy.get('#historyList').find('li').should('have.length', 2);
+    cy.get('#historyList').find('No items in History').should('not.exist');
+    cy.get('#historyList').contains('helpful-ocean');
+    cy.get('#historyList').contains('hollow-art');
+    cy.contains('Restore').click();
+    cy.contains('Halloween');
+    cy.contains('Timeline').click();
+
+    cy.get('#historyList').find('li').should('have.length', 2);
+    cy.get('#historyList').find('No items in History').should('not.exist');
+    cy.get('#historyList').contains('needy-mosquito');
+    cy.get('#historyList').contains('barking-dog');
+    cy.contains('Restore').click();
+    cy.contains('New Year');
+  });
+
   it('should save when clicked', () => {
     cy.get('#historyList').find('li').should('have.length', 0);
     cy.get('#historyList').contains('No items in History');
@@ -64,4 +96,10 @@ describe('Save History', () => {
     }
     cy.get('#historyList').find('li').should('have.length', 30);
   });
+
+  it('should download history', () => {
+    cy.get('#saveHistory').click();
+    cy.get(`#downloadHistory`).click();
+    verifyFileSnapshot('history', 'json', 'A[Christmas] -->|Get money| B(Go shopping)');
+  });
 });

cypress/e2e/loadSite.spec.ts

@@ -1,12 +1,11 @@
 import { toBase64 } from 'js-base64';
-import { disableDebounce } from './util';
 
 describe('Site Loads', () => {
   beforeEach(() => {
     cy.clearLocalStorage();
     cy.visit('/');
-		disableDebounce();
   });
+
   it('Check Home page load', () => {
     cy.url().should('include', '/edit');
     cy.contains('History').click();
@@ -22,12 +21,13 @@ describe('Site Loads', () => {
 
   it('should load sample diagrams when clicked', () => {
     cy.contains('Sample Diagrams').click();
-		cy.contains('Pie Chart').click();
+    cy.contains('Pie').click();
     cy.contains('pie title Pets adopted by volunteers');
-		cy.contains('Class Diagram').click();
+    cy.contains('Class').click();
     cy.contains('classDiagram');
   });
 
+  (Cypress.env('CI') === 'true' ? describe : describe.skip)('github', () => {
     it('should load diagram from gist', () => {
       cy.visit(`/edit?gist=https://gist.github.com/sidharthv96/6268a23e673a533dcb198f241fd7012a`);
       cy.contains('History').click();
@@ -56,11 +56,12 @@ describe('Site Loads', () => {
       cy.contains('Party');
       cy.getLocalStorage('codeStore').snapshot();
     });
+  });
 
   // Disabled temporarily. Should be enabled after the issue is fixed in Mermaid.
   // it('should prevent setting the "securityLevel" option via URL', () => {
   // 	const b64State = toBase64(
-	// 		`{"code":"graph TD\\nA[\\"<img src='https://via.placeholder.com/64' width=64 />\\"]","mermaid":"{\\"securityLevel\\": \\"loose\\", \\"theme\\": \\"forest\\"}","updateEditor":true,"autoSync":true,"updateDiagram":true}`,
+  // 		`{"code":"graph TD\\nA[\\"<img src='https://via.placeholder.com/64' width=64 />\\"]","mermaid":"{\\"securityLevel\\": \\"loose\\", \\"theme\\": \\"forest\\"}","autoSync":true,"updateDiagram":true}`,
   // 		true
   // 	);
   // 	cy.on('window:confirm', () => true);
@@ -73,13 +74,14 @@ describe('Site Loads', () => {
   // 	cy.get('#view').contains(`src='https://via.placeholder.com/64'`);
   // });
 
-	it('should allow persisting "securityLevel" using confirm dialogue', () => {
+  it.skip('should allow persisting "securityLevel" using confirm dialogue', () => {
     const b64State = toBase64(
-			`{"code":"graph TD\\nA[\\"<img src='https://dummyimage.com/64' width=64/>\\"]","mermaid":"{\\"securityLevel\\": \\"loose\\", \\"theme\\": \\"forest\\"}","updateEditor":true,"autoSync":true,"updateDiagram":true}`,
+      `{"code":"graph TD\\nA[\\"<img src='https://dummyimage.com/64' width=64/>\\"]","mermaid":"{\\"securityLevel\\": \\"loose\\", \\"theme\\": \\"forest\\"}","autoSync":true,"updateDiagram":true}`,
       true
     );
     cy.on('window:confirm', () => false);
     cy.visit(`/edit#${b64State}`);
+    cy.get('#editor').type(' ');
     cy.contains('Config').click();
     cy.contains('forest');
     cy.contains('securityLevel');

cypress/e2e/util.ts

@@ -8,4 +8,34 @@ export const getEditor = ({ bottom = true, newline = false } = {}) =>
     .type(`${bottom ? '{pageDown}' : cmd}`)
     .type(`${newline ? '{enter}' : cmd}`);
 
-export const disableDebounce = () => cy.setLocalStorage('noDebounce', 'true');
+const downloadsFolder = Cypress.config('downloadsFolder');
+
+export const verifyFileSize = (
+  fileType: 'history' | 'diagram',
+  extension: string,
+  size: number
+) => {
+  const fileName = `mermaid-${fileType}-2022-01-01-000000.${extension}`;
+  const filePath = `${downloadsFolder}/${fileName}`;
+  cy.verifyDownload(fileName);
+  cy.readFile(filePath, null, {
+    log: false
+  }).then((buffer) => expect((buffer as ArrayBuffer).byteLength).to.be.gt(size));
+  cy.task('deleteFile', filePath);
+};
+
+export const verifyFileSnapshot = (
+  fileType: 'history' | 'diagram',
+  extension: string,
+  content: string
+) => {
+  const fileName = `mermaid-${fileType}-2022-01-01-000000.${extension}`;
+  const filePath = `${downloadsFolder}/${fileName}`;
+  cy.verifyDownload(fileName);
+  cy.readFile(filePath, null, {
+    log: false
+  }).then((buffer) =>
+    expect(new TextDecoder('utf-8').decode(buffer as ArrayBuffer)).to.contain(content)
+  );
+  cy.task('deleteFile', filePath);
+};

cypress/snapshots.js

@@ -1,28 +1,28 @@
 module.exports = {
   "Site Loads": {
     "Check Home page load": {
-      "1": "{\"code\":\"graph TD\\n    A[Christmas] -->|Get money| B(Go shopping)\\n    B --> C{Let me think}\\n    C -->|One| D[Laptop]\\n    C -->|Two| E[iPhone]\\n    C -->|Three| F[fa:fa-car Car]\\n  \",\"mermaid\":\"{\\n  \\\"theme\\\": \\\"default\\\"\\n}\",\"updateEditor\":true,\"autoSync\":true,\"updateDiagram\":true}"
+      "1": "{\"code\":\"graph TD\\n    A[Christmas] -->|Get money| B(Go shopping)\\n    B --> C{Let me think}\\n    C -->|One| D[Laptop]\\n    C -->|Two| E[iPhone]\\n    C -->|Three| F[fa:fa-car Car]\\n  \",\"mermaid\":\"{\\n  \\\"theme\\\": \\\"default\\\"\\n}\",\"autoSync\":true,\"updateDiagram\":true}"
     },
     "Check Redirect from old URL": {
-      "1": "{\"code\":\"graph TD\\n    A[Christmas] -->|Get money| B(Go shopping)\\n    B --> C{Let me think}\\n    C -->|One| D[Laptop]\\n    C -->|Two| E[iPhone]\\n    C -->|Three| F[fa:fa-car Car]\",\"mermaid\":\"{\\n  \\\"theme\\\": \\\"default\\\"\\n}\",\"updateEditor\":false,\"autoSync\":true,\"updateDiagram\":true}"
+      "1": "{\"code\":\"graph TD\\n    A[Christmas] -->|Get money| B(Go shopping)\\n    B --> C{Let me think}\\n    C -->|One| D[Laptop]\\n    C -->|Two| E[iPhone]\\n    C -->|Three| F[fa:fa-car Car]\",\"mermaid\":\"{\\n  \\\"theme\\\": \\\"default\\\"\\n}\",\"autoSync\":true,\"updateDiagram\":true}"
     },
     "should load diagram from gist": {
-      "1": "{\"code\":\"graph TD\\n    A[Party] -->|Get money| B(Go shopping!!)\\n    \",\"mermaid\":\"{\\n  \\\"theme\\\": \\\"forest\\\",\\n  \\\"test\\\": \\\"hello world\\\"\\n}\",\"updateEditor\":false,\"autoSync\":true,\"updateDiagram\":true,\"loader\":{\"type\":\"gist\",\"config\":{\"url\":\"https://gist.github.com/sidharthv96/6268a23e673a533dcb198f241fd7012a\"}}}"
+      "1": "{\"code\":\"graph TD\\n    A[Party] -->|Get money| B(Go shopping!!)\\n    \",\"mermaid\":\"{\\n  \\\"theme\\\": \\\"forest\\\",\\n  \\\"test\\\": \\\"hello world\\\"\\n}\",\"autoSync\":true,\"updateDiagram\":true,\"loader\":{\"type\":\"gist\",\"config\":{\"url\":\"https://gist.github.com/sidharthv96/6268a23e673a533dcb198f241fd7012a\"}}}"
     },
     "should load diagram from gist revision": {
-      "1": "{\"code\":\"graph TD\\n    A[Party] -->|Get money| B(Go shopping)\\n    \",\"mermaid\":\"{\\n  \\\"theme\\\": \\\"forest\\\",\\n  \\\"test\\\": \\\"hello\\\"\\n}\",\"updateEditor\":false,\"autoSync\":true,\"updateDiagram\":true,\"loader\":{\"type\":\"gist\",\"config\":{\"url\":\"https://gist.github.com/sidharthv96/6268a23e673a533dcb198f241fd7012a/ec9b4ab0e41e4ff6287326cd3cb47affd7851e19\"}}}"
+      "1": "{\"code\":\"graph TD\\n    A[Party] -->|Get money| B(Go shopping)\\n    \",\"mermaid\":\"{\\n  \\\"theme\\\": \\\"forest\\\",\\n  \\\"test\\\": \\\"hello\\\"\\n}\",\"autoSync\":true,\"updateDiagram\":true,\"loader\":{\"type\":\"gist\",\"config\":{\"url\":\"https://gist.github.com/sidharthv96/6268a23e673a533dcb198f241fd7012a/ec9b4ab0e41e4ff6287326cd3cb47affd7851e19\"}}}"
     },
     "should load diagram from raw files": {
-      "1": "{\"code\":\"graph TD\\n    A[Party] -->|Get money| B(Go shopping!!)\\n    \",\"mermaid\":\"{\\n  \\\"theme\\\": \\\"forest\\\",\\n  \\\"test\\\": \\\"hello world\\\"\\n}\",\"updateEditor\":false,\"autoSync\":true,\"updateDiagram\":true,\"loader\":{\"type\":\"files\",\"config\":{\"codeURL\":\"https://gist.githubusercontent.com/sidharthv96/6268a23e673a533dcb198f241fd7012a/raw/4eb03887e6a41397e80bdcdbf94017c498f8f1e2/code.mmd\",\"configURL\":\"https://gist.githubusercontent.com/sidharthv96/6268a23e673a533dcb198f241fd7012a/raw/4eb03887e6a41397e80bdcdbf94017c498f8f1e2/config.json\"}}}"
+      "1": "{\"code\":\"graph TD\\n    A[Party] -->|Get money| B(Go shopping!!)\\n    \",\"mermaid\":\"{\\n  \\\"theme\\\": \\\"forest\\\",\\n  \\\"test\\\": \\\"hello world\\\"\\n}\",\"autoSync\":true,\"updateDiagram\":true,\"loader\":{\"type\":\"files\",\"config\":{\"codeURL\":\"https://gist.githubusercontent.com/sidharthv96/6268a23e673a533dcb198f241fd7012a/raw/4eb03887e6a41397e80bdcdbf94017c498f8f1e2/code.mmd\",\"configURL\":\"https://gist.githubusercontent.com/sidharthv96/6268a23e673a533dcb198f241fd7012a/raw/4eb03887e6a41397e80bdcdbf94017c498f8f1e2/config.json\"}}}"
     }
   },
-  "__version": "10.4.0",
+  "__version": "10.10.0",
   "Auto sync tests": {
     "should dim diagram when code is edited": {
-      "1": "{\"code\":\"graph TD\\n    A[Christmas] -->|Get money| B(Go shopping)\\n    B --> C{Let me think}\\n    C -->|One| D[Laptop]\\n    C -->|Two| E[iPhone]\\n    C -->|Three| F[fa:fa-car Car]\\n    C --> Test\",\"mermaid\":\"{\\n  \\\"theme\\\": \\\"default\\\"\\n}\",\"updateEditor\":false,\"autoSync\":false,\"updateDiagram\":false}"
+      "1": "{\"code\":\"graph TD\\n    A[Christmas] -->|Get money| B(Go shopping)\\n    B --> C{Let me think}\\n    C -->|One| D[Laptop]\\n    C -->|Two| E[iPhone]\\n    C -->|Three| F[fa:fa-car Car]\\n    C --> Test\",\"mermaid\":\"{\\n  \\\"theme\\\": \\\"default\\\"\\n}\",\"autoSync\":false,\"updateDiagram\":false}"
     },
     "should not dim diagram when code is in sync": {
-      "1": "{\"code\":\"graph TD\\n    A[Christmas] -->|Get money| B(Go shopping)\\n    B --> C{Let me think}\\n    C -->|One| D[Laptop]\\n    C -->|Two| E[iPhone]\\n    C -->|Three| F[fa:fa-car Car]\\n    C --> Testing\",\"mermaid\":\"{\\n  \\\"theme\\\": \\\"default\\\"\\n}\",\"updateEditor\":false,\"autoSync\":true,\"updateDiagram\":false}"
+      "1": "{\"code\":\"graph TD\\n    A[Christmas] -->|Get money| B(Go shopping)\\n    B --> C{Let me think}\\n    C -->|One| D[Laptop]\\n    C -->|Two| E[iPhone]\\n    C -->|Three| F[fa:fa-car Car]\\n    C --> Testing\",\"mermaid\":\"{\\n  \\\"theme\\\": \\\"default\\\"\\n}\",\"autoSync\":true,\"updateDiagram\":false}"
     }
   },
   "Test themes": {

package.json

@@ -5,13 +5,15 @@
   "license": "MIT",
   "scripts": {
     "dev": "vite dev",
+    "dev:force": "MERMAID_LOCAL=true yarn dev --force",
+    "dev:test": "yarn dev",
     "build": "vite build",
     "preview": "vite preview",
     "lint": "prettier --check --cache --plugin-search-dir=. .;eslint --ignore-path .gitignore .",
     "lint:fix": "prettier --write --cache --plugin-search-dir=. .;eslint --fix --ignore-path .gitignore .",
     "format": "prettier --write --cache --plugin-search-dir=. .",
     "pre-commit": "lint-staged",
-		"postinstall": "husky install; cypress cache prune; svelte-kit sync",
+    "postinstall": "husky install && svelte-kit sync && (git config blame.ignoreRevsFile .git-blame-ignore-revs || true)",
     "test:unit": "vitest",
     "test:ui": "vitest --ui",
     "test:coverage": "vitest run --coverage",
@@ -21,60 +23,61 @@
   },
   "devDependencies": {
     "@cypress/snapshot": "2.1.7",
-		"@sveltejs/adapter-static": "1.0.0-next.39",
-		"@sveltejs/kit": "1.0.0-next.405",
+    "@sveltejs/adapter-static": "1.0.0-next.46",
+    "@sveltejs/kit": "1.0.0-next.522",
     "@testing-library/jest-dom": "5.16.5",
-		"@testing-library/svelte": "3.1.3",
-		"@types/mermaid": "8.2.9",
-		"@types/pako": "1.0.3",
-		"@typescript-eslint/eslint-plugin": "5.33.0",
-		"@typescript-eslint/parser": "5.33.0",
-		"@vitest/ui": "0.21.1",
-		"autoprefixer": "10.4.8",
+    "@testing-library/svelte": "3.2.2",
+    "@types/pako": "2.0.0",
+    "@types/uuid": "8.3.4",
+    "@typescript-eslint/eslint-plugin": "5.42.0",
+    "@typescript-eslint/parser": "5.42.0",
+    "@vitest/ui": "0.25.1",
+    "autoprefixer": "10.4.12",
     "c8": "7.12.0",
     "chai": "4.3.6",
-		"cssnano": "5.1.12",
-		"cy-verify-downloads": "0.1.8",
-		"cypress": "10.4.0",
-		"cypress-localstorage-commands": "2.2.0",
-		"eslint": "8.21.0",
+    "cssnano": "5.1.13",
+    "cy-verify-downloads": "0.1.11",
+    "cypress": "11.0.1",
+    "cypress-localstorage-commands": "2.2.1",
+    "eslint": "8.27.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-plugin-cypress": "2.12.1",
     "eslint-plugin-es": "4.1.0",
     "eslint-plugin-postcss-modules": "2.0.0",
     "eslint-plugin-svelte3": "4.0.0",
-		"eslint-plugin-tailwindcss": "3.6.0",
-		"eslint-plugin-vitest": "0.0.8",
+    "eslint-plugin-tailwindcss": "3.6.2",
+    "eslint-plugin-vitest": "0.0.11",
+    "esserializer": "1.3.2",
     "husky": "8.0.1",
-		"jsdom": "20.0.0",
+    "jsdom": "20.0.1",
     "lint-staged": "13.0.3",
-		"node-html-parser": "5.4.1",
-		"postcss": "8.4.16",
+    "node-html-parser": "6.1.1",
+    "postcss": "8.4.18",
     "postcss-load-config": "4.0.1",
     "prettier": "2.7.1",
-		"prettier-plugin-svelte": "2.7.0",
-		"svelte": "3.49.0",
+    "prettier-plugin-svelte": "2.8.0",
+    "svelte": "3.53.1",
     "svelte-preprocess": "4.10.7",
-		"tailwindcss": "3.1.8",
+    "tailwindcss": "3.2.1",
     "tslib": "2.4.0",
-		"typescript": "4.7.4",
-		"vite": "3.0.6",
-		"vitest": "0.21.1",
-		"vitest-svelte-kit": "0.0.7"
+    "typescript": "4.8.4",
+    "vite": "3.2.2",
+    "vitest": "0.25.1"
   },
   "dependencies": {
-		"@analytics/google-analytics": "1.0.3",
-		"@macfja/svelte-persistent-store": "1.3.0",
+    "@mermaid-js/mermaid-mindmap": "9.2.2",
     "analytics": "0.8.1",
-		"daisyui": "2.22.0",
+    "analytics-plugin-plausible": "0.0.6",
+    "daisyui": "2.39.1",
     "js-base64": "3.7.2",
-		"mermaid": "9.1.5",
+    "mermaid": "9.2.2",
     "moment": "2.29.4",
-		"monaco-editor": "0.34.0",
+    "monaco-editor": "0.34.1",
     "monaco-mermaid": "1.0.6",
-		"pako": "2.0.4",
+    "pako": "2.1.0",
     "random-word-slugs": "0.1.6",
-		"svg-pan-zoom": "^3.6.1"
+    "svg-pan-zoom": "3.6.1",
+    "uuid": "9.0.0"
   },
   "lint-staged": {
     "*.{ts,svelte,js,css,md,json}": [
@@ -83,8 +86,8 @@
     ]
   },
   "volta": {
-		"node": "18.5.0",
-		"yarn": "1.22.10"
+    "node": "18.12.0",
+    "yarn": "1.22.19"
   },
   "engines": {
     "node": ">=16.7"

renovate.json

@@ -14,10 +14,6 @@
     {
       "matchUpdateTypes": ["minor", "patch", "pin", "digest"],
       "automerge": true
-		},
-		{
-			"matchDatasources": ["npm"],
-			"stabilityDays": 3
     }
   ],
   "dependencyDashboard": true,

src/app.html

@@ -11,40 +11,42 @@
     <meta
       name="description"
       content="Simplify documentation and avoid heavy tools. Open source Visio Alternative. Commonly used for explaining your code! Mermaid is a simple markdown-like script language for generating charts from text via javascript." />
-		<link rel="icon" type="image/png" href="%sveltekit.assets%/favicon.png" />
+    <link rel="icon" type="image/png" href="%sveltekit.assets%/favicon.svg" />
+    <link rel="mask-icon" href="%sveltekit.assets%/favicon.svg" color="#000000" />
+    <meta name="theme-color" content="#6366F1" />
     <link rel="manifest" href="%sveltekit.assets%/manifest.json" />
     <link
       rel="stylesheet"
-			href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.2/css/all.min.css"
-			integrity="sha512-HK5fgLBL+xu6dm/Ii3z4xhlSUyZgTT9tuc/hSrtw6uzJOvgRr2a9jyxxT1ely+B+xFAmJKVSTbpM/CuL7qxO8w=="
+      href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.2.0/css/all.min.css"
+      integrity="sha512-xh6O/CkQoPOWDdYTDqeRdPCVd1SpvCA9XXcUnZS2FmJNp1coAFzvtCN9BmamE+4aHK8yyUHUSCcJHgXloTyT2A=="
       crossorigin="anonymous"
       referrerpolicy="no-referrer" />
     <link
       rel="stylesheet"
-			href="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.0/min/vs/editor/editor.main.min.css"
-			integrity="sha512-iQEIc0rsSDujsfjtD+lfyJ1W23Bh/lbgriubKDAym6VlEIDRj9rrbSIyJRyshOrl8s0yRcQ0+gyrZfSLyjJGWQ=="
+      href="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.1/min/vs/editor/editor.main.min.css"
+      integrity="sha512-GzcoZD7y5zvBofYtImXPZaPVhoY7xLPt+ysmbPb/vU+quSKFkcngxaSrxuwprDZL4MALUqGFmnqCxQZqMozv1Q=="
       crossorigin="anonymous"
       referrerpolicy="no-referrer" />
     <script>
       var require = {
         paths: {
-					vs: "https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.0/min/vs",
-				},
+          vs: 'https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.0/min/vs'
+        }
       };
     </script>
     <script
-			src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.0/min/vs/loader.min.js"
+      src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.1/min/vs/loader.min.js"
       integrity="sha512-6bIYsGqvLpAiEBXPdRQeFf5cueeBECtAKJjIHer3BhBZNTV3WLcLA8Tm3pDfxUwTMIS+kAZwTUvJ1IrMdX8C5w=="
       crossorigin="anonymous"
       referrerpolicy="no-referrer"></script>
     <script
-			src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.0/min/vs/editor/editor.main.nls.min.js"
+      src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.1/min/vs/editor/editor.main.nls.min.js"
       integrity="sha512-CCv+DKWw+yZhxf4Z+ExT6HC5G+3S45TeMTYcJyYbdrv4BpK2vyALJ4FoVR/KGWDIPu7w4tNCOC9MJQIkYPR5FA=="
       crossorigin="anonymous"
       referrerpolicy="no-referrer"></script>
     <script
-			src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.0/min/vs/editor/editor.main.js"
-			integrity="sha512-TTPQbVI87mnVMV+1KbkKJ8vdQ4QqqbKyuTtJ9wQD8CqnwQLSQgXH7MWOQ88VO7pRzxWhqI1vYDeEV651sAH4ig=="
+      src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.1/min/vs/editor/editor.main.js"
+      integrity="sha512-BtSZPhzoyN8kq1axY6cgOFPSgLJgFwvAZ3WxeDGxEFXeFcFuK2s7Hr+zF75npVHASUY1dxudAfIVzwmgdR89Bw=="
       crossorigin="anonymous"
       referrerpolicy="no-referrer"></script>
     %sveltekit.head%

src/env.d.ts

@@ -0,0 +1,14 @@
+/// <reference types="vite/client" />
+
+interface ImportMetaEnv {
+  readonly MERMAID_RENDERER_URL: string;
+  readonly MERMAID_KROKI_RENDERER_URL: string;
+  readonly MERMAID_CDN_URL: string;
+  readonly MERMAID_BASE_URL: string;
+  readonly MERMAID_LOCAL: boolean;
+  // more env variables...
+}
+
+interface ImportMeta {
+  readonly env: ImportMetaEnv;
+}

src/hooks.server.ts

@@ -1,9 +1,6 @@
 import type { Handle } from '@sveltejs/kit';
 
 export const handle: Handle = async ({ event, resolve }) => {
-	const response = await resolve(event, {
-		ssr: false
-	});
-
+  const response = await resolve(event, {});
   return response;
 };

src/lib/components/Actions.svelte

@@ -0,0 +1,260 @@
+<script lang="ts">
+  import { browser } from '$app/environment';
+  import Card from '$lib/components/Card/Card.svelte';
+  import { env } from '$lib/util/env';
+  import { pakoSerde } from '$lib/util/serde';
+  import { stateStore } from '$lib/util/state';
+  import { logEvent } from '$lib/util/stats';
+  import { toBase64 } from 'js-base64';
+  import moment from 'moment';
+  const { krokiRendererUrl, rendererUrl } = env;
+
+  type Exporter = (context: CanvasRenderingContext2D, image: HTMLImageElement) => () => void;
+
+  const getFileName = (ext: string) =>
+    `mermaid-diagram-${moment().format('YYYY-MM-DD-HHmmss')}.${ext}`;
+
+  const getBase64SVG = (svg?: HTMLElement, width?: number, height?: number): string => {
+    svg?.setAttribute('height', `${height}px`);
+    svg?.setAttribute('width', `${width}px`); // Workaround https://stackoverflow.com/questions/28690643/firefox-error-rendering-an-svg-image-to-html5-canvas-with-drawimage
+    if (!svg) {
+      svg = getSvgEl();
+    }
+    const svgString = svg.outerHTML
+      .replaceAll('<br>', '<br/>')
+      .replaceAll(/<img([^>]*)>/g, (m, g: string) => `<img ${g} />`);
+    return toBase64(svgString);
+  };
+
+  const exportImage = (event: Event, exporter: Exporter) => {
+    const canvas: HTMLCanvasElement = document.createElement('canvas');
+    const svg: HTMLElement = document.querySelector('#container svg');
+    const box: DOMRect = svg.getBoundingClientRect();
+    canvas.width = box.width;
+    canvas.height = box.height;
+    if (imagemodeselected === 'width') {
+      const ratio = box.height / box.width;
+      canvas.width = userimagesize;
+      canvas.height = userimagesize * ratio;
+    } else if (imagemodeselected === 'height') {
+      const ratio = box.width / box.height;
+      canvas.width = userimagesize * ratio;
+      canvas.height = userimagesize;
+    }
+
+    const context = canvas.getContext('2d');
+    context.fillStyle = 'white';
+    context.fillRect(0, 0, canvas.width, canvas.height);
+
+    const image = new Image();
+    image.onload = exporter(context, image);
+    image.src = `data:image/svg+xml;base64,${getBase64SVG(svg, canvas.width, canvas.height)}`;
+
+    event.stopPropagation();
+    event.preventDefault();
+  };
+
+  const getSvgEl = () => {
+    const svgEl: HTMLElement = document
+      .querySelector('#container svg')
+      .cloneNode(true) as HTMLElement;
+    svgEl.setAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink');
+    const fontAwesomeCdnUrl = Array.from(document.head.getElementsByTagName('link'))
+      .map((l) => l.href)
+      .find((h) => h && h.includes('font-awesome'));
+    if (fontAwesomeCdnUrl == null) {
+      return svgEl;
+    }
+    const styleEl = document.createElement('style');
+    styleEl.innerText = `@import url("${fontAwesomeCdnUrl}");'`;
+    svgEl.prepend(styleEl);
+    return svgEl;
+  };
+
+  const simulateDownload = (download: string, href: string): void => {
+    const a = document.createElement('a');
+    a.download = download;
+    a.href = href;
+    a.click();
+    a.remove();
+  };
+  const downloadImage: Exporter = (context, image) => {
+    return () => {
+      const { canvas } = context;
+      context.drawImage(image, 0, 0, canvas.width, canvas.height);
+      simulateDownload(
+        getFileName('png'),
+        canvas.toDataURL('image/png').replace('image/png', 'image/octet-stream')
+      );
+    };
+  };
+
+  const isClipboardAvailable = (): boolean => {
+    return Object.prototype.hasOwnProperty.call(window, 'ClipboardItem') as boolean;
+  };
+
+  const clipboardCopy: Exporter = (context, image) => {
+    return () => {
+      const { canvas } = context;
+      context.drawImage(image, 0, 0, canvas.width, canvas.height);
+      canvas.toBlob((blob) => {
+        try {
+          // @ts-ignore: https://github.com/microsoft/TypeScript-DOM-lib-generator/pull/1004/files
+          void navigator.clipboard.write([
+            /* eslint-disable no-undef */
+            // @ts-ignore: https://github.com/microsoft/TypeScript/issues/43821
+            new ClipboardItem({
+              [blob.type]: blob
+            })
+          ]);
+        } catch (error) {
+          console.error(error);
+        }
+      });
+    };
+  };
+
+  const onCopyClipboard = (event: Event) => {
+    exportImage(event, clipboardCopy);
+    logEvent('copyClipboard');
+  };
+
+  const onDownloadPNG = (event: Event) => {
+    exportImage(event, downloadImage);
+    logEvent('download', {
+      type: 'png'
+    });
+  };
+
+  const onDownloadSVG = () => {
+    simulateDownload(getFileName('svg'), `data:image/svg+xml;base64,${getBase64SVG()}`);
+    logEvent('download', {
+      type: 'svg'
+    });
+  };
+
+  const onCopyMarkdown = () => {
+    (document.getElementById('markdown') as HTMLInputElement).select();
+    document.execCommand('Copy');
+    logEvent('copyMarkdown');
+  };
+
+  let gistURL = '';
+  stateStore.subscribe(({ loader }) => {
+    if (loader?.type === 'gist') {
+      // @ts-ignore Gist will have url
+      gistURL = loader.config.url;
+    }
+  });
+
+  const loadGist = () => {
+    if (!gistURL) {
+      alert('Please enter a Gist URL first');
+    }
+    window.location.href = `${window.location.pathname}?gist=${gistURL}`;
+    logEvent('loadGist');
+  };
+
+  let iUrl: string;
+  let svgUrl: string;
+  let krokiUrl: string;
+  let mdCode: string;
+  let imagemodeselected = 'auto';
+  let userimagesize = 1080;
+
+  let isNetlify = false;
+  if (browser && ['mermaid.live', 'netlify'].some((path) => window.location.host.includes(path))) {
+    isNetlify = true;
+  }
+  stateStore.subscribe(async (state) => {
+    const { code, serialized } = await state;
+    iUrl = `${rendererUrl}/img/${serialized}?type=png`;
+    svgUrl = `${rendererUrl}/svg/${serialized}`;
+    krokiUrl = `${krokiRendererUrl}/mermaid/svg/${pakoSerde.serialize(code)}`;
+    mdCode = `[![](${iUrl})](${window.location.protocol}//${window.location.host}${window.location.pathname}#${serialized})`;
+  });
+</script>
+
+<Card title="Actions" isOpen={true}>
+  <div class="flex flex-wrap gap-2 m-2">
+    {#if isClipboardAvailable()}
+      <button class="action-btn w-full" on:click={onCopyClipboard}
+        ><i class="far fa-copy mr-2" /> Copy Image to clipboard
+      </button>
+    {/if}
+    <button id="downloadPNG" class="action-btn flex-grow" on:click={onDownloadPNG}>
+      <i class="fas fa-download mr-2" /> PNG
+    </button>
+    <button id="downloadSVG" class="action-btn flex-grow" on:click={onDownloadSVG}>
+      <i class="fas fa-download mr-2" /> SVG
+    </button>
+    <a target="_blank" rel="noreferrer" class="flex-grow" href={iUrl}>
+      <button class="action-btn w-full">
+        <i class="fas fa-external-link-alt mr-2" /> PNG
+      </button>
+    </a>
+    <a target="_blank" rel="noreferrer" class="flex-grow" href={svgUrl}>
+      <button class="action-btn w-full">
+        <i class="fas fa-external-link-alt mr-2" /> SVG
+      </button>
+    </a>
+    <a target="_blank" rel="noreferrer" class="flex-grow" href={krokiUrl}>
+      <button class="action-btn w-full">
+        <i class="fas fa-external-link-alt mr-2" /> Kroki
+      </button>
+    </a>
+
+    <div class="flex gap-2 items-center">
+      PNG size
+      <label for="autosize">
+        <input type="radio" value="auto" id="autosize" bind:group={imagemodeselected} /> Auto
+      </label>
+
+      <label for="width">
+        <input type="radio" value="width" id="width" bind:group={imagemodeselected} /> Width
+      </label>
+
+      <label for="height">
+        <input type="radio" value="height" id="height" bind:group={imagemodeselected} /> Height
+      </label>
+
+      {#if imagemodeselected !== 'auto'}
+        <input
+          id="height"
+          class="input"
+          type="number"
+          min="3"
+          max="10000"
+          bind:value={userimagesize} />
+      {/if}
+    </div>
+
+    <div class="w-full flex gap-2 items-center">
+      <input class="input" id="markdown" type="text" value={mdCode} on:click={onCopyMarkdown} />
+      <label for="markdown">
+        <button class="btn btn-primary btn-md flex-auto" on:click={onCopyMarkdown}>
+          Copy Markdown
+        </button>
+      </label>
+    </div>
+
+    <div class="w-full flex gap-2 items-center">
+      <input
+        class="input"
+        id="gist"
+        type="text"
+        bind:value={gistURL}
+        placeholder="Enter Gist URL" />
+      <label for="gist">
+        <button class="btn btn-primary btn-md flex-auto" on:click={loadGist}> Load Gist </button>
+      </label>
+    </div>
+    {#if isNetlify}
+      <div class="w-full flex items-center justify-center">
+        <a class="link underline text-gray-500 text-sm" href="https://netlify.com">
+          This site is powered by Netlify
+        </a>
+      </div>
+    {/if}
+  </div>
+</Card>

src/lib/components/Card/Card.svelte

@@ -0,0 +1,31 @@
+<script lang="ts">
+  import type { Tab } from '$lib/types';
+  import { slide } from 'svelte/transition';
+  import Tabs from './Tabs.svelte';
+  export let isCloseable = true;
+  export let isOpen = true;
+  export let tabs: Tab[] = [];
+  export let activeTabID: string = '';
+  export let title: string;
+  $: isOpen = isCloseable ? isOpen : true;
+  $: isTabsShown = isOpen && tabs.length > 0;
+</script>
+
+<div class="card rounded overflow-hidden m-2 flex-grow flex flex-col shadow-2xl">
+  <div
+    class="bg-primary p-2 {isTabsShown ? 'pb-0' : ''} flex-none cursor-pointer"
+    on:click={() => (isOpen = !isOpen)}
+    on:keypress={() => (isOpen = !isOpen)}>
+    <div class="flex justify-between">
+      <Tabs on:select {tabs} bind:isOpen {title} {isCloseable} {activeTabID} />
+      <div class="flex gap-x-4 items-center {isTabsShown ? '-mt-2' : ''}">
+        <slot name="actions" />
+      </div>
+    </div>
+  </div>
+  {#if isOpen}
+    <div class="card-body p-0 flex-grow overflow-auto text-base-content" transition:slide>
+      <slot />
+    </div>
+  {/if}
+</div>

src/lib/components/Card/Tabs.svelte

@@ -0,0 +1,52 @@
+<script lang="ts">
+  import type { Tab, TabEvents } from '$lib/types';
+  import { createEventDispatcher } from 'svelte';
+  import { fade } from 'svelte/transition';
+  export let isCloseable = true;
+  export let tabs: Tab[];
+  export let title: string;
+  export let isOpen = false;
+  export let activeTabID: string;
+
+  if (!activeTabID && tabs.length > 0) {
+    activeTabID = tabs[0].id;
+  }
+  const dispatch = createEventDispatcher<TabEvents>();
+  const toggleTabs = (tab: Tab) => {
+    activeTabID = tab.id;
+    dispatch('select', tab);
+  };
+</script>
+
+<div class="flex cursor-default">
+  <span
+    class="mr-2 font-semibold"
+    on:click|stopPropagation={() => (isOpen = !isOpen)}
+    on:keypress|stopPropagation={() => (isOpen = !isOpen)}>
+    {#if isCloseable}
+      <i class="fas fa-chevron-right icon" class:isOpen />
+    {/if}
+    {title}</span>
+  {#if isOpen && tabs}
+    <ul class="tabs" transition:fade>
+      {#each tabs as tab}
+        <div
+          class="tab tab-lifted {activeTabID === tab.id ? 'tab-active' : 'text-primary-content'}"
+          on:click|stopPropagation={() => toggleTabs(tab)}
+          on:keypress|stopPropagation={() => toggleTabs(tab)}>
+          <i class="mr-1 {tab.icon}" />
+          {tab.title}
+        </div>
+      {/each}
+    </ul>
+  {/if}
+</div>
+
+<style>
+  .icon {
+    transition-duration: 0.5s;
+  }
+  .isOpen {
+    transform: rotate(90deg);
+  }
+</style>

src/lib/components/Card/__snapshots__/card.test.ts.snap

@@ -0,0 +1,3 @@
+// Vitest Snapshot v1
+
+exports[`card.svelte > mounts 1`] = `"<div><div class=\\"card rounded overflow-hidden m-2 flex-grow flex flex-col shadow-2xl\\"><div class=\\"bg-primary p-2 pb-0 flex-none cursor-pointer\\"><div class=\\"flex justify-between\\"><div class=\\"flex cursor-default s-_wx1E_JHsCoF\\"><span class=\\"mr-2 font-semibold s-_wx1E_JHsCoF\\"><i class=\\"fas fa-chevron-right icon s-_wx1E_JHsCoF isOpen\\"></i> TabTest</span> <ul class=\\"tabs s-_wx1E_JHsCoF\\"><div class=\\"tab tab-lifted tab-active s-_wx1E_JHsCoF\\"><i class=\\"mr-1 undefined s-_wx1E_JHsCoF\\"></i> title1 </div><div class=\\"tab tab-lifted text-primary-content s-_wx1E_JHsCoF\\"><i class=\\"mr-1 undefined s-_wx1E_JHsCoF\\"></i> title2 </div></ul></div><!--<Tabs>--> <div class=\\"flex gap-x-4 items-center -mt-2\\"></div></div></div> <div class=\\"card-body p-0 flex-grow overflow-auto text-base-content\\"></div></div><!--<Card>--></div>"`;

src/lib/components/Card/card.test.ts

@@ -0,0 +1,24 @@
+import { cleanup, render } from '@testing-library/svelte';
+import { describe, expect, it, afterEach } from 'vitest';
+import Card from './Card.svelte';
+
+describe('card.svelte', () => {
+  // TODO: @testing-library/svelte claims to add this automatically but it doesn't work without explicit afterEach
+  afterEach(() => cleanup());
+
+  it('mounts', () => {
+    const { container } = render(Card, {
+      title: 'TabTest',
+      tabs: [
+        { id: 't1', title: 'title1' },
+        { id: 't2', title: 'title2' }
+      ]
+    });
+    expect(container).toBeTruthy();
+    expect(container).toHaveTextContent('TabTest');
+    expect(container).toHaveTextContent('title1');
+    expect(container).toHaveTextContent('title2');
+    expect(container).not.toHaveTextContent('title3');
+    expect(container.innerHTML).toMatchSnapshot();
+  });
+});

src/lib/components/Editor.svelte

@@ -0,0 +1,115 @@
+<script lang="ts">
+  import type { EditorMode } from '$lib/types';
+  import { stateStore, updateCode, updateConfig } from '$lib/util/state';
+  import { themeStore } from '$lib/util/theme';
+  import { errorDebug, syncDiagram } from '$lib/util/util';
+  import type monaco from 'monaco-editor';
+  import { onMount } from 'svelte';
+  import initEditor from 'monaco-mermaid';
+  import { logEvent } from '$lib/util/stats';
+
+  let divEl: HTMLDivElement = null;
+  let editor: monaco.editor.IStandaloneCodeEditor;
+  let Monaco: typeof monaco;
+  let editorOptions: monaco.editor.IStandaloneEditorConstructionOptions = {
+    minimap: {
+      enabled: false
+    },
+    theme: 'mermaid',
+    overviewRulerLanes: 0
+  };
+  let text = '';
+
+  stateStore.subscribe(({ errorMarkers, editorMode, code, mermaid }) => {
+    console.log('editor store subscription', { code, mermaid });
+    if (!editor) return;
+
+    // Update editor text if it's different
+    const newText = editorMode === 'code' ? code : mermaid;
+    if (newText !== text) {
+      console.log('updating editor text', newText);
+      editor.setValue(newText);
+      text = newText;
+    }
+
+    // Update editor mode if it's different
+    const language = editorMode === 'code' ? 'mermaid' : 'json';
+    if (editor.getModel().getLanguageId() !== language) {
+      Monaco?.editor.setModelLanguage(editor.getModel(), language);
+    }
+
+    // Display/clear errors
+    Monaco?.editor.setModelMarkers(editor.getModel(), 'mermaid', errorMarkers);
+  });
+
+  themeStore.subscribe(({ isDark }) => {
+    editor && Monaco?.editor.setTheme(isDark ? 'mermaid-dark' : 'mermaid');
+  });
+
+  const handleUpdate = (text: string, mode: EditorMode) => {
+    console.log('editor HandleUpdate', { text, mode });
+    if (mode === 'code') {
+      updateCode(text);
+    } else {
+      updateConfig(text);
+    }
+  };
+
+  const loadMonaco = async () => {
+    console.log('Loading Monaco...');
+    // errorDebug();
+    let i = 0;
+    while (i++ < 500) {
+      // @ts-ignore : This is a hack to handle a svelte-kit error when importing monaco.
+      Monaco = window.monaco;
+      if (Monaco !== undefined) {
+        return;
+      }
+      await new Promise((r) => setTimeout(r, 100));
+    }
+    alert('Loading Monaco Editor failed. Please try refreshing the page.');
+  };
+
+  onMount(async () => {
+    await loadMonaco(); // Fix https://github.com/mermaid-js/mermaid-live-editor/issues/175
+    initEditor(Monaco);
+    errorDebug(100);
+    editor = Monaco.editor.create(divEl, editorOptions);
+    editor.onDidChangeModelContent(({ isFlush, changes }) => {
+      const newText = editor.getValue();
+      console.log('editor onDidChangeModelContent', { text, newText, isFlush, changes });
+      if (text === newText || isFlush) {
+        return;
+      }
+      text = newText;
+      handleUpdate(text, $stateStore.editorMode);
+    });
+    editor.addAction({
+      id: 'mermaid-render-diagram',
+      label: 'Render Diagram',
+      keybindings: [Monaco.KeyMod.CtrlCmd | Monaco.KeyCode.Enter],
+      run: function () {
+        syncDiagram();
+        logEvent('renderDiagram', {
+          method: 'keyboadShortcut'
+        });
+      }
+    });
+    Monaco?.editor.setTheme($themeStore.isDark ? 'mermaid-dark' : 'mermaid');
+    const resizeObserver = new ResizeObserver((entries) => {
+      editor.layout({
+        height: entries[0].contentRect.height,
+        width: entries[0].contentRect.width
+      });
+    });
+
+    resizeObserver.observe(divEl.parentElement);
+    console.log(`editor mounted`);
+    return () => {
+      console.log(`editor disposed`);
+      editor.dispose();
+    };
+  });
+</script>
+
+<div bind:this={divEl} id="editor" class="overflow-hidden" />

src/lib/components/History/History.svelte

@@ -0,0 +1,192 @@
+<script lang="ts">
+  import Card from '$lib/components/Card/Card.svelte';
+  import { inputStateStore, getStateString } from '$lib/util/state';
+  import {
+    addHistoryEntry,
+    historyModeStore,
+    clearHistoryData,
+    getPreviousState,
+    historyStore,
+    loaderHistoryStore,
+    restoreHistory
+  } from './history';
+  import { notify, prompt } from '$lib/util/notify';
+  import { onMount } from 'svelte';
+  import { get } from 'svelte/store';
+  import moment from 'moment';
+  import type { HistoryType, State, Tab } from '$lib/types';
+  import { logEvent } from '$lib/util/stats';
+
+  const HISTORY_SAVE_INTERVAL = 60000;
+
+  const tabSelectHandler = (message: CustomEvent<Tab>) => {
+    historyModeStore.set(message.detail.id as HistoryType);
+  };
+  let tabs: Tab[] = [
+    {
+      id: 'manual',
+      title: 'Saved',
+      icon: 'far fa-bookmark'
+    },
+    {
+      id: 'auto',
+      title: 'Timeline',
+      icon: 'fas fa-history'
+    }
+  ];
+
+  const downloadHistory = () => {
+    const data = get(historyStore);
+    const blob = new Blob([JSON.stringify(data)], { type: 'application/json' });
+    const url = URL.createObjectURL(blob);
+    const a = document.createElement('a');
+    a.href = url;
+    a.download = `mermaid-history-${moment().format('YYYY-MM-DD-HHmmss')}.json`;
+    a.click();
+    URL.revokeObjectURL(url);
+    logEvent('history', {
+      action: 'download'
+    });
+  };
+
+  const uploadHistory = () => {
+    const input = document.createElement('input');
+    input.type = 'file';
+    input.accept = 'application/json';
+    input.addEventListener('change', ({ target }: Event) => {
+      const file = (<HTMLInputElement>target).files[0];
+      if (!file) {
+        return;
+      }
+      const reader = new FileReader();
+      reader.onload = (e) => {
+        const data = JSON.parse(e.target.result as string);
+        restoreHistory(data);
+      };
+      reader.readAsText(file);
+    });
+    input.click();
+  };
+
+  const saveHistory = (auto = false) => {
+    const currentState: string = getStateString();
+    const previousState: string = getPreviousState(auto);
+    if (previousState !== currentState) {
+      addHistoryEntry({
+        state: $inputStateStore,
+        time: Date.now(),
+        type: auto ? 'auto' : 'manual'
+      });
+    } else if (!auto) {
+      notify('State already saved.');
+    }
+  };
+
+  const clearHistory = (id?: string): void => {
+    if (!id && !prompt('Clear all saved items?')) {
+      return;
+    }
+    clearHistoryData(id);
+  };
+
+  const restoreHistoryItem = (state: State): void => {
+    inputStateStore.set({ ...state, updateDiagram: true });
+  };
+
+  const relativeTime = (time: number) => {
+    const t = new Date(time);
+    return `${new Date(t).toLocaleString()} (${moment(t).fromNow()})`;
+  };
+
+  onMount(() => {
+    historyModeStore.set('manual');
+    setInterval(() => {
+      saveHistory(true);
+    }, HISTORY_SAVE_INTERVAL);
+  });
+
+  loaderHistoryStore.subscribe((entries) => {
+    if (entries.length > 0 && tabs.length === 2) {
+      tabs = [
+        {
+          id: 'loader',
+          title: 'Revisions',
+          icon: 'fab fa-git-alt'
+        },
+        ...tabs
+      ];
+      historyModeStore.set('loader');
+    }
+  });
+
+  let isOpen = false;
+</script>
+
+<Card on:select={tabSelectHandler} bind:isOpen {tabs} title="History">
+  <div slot="actions">
+    <button
+      id="uploadHistory"
+      class="btn btn-xs btn-secondary w-12"
+      on:click|stopPropagation={() => uploadHistory()}
+      title="Upload history"><i class="fa fa-upload" /></button>
+    {#if $historyStore.length > 0}
+      <button
+        id="downloadHistory"
+        class="btn btn-xs btn-secondary w-12"
+        on:click|stopPropagation={() => downloadHistory()}
+        title="Download history"><i class="fa fa-download" /></button>
+    {/if}
+    |
+    <button
+      id="saveHistory"
+      class="btn btn-xs btn-success w-12"
+      on:click|stopPropagation={() => saveHistory()}
+      title="Save current state"><i class="far fa-save" /></button>
+    {#if $historyModeStore !== 'loader'}
+      <button
+        id="clearHistory"
+        class="btn btn-xs btn-error w-12"
+        on:click|stopPropagation={() => clearHistory()}
+        title="Delete all saved states"><i class="fas fa-trash-alt" /></button>
+    {/if}
+  </div>
+  <ul class="p-2 space-y-2 overflow-auto h-56" id="historyList">
+    {#if $historyStore.length > 0}
+      {#each $historyStore as { id, state, time, name, url, type }}
+        <li class="rounded p-2 shadow flex-col">
+          <div class="flex">
+            <div class="flex-1">
+              <div class="flex flex-col text-base-content">
+                {#if url}
+                  <a
+                    href={url}
+                    target="_blank"
+                    rel="noreferrer"
+                    title="Open revision in new tab"
+                    class="hover:underline text-blue-500">{name}</a>
+                {:else}
+                  <span>{name}</span>
+                {/if}
+                <span class="text-gray-400 text-sm">{relativeTime(time)}</span>
+              </div>
+            </div>
+            <div class="flex gap-2 content-center">
+              <button class="btn btn-success" on:click={() => restoreHistoryItem(state)}
+                ><i class="fas fa-undo mr-1" />Restore</button>
+              {#if type !== 'loader'}
+                <button class="btn btn-error" on:click={() => clearHistory(id)}
+                  ><i class="fas fa-trash-alt mr-1" />Delete</button>
+              {/if}
+            </div>
+          </div>
+        </li>
+      {/each}
+    {:else}
+      <div class="m-2">
+        No items in History<br />
+        Click the Save button to save current state and restore it later.<br />
+        Timeline will automatically be saved every minute.
+      </div>
+    {/if}
+  </ul>
+</Card>

src/lib/components/History/history.test.ts

@@ -0,0 +1,120 @@
+import type { HistoryEntry } from '$lib/types';
+import { describe, it, expect } from 'vitest';
+import {
+  addHistoryEntry,
+  injectHistoryIDs,
+  clearHistoryData,
+  historyModeStore,
+  historyStore
+} from './history';
+import { defaultState } from '$lib/util/state';
+import { get } from 'svelte/store';
+
+describe('history', () => {
+  it('should handle saving individual history entry', () => {
+    expect(window.localStorage.getItem('manualHistoryStore')).toBe('[]');
+    expect(window.localStorage.getItem('autoHistoryStore')).toBe('[]');
+
+    addHistoryEntry({
+      state: defaultState,
+      time: 12345,
+      type: 'manual'
+    });
+
+    const [manualEntry]: HistoryEntry[] = JSON.parse(
+      window.localStorage.getItem('manualHistoryStore')
+    );
+
+    expect(manualEntry.time).toBe(12345);
+    expect(manualEntry.type).toBe('manual');
+    expect(manualEntry.name).not.toBeNull();
+    expect(manualEntry.state).not.toBeNull();
+
+    addHistoryEntry({
+      state: defaultState,
+      time: 54321,
+      type: 'auto'
+    });
+
+    const [autoEntry]: HistoryEntry[] = JSON.parse(window.localStorage.getItem('autoHistoryStore'));
+
+    expect(autoEntry.time).toBe(54321);
+    expect(autoEntry.type).toBe('auto');
+    expect(autoEntry.name).not.toBeNull();
+    expect(autoEntry.state).not.toBeNull();
+
+    historyModeStore.set('manual');
+    clearHistoryData();
+    historyModeStore.set('auto');
+    clearHistoryData();
+    expect(window.localStorage.getItem('manualHistoryStore')).toBe('[]');
+    expect(window.localStorage.getItem('autoHistoryStore')).toBe('[]');
+  });
+
+  it('should clear history entries', () => {
+    addHistoryEntry({
+      state: defaultState,
+      time: 12345,
+      type: 'manual'
+    });
+    addHistoryEntry({
+      state: { ...defaultState, code: 'graph TD\\n    A[Christmas] -->|Get money| B(Go shopping)' },
+      time: 123456,
+      type: 'manual'
+    });
+
+    historyModeStore.set('manual');
+    const store: HistoryEntry[] = get(historyStore);
+    expect(store.length).toBe(2);
+    clearHistoryData(store[1].id);
+    expect(get(historyStore).length).toBe(1);
+    clearHistoryData();
+    expect(get(historyStore).length).toBe(0);
+
+    historyModeStore.set('auto');
+    addHistoryEntry({
+      state: defaultState,
+      time: 54321,
+      type: 'auto'
+    });
+    addHistoryEntry({
+      state: { ...defaultState, code: 'graph TD\\n    A[Christmas] -->|Get money| B(Go shopping)' },
+      time: 654321,
+      type: 'auto'
+    });
+    expect(get(historyStore).length).toBe(2);
+    clearHistoryData();
+    expect(get(historyStore).length).toBe(0);
+    // Test calling when history is empty
+    clearHistoryData();
+    expect(get(historyStore).length).toBe(0);
+  });
+});
+
+describe('history migration', () => {
+  it('should inject history IDs as migration', () => {
+    window.localStorage.setItem(
+      'manualHistoryStore',
+      '[{"state":{"code":"graph TD\\n    A[Halloween] -->|Get money| B(Go shopping)","mermaid":"{\\n  \\"theme\\": \\"dark\\"\\n}","autoSync":true,"updateDiagram":false},"time":0,"type":"manual","name":"hollow-art"},{"state":{"code":"graph TD\\n    A[Christmas] -->|Get money| B(Go shopping)","mermaid":"{\\n  \\"theme\\": \\"dark\\"\\n}","autoSync":true,"updateDiagram":true},"time":0,"type":"manual","name":"helpful-ocean"}]'
+    );
+    window.localStorage.setItem(
+      'autoHistoryStore',
+      '[{"state":{"code":"graph TD\\n    A[New Year] -->|Get money| B(Go shopping)","mermaid":"{\\n  \\"theme\\": \\"dark\\"\\n}","autoSync":true,"updateDiagram":false},"time":0,"type":"auto","name":"barking-dog"},{"state":{"code":"graph TD\\n    A[Christmas] -->|Get money| B(Go shopping)","mermaid":"{\\n  \\"theme\\": \\"dark\\"\\n}","autoSync":true,"updateDiagram":true},"time":0,"type":"manual","name":"needy-mosquito"}]'
+    );
+    let manualHistoryStore: HistoryEntry[] = JSON.parse(
+      window.localStorage.getItem('manualHistoryStore')
+    );
+    let autoHistoryStore: HistoryEntry[] = JSON.parse(
+      window.localStorage.getItem('autoHistoryStore')
+    );
+    expect(manualHistoryStore.every(({ id }) => id !== undefined)).toBe(false);
+    expect(autoHistoryStore.every(({ id }) => id !== undefined)).toBe(false);
+
+    injectHistoryIDs();
+
+    manualHistoryStore = JSON.parse(window.localStorage.getItem('manualHistoryStore'));
+    autoHistoryStore = JSON.parse(window.localStorage.getItem('autoHistoryStore'));
+    expect(manualHistoryStore.every(({ id }) => id !== undefined)).toBe(true);
+    expect(autoHistoryStore.every(({ id }) => id !== undefined)).toBe(true);
+  });
+});

src/lib/components/History/history.ts

@@ -0,0 +1,141 @@
+import { derived, writable, get } from 'svelte/store';
+import type { Readable, Writable } from 'svelte/store';
+import { persist, localStorage } from '$lib/util/persist';
+import { generateSlug } from 'random-word-slugs';
+import type { HistoryEntry, HistoryType, Optional } from '$lib/types';
+import { v4 as uuidV4 } from 'uuid';
+import { logEvent } from '$lib/util/stats';
+
+const MAX_AUTO_HISTORY_LENGTH = 30;
+
+export const historyModeStore: Writable<HistoryType> = persist(
+  writable('manual'),
+  localStorage(),
+  'autoHistoryMode'
+);
+
+const autoHistoryStore: Writable<HistoryEntry[]> = persist(
+  writable([]),
+  localStorage(),
+  'autoHistoryStore'
+);
+
+const manualHistoryStore: Writable<HistoryEntry[]> = persist(
+  writable([]),
+  localStorage(),
+  'manualHistoryStore'
+);
+
+export const loaderHistoryStore: Writable<HistoryEntry[]> = writable([] as HistoryEntry[]);
+
+export const historyStore: Readable<HistoryEntry[]> = derived(
+  [historyModeStore, autoHistoryStore, manualHistoryStore, loaderHistoryStore],
+  ([historyMode, autoHistories, manualHistories, loadedHistories], set) => {
+    if (historyMode === 'auto') {
+      set(autoHistories);
+    } else if (historyMode === 'manual') {
+      set(manualHistories);
+    } else if (historyMode === 'loader') {
+      set(loadedHistories);
+    } else {
+      set(autoHistories);
+    }
+  }
+);
+
+export const addHistoryEntry = (entryToAdd: Optional<HistoryEntry, 'id'>): void => {
+  const entry: HistoryEntry = {
+    ...entryToAdd,
+    id: uuidV4()
+  };
+
+  if (entry.type === 'loader') {
+    loaderHistoryStore.update((entries) => [entry, ...entries]);
+    return;
+  }
+
+  if (!entry.name) {
+    entry.name = generateSlug(2);
+  }
+
+  if (entry.type === 'auto') {
+    autoHistoryStore.update((entries) => {
+      if (entries.length >= MAX_AUTO_HISTORY_LENGTH) {
+        entries = entries.slice(0, MAX_AUTO_HISTORY_LENGTH - 1);
+      }
+      return [entry, ...entries];
+    });
+  } else if (entry.type === 'manual') {
+    manualHistoryStore.update((entries) => [entry, ...entries]);
+    logEvent('history', { action: 'save' });
+  }
+};
+
+export const clearHistoryData = (idToClear?: string): void => {
+  (get(historyModeStore) === 'auto' ? autoHistoryStore : manualHistoryStore).update((entries) => {
+    if (get(historyModeStore) !== 'loader') {
+      entries = entries.filter(({ id }) => idToClear && id != idToClear);
+      logEvent('history', { action: 'clear', type: idToClear ? 'single' : 'all' });
+    }
+    return entries;
+  });
+};
+
+export const getPreviousState = (auto: boolean): string => {
+  const entries = get(auto ? autoHistoryStore : manualHistoryStore);
+  if (entries.length > 0) {
+    return JSON.stringify(entries[0].state);
+  }
+  return '';
+};
+
+export const restoreHistory = (data: HistoryEntry[]) => {
+  const entries = data.filter(validateEntry);
+  const invalidEntryCount = data.length - entries.length;
+  if (invalidEntryCount > 0) {
+    console.error(`${invalidEntryCount} invalid history entries were removed.`);
+    console.error(data);
+  }
+  if (entries.length > 0) {
+    let entryCount = 0;
+    (entries[0].type === 'auto' ? autoHistoryStore : manualHistoryStore).update((existing) => {
+      const existingIDs = new Set(existing.map(({ id }) => id));
+      const newEntries = entries.filter(({ id }) => !existingIDs.has(id));
+      entryCount = newEntries.length;
+      const combined = [...existing, ...newEntries];
+      combined.sort((a, b) => b.time - a.time);
+      return combined;
+    });
+
+    alert(
+      `${entryCount} entries restored. ${invalidEntryCount} invalid, ${
+        entries.length - entryCount
+      } duplicates.`
+    );
+    logEvent('history', {
+      action: 'restore',
+      success: entryCount,
+      invalid: invalidEntryCount,
+      duplicates: entries.length - entryCount
+    });
+  } else {
+    alert('No valid entries found.');
+  }
+};
+
+export const injectHistoryIDs = (): void => {
+  const setIDs = (entries: HistoryEntry[]) => {
+    for (const entry of entries) {
+      if (!entry.id) {
+        entry.id = uuidV4();
+      }
+    }
+    return entries;
+  };
+  autoHistoryStore.update(setIDs);
+  manualHistoryStore.update(setIDs);
+};
+
+const validateEntry = (entry: HistoryEntry): boolean => {
+  return entry.type && entry.state && entry.time && true;
+};

src/lib/components/Navbar.svelte

@@ -0,0 +1,82 @@
+<script context="module">
+  import { version } from 'mermaid/package.json';
+  import { analytics } from '$lib/util/stats';
+  analytics?.track('version', {
+    mermaidVersion: version
+  });
+</script>
+
+<script lang="ts">
+  import Theme from './Theme.svelte';
+
+  interface Link {
+    title: string;
+    href: string;
+    icon?: string;
+  }
+  const links: Link[] = [
+    {
+      title: 'Documentation',
+      href: 'https://mermaid-js.github.io/mermaid/#/n00b-gettingStarted'
+    },
+    {
+      title: 'Tutorial',
+      href: 'https://github.com/mermaid-js/mermaid/blob/develop/docs/Tutorials.md'
+    },
+    {
+      title: 'Mermaid',
+      href: 'https://github.com/mermaid-js/mermaid'
+    },
+    {
+      title: 'CLI',
+      href: 'https://github.com/mermaid-js/mermaid-cli'
+    },
+    {
+      title: '',
+      href: 'https://github.com/mermaid-js/mermaid-live-editor',
+      icon: 'fab fa-github fa-lg'
+    }
+  ];
+</script>
+
+<div class="navbar shadow-lg bg-primary p-0">
+  <div class="flex-1 px-2 mx-2">
+    <span class="text-lg font-bold">
+      <a href="/">Mermaid<span class="text-xs font-thin">v{version}</span> Live Editor</a>
+    </span>
+  </div>
+  <label for="menu-toggle" class="pointer-cursor lg:hidden block"
+    ><svg
+      class="fill-current "
+      xmlns="http://www.w3.org/2000/svg"
+      width="20"
+      height="20"
+      viewBox="0 0 20 20"
+      ><title>Menu</title><path d="M0 3h20v2H0V3zm0 6h20v2H0V9zm0 6h20v2H0v-2z" /></svg
+    ></label>
+  <input class="hidden" type="checkbox" id="menu-toggle" />
+
+  <Theme />
+  <div class="hidden lg:flex lg:items-center lg:w-auto w-full" id="menu">
+    <ul class="lg:flex items-center justify-between text-base pt-4 lg:pt-0">
+      {#each links as { title, href, icon }}
+        <li>
+          <a class="btn btn-ghost" target="_blank" rel="noreferrer" {href}>
+            {#if icon}
+              <i class={icon} />
+            {/if}
+            {title}</a>
+        </li>
+      {/each}
+    </ul>
+  </div>
+</div>
+
+<style>
+  #menu-toggle:checked + #menu {
+    display: block;
+  }
+  .navbar {
+    z-index: 10000;
+  }
+</style>

src/lib/components/Preset.svelte

@@ -0,0 +1,144 @@
+<script lang="ts">
+  import { updateCode } from '$lib/util/state';
+  import Card from '$lib/components/Card/Card.svelte';
+  import { logEvent } from '$lib/util/stats';
+
+  const samples = {
+    Flow: `graph TD
+    A[Christmas] -->|Get money| B(Go shopping)
+    B --> C{Let me think}
+    C -->|One| D[Laptop]
+    C -->|Two| E[iPhone]
+    C -->|Three| F[fa:fa-car Car]`,
+    Sequence: `sequenceDiagram
+    Alice->>+John: Hello John, how are you?
+    Alice->>+John: John, can you hear me?
+    John-->>-Alice: Hi Alice, I can hear you!
+    John-->>-Alice: I feel great!`,
+    Class: `classDiagram
+    Animal <|-- Duck
+    Animal <|-- Fish
+    Animal <|-- Zebra
+    Animal : +int age
+    Animal : +String gender
+    Animal: +isMammal()
+    Animal: +mate()
+    class Duck{
+      +String beakColor
+      +swim()
+      +quack()
+    }
+    class Fish{
+      -int sizeInFeet
+      -canEat()
+    }
+    class Zebra{
+      +bool is_wild
+      +run()
+    }`,
+    State: `stateDiagram-v2
+    [*] --> Still
+    Still --> [*]
+    Still --> Moving
+    Moving --> Still
+    Moving --> Crash
+    Crash --> [*]`,
+    Gantt: `gantt
+    title A Gantt Diagram
+    dateFormat  YYYY-MM-DD
+    section Section
+    A task           :a1, 2014-01-01, 30d
+    Another task     :after a1  , 20d
+    section Another
+    Task in sec      :2014-01-12  , 12d
+    another task      : 24d`,
+    Pie: `pie title Pets adopted by volunteers
+    "Dogs" : 386
+    "Cats" : 85
+    "Rats" : 15`,
+    ER: `erDiagram
+    CUSTOMER }|..|{ DELIVERY-ADDRESS : has
+    CUSTOMER ||--o{ ORDER : places
+    CUSTOMER ||--o{ INVOICE : "liable for"
+    DELIVERY-ADDRESS ||--o{ ORDER : receives
+    INVOICE ||--|{ ORDER : covers
+    ORDER ||--|{ ORDER-ITEM : includes
+    PRODUCT-CATEGORY ||--|{ PRODUCT : contains
+    PRODUCT ||--o{ ORDER-ITEM : "ordered in"`,
+    'User Journey': `journey
+    title My working day
+    section Go to work
+      Make tea: 5: Me
+      Go upstairs: 3: Me
+      Do work: 1: Me, Cat
+    section Go home
+      Go downstairs: 5: Me
+      Sit down: 3: Me`,
+    Git: `gitGraph
+    commit
+    commit
+    branch develop
+    checkout develop
+    commit
+    commit
+    checkout main
+    merge develop
+    commit
+    commit`,
+    Mindmap: `mindmap
+  root((mindmap))
+    Origins
+      Long history
+      ::icon(fa fa-book)
+      Popularisation
+        British popular psychology author Tony Buzan
+    Research
+      On effectivness<br/>and features
+      On Automatic creation
+        Uses
+            Creative techniques
+            Strategic planning
+            Argument mapping
+    Tools
+      Pen and paper
+      Mermaid`
+  };
+
+  const loadSampleDiagram = (diagramType: string): void => {
+    updateCode(samples[diagramType], {
+      updateDiagram: true,
+      resetPanZoom: true
+    });
+    logEvent('loadSampleDiagram', { diagramType });
+  };
+
+  // Adding in this array will add an icon to the preset menu
+  const newDiagrams: Array<keyof typeof samples> = ['Mindmap'];
+  const diagramOrder: Array<keyof typeof samples> = [
+    'Sequence',
+    'Flow',
+    'Class',
+    'State',
+    'ER',
+    'Gantt',
+    'User Journey',
+    'Git',
+    'Pie',
+    'Mindmap'
+  ];
+</script>
+
+<Card title="Sample Diagrams" isOpen={false}>
+  <div class="flex flex-wrap p-2 gap-2">
+    {#each diagramOrder as sample}
+      <button
+        class="btn btn-sm btn-primary w-28 normal-case flex-grow"
+        on:click={() => loadSampleDiagram(sample)}>
+        {sample}
+        {#if newDiagrams.includes(sample)}
+          <span class="ml-2 fa fa-heart" />
+        {/if}
+      </button>
+    {/each}
+  </div>
+</Card>

src/lib/components/Theme.svelte

@@ -0,0 +1,64 @@
+<script>
+  import { setTheme, themeStore } from '$lib/util/theme';
+
+  const themes = [
+    '🌝 light',
+    '🌚 dark',
+    '🧁 cupcake',
+    '🐝 bumblebee',
+    '✳️ emerald',
+    '🏢 corporate',
+    '🌃 synthwave',
+    '👴 retro',
+    '🤖 cyberpunk',
+    '🌸 valentine',
+    '🎃 halloween',
+    '🌷 garden',
+    '🌲 forest',
+    '🐟 aqua',
+    '👓 lofi',
+    '🖍 pastel',
+    '🧚‍♀️ fantasy',
+    '📝 wireframe',
+    '🏴 black',
+    '💎 luxury',
+    '🧛‍♂️ dracula'
+  ];
+</script>
+
+<div class="hidden lg:block dropdown">
+  <!-- svelte-ignore a11y-no-noninteractive-tabindex -->
+  <div tabindex="0" class="btn btn-ghost ">
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      fill="none"
+      viewBox="0 0 24 24"
+      class="inline-block w-6 h-6 stroke-current md:mr-2"
+      ><path
+        stroke-linecap="round"
+        stroke-linejoin="round"
+        stroke-width="2"
+        d="M7 21a4 4 0 01-4-4V5a2 2 0 012-2h4a2 2 0 012 2v12a4 4 0 01-4 4zm0 0h12a2 2 0 002-2v-4a2 2 0 00-2-2h-2.343M11 7.343l1.657-1.657a2 2 0 012.828 0l2.829 2.829a2 2 0 010 2.828l-8.486 8.485M7 17h.01" /></svg>
+    <span class="hidden md:inline"> Change Theme </span>
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="0 0 1792 1792"
+      class="inline-block w-4 h-4 ml-1 fill-current"
+      ><path
+        d="M1395 736q0 13-10 23l-466 466q-10 10-23 10t-23-10l-466-466q-10-10-10-23t10-23l50-50q10-10 23-10t23 10l393 393 393-393q10-10 23-10t23 10l50 50q10 10 10 23z" /></svg>
+  </div>
+  <div
+    class="mt-14 overflow-y-auto shadow-2xl top-px dropdown-content h-96 w-56 bg-base-200 text-base-content">
+    <!-- svelte-ignore a11y-no-noninteractive-tabindex -->
+    <ul tabindex="0" class="p-4 menu compact">
+      {#each themes as theme}
+        <li class={theme.includes($themeStore.theme) ? 'bordered' : ''}>
+          <span
+            class="btn btn-ghost justify-start"
+            on:click={() => setTheme(theme)}
+            on:keypress={() => setTheme(theme)}>{theme}</span>
+        </li>
+      {/each}
+    </ul>
+  </div>
+</div>

src/lib/components/View.svelte

@@ -0,0 +1,157 @@
+<script lang="ts">
+  import { inputStateStore, stateStore, updateCodeStore } from '$lib/util/state';
+  import { onMount } from 'svelte';
+  import panzoom from 'svg-pan-zoom';
+  import type { State, ValidatedState } from '$lib/types';
+  import { logEvent } from '$lib/util/stats';
+  import { AsyncQueue, cmdKey } from '$lib/util/util';
+  import { render as renderDiagram } from '$lib/util/mermaid';
+
+  let code = '';
+  let config = '';
+  let container: HTMLDivElement;
+  let view: HTMLDivElement;
+  let error = false;
+  let outOfSync = false;
+  let hide = false;
+  let manualUpdate = true;
+  let panZoomEnabled = $stateStore.panZoom;
+  let pzoom: SvgPanZoom.Instance;
+
+  const handlePanZoomChange = () => {
+    const pan = pzoom.getPan();
+    const zoom = pzoom.getZoom();
+    updateCodeStore({ pan, zoom });
+    logEvent('panZoom');
+  };
+
+  const handlePanZoom = (state: State) => {
+    if (!state.panZoom) {
+      return;
+    }
+    hide = true;
+    pzoom?.destroy();
+    pzoom = undefined;
+    Promise.resolve().then(() => {
+      const graphDiv = document.getElementById('graph-div');
+      pzoom = panzoom(graphDiv, {
+        onPan: handlePanZoomChange,
+        onZoom: handlePanZoomChange,
+        controlIconsEnabled: true,
+        fit: true,
+        center: true
+      });
+      const { pan, zoom } = state;
+      if (pan !== undefined && zoom !== undefined && Number.isFinite(zoom)) {
+        pzoom.zoom(zoom);
+        pzoom.pan(pan);
+      }
+      hide = false;
+    });
+  };
+
+  const handleStateChange = async (state: ValidatedState) => {
+    if (state.error !== undefined) {
+      error = true;
+      return;
+    }
+    error = false;
+    try {
+      if (container && state && (state.updateDiagram || state.autoSync)) {
+        if (!state.autoSync) {
+          $inputStateStore.updateDiagram = false;
+        }
+        outOfSync = false;
+        manualUpdate = true;
+        // Do not render if there is no change in Code/Config/PanZoom
+        if (code === state.code && config === state.mermaid && panZoomEnabled === state.panZoom) {
+          return;
+        }
+        code = state.code;
+        config = state.mermaid;
+        panZoomEnabled = state.panZoom;
+        const scroll = view.parentElement.scrollTop;
+        delete container.dataset.processed;
+        await renderDiagram(
+          Object.assign({}, JSON.parse(state.mermaid)),
+          code,
+          'graph-div',
+          (svgCode, bindFunctions) => {
+            if (svgCode.length > 0) {
+              handlePanZoom(state);
+              container.innerHTML = svgCode;
+              // console.log(container.innerHTML);
+              const graphDiv = document.getElementById('graph-div');
+              graphDiv.setAttribute('height', '100%');
+              graphDiv.style.maxWidth = '100%';
+              if (bindFunctions) {
+                bindFunctions(graphDiv);
+              }
+            }
+          }
+        );
+        view.parentElement.scrollTop = scroll;
+        error = false;
+      } else if (manualUpdate) {
+        manualUpdate = false;
+      } else if (code !== state.code || config !== state.mermaid) {
+        outOfSync = true;
+      }
+    } catch (e) {
+      console.error('view fail', e);
+      error = true;
+    }
+  };
+
+  const q = new AsyncQueue(handleStateChange);
+
+  onMount(() => {
+    stateStore.subscribe(async (state) => {
+      await q.process(state);
+    });
+    window.addEventListener('resize', () => {
+      if ($stateStore.panZoom && pzoom) {
+        pzoom.resize();
+      }
+    });
+    console.log('View mounted');
+  });
+</script>
+
+{#if (error && $stateStore.error instanceof Error) || outOfSync}
+  <div
+    class="absolute w-full p-2 z-10 {error
+      ? 'text-red-600'
+      : 'text-yellow-600'} bg-base-100 bg-opacity-80 text-center"
+    id="errorContainer">
+    {#if error}
+      {$stateStore.error}
+    {:else}
+      Diagram out of sync. <br />
+      Press <i class="fas fa-sync" /> (Sync button) or <kbd>{cmdKey} + Enter</kbd> to sync.
+    {/if}
+  </div>
+{/if}
+
+<div id="view" bind:this={view} class="p-2 h-full" class:error class:outOfSync>
+  <div id="container" bind:this={container} class="h-full overflow-auto" class:hide />
+</div>
+
+<style>
+  #view {
+    flex: 1;
+  }
+
+  #container {
+    transition: visibility 0.3s;
+  }
+
+  .error,
+  .outOfSync {
+    opacity: 0.5;
+  }
+
+  .hide {
+    visibility: hidden;
+  }
+</style>

src/lib/components/actions.svelte

@@ -1,12 +1,13 @@
 <script lang="ts">
-	import { browser } from '$app/env';
-	import Card from '$lib/components/card/card.svelte';
-	import { krokiRendererUrl, rendererUrl } from '$lib/util/env';
+  import { browser } from '$app/environment';
+  import Card from '$lib/components/Card/Card.svelte';
+  import { env } from '$lib/util/env';
   import { pakoSerde } from '$lib/util/serde';
   import { stateStore } from '$lib/util/state';
   import { logEvent } from '$lib/util/stats';
   import { toBase64 } from 'js-base64';
   import moment from 'moment';
+  const { krokiRendererUrl, rendererUrl } = env;
 
   type Exporter = (context: CanvasRenderingContext2D, image: HTMLImageElement) => () => void;
 
@@ -115,23 +116,27 @@
 
   const onCopyClipboard = (event: Event) => {
     exportImage(event, clipboardCopy);
-		void logEvent('copyClipboard');
+    logEvent('copyClipboard');
   };
 
   const onDownloadPNG = (event: Event) => {
     exportImage(event, downloadImage);
-		void logEvent('downloadPNG');
+    logEvent('download', {
+      type: 'png'
+    });
   };
 
   const onDownloadSVG = () => {
     simulateDownload(getFileName('svg'), `data:image/svg+xml;base64,${getBase64SVG()}`);
-		void logEvent('downloadSVG');
+    logEvent('download', {
+      type: 'svg'
+    });
   };
 
   const onCopyMarkdown = () => {
     (document.getElementById('markdown') as HTMLInputElement).select();
     document.execCommand('Copy');
-		void logEvent('copyMarkdown');
+    logEvent('copyMarkdown');
   };
 
   let gistURL = '';
@@ -147,7 +152,7 @@
       alert('Please enter a Gist URL first');
     }
     window.location.href = `${window.location.pathname}?gist=${gistURL}`;
-		void logEvent('loadGist');
+    logEvent('loadGist');
   };
 
   let iUrl: string;
@@ -161,8 +166,9 @@
   if (browser && ['mermaid.live', 'netlify'].some((path) => window.location.host.includes(path))) {
     isNetlify = true;
   }
-	stateStore.subscribe(({ code, serialized }) => {
-		iUrl = `${rendererUrl}/img/${serialized}`;
+  stateStore.subscribe(async (state) => {
+    const { code, serialized } = await state;
+    iUrl = `${rendererUrl}/img/${serialized}?type=png`;
     svgUrl = `${rendererUrl}/svg/${serialized}`;
     krokiUrl = `${krokiRendererUrl}/mermaid/svg/${pakoSerde.serialize(code)}`;
     mdCode = `[![](${iUrl})](${window.location.protocol}//${window.location.host}${window.location.pathname}#${serialized})`;
@@ -176,26 +182,24 @@
         ><i class="far fa-copy mr-2" /> Copy Image to clipboard
       </button>
     {/if}
-		<button id="downloadPNG" class="action-btn flex-auto" on:click={onDownloadPNG}>
+    <button id="downloadPNG" class="action-btn flex-grow" on:click={onDownloadPNG}>
       <i class="fas fa-download mr-2" /> PNG
     </button>
-		<button id="downloadSVG" class="action-btn flex-auto" on:click={onDownloadSVG}>
+    <button id="downloadSVG" class="action-btn flex-grow" on:click={onDownloadSVG}>
       <i class="fas fa-download mr-2" /> SVG
     </button>
-		<a target="_blank" href={iUrl}>
-			<button class="action-btn flex-auto">
+    <a target="_blank" rel="noreferrer" class="flex-grow" href={iUrl}>
+      <button class="action-btn w-full">
         <i class="fas fa-external-link-alt mr-2" /> PNG
       </button>
     </a>
-
-		<a target="_blank" href={svgUrl}>
-			<button class="action-btn flex-auto">
+    <a target="_blank" rel="noreferrer" class="flex-grow" href={svgUrl}>
+      <button class="action-btn w-full">
         <i class="fas fa-external-link-alt mr-2" /> SVG
       </button>
     </a>
-
-		<a target="_blank" href={krokiUrl}>
-			<button class="action-btn flex-auto">
+    <a target="_blank" rel="noreferrer" class="flex-grow" href={krokiUrl}>
+      <button class="action-btn w-full">
         <i class="fas fa-external-link-alt mr-2" /> Kroki
       </button>
     </a>

src/lib/components/card/card.svelte

@@ -1,10 +1,11 @@
 <script lang="ts">
   import type { Tab } from '$lib/types';
   import { slide } from 'svelte/transition';
-	import Tabs from './tabs.svelte';
+  import Tabs from './Tabs.svelte';
   export let isCloseable = true;
   export let isOpen = true;
   export let tabs: Tab[] = [];
+  export let activeTabID: string = '';
   export let title: string;
   $: isOpen = isCloseable ? isOpen : true;
   $: isTabsShown = isOpen && tabs.length > 0;
@@ -13,9 +14,10 @@
 <div class="card rounded overflow-hidden m-2 flex-grow flex flex-col shadow-2xl">
   <div
     class="bg-primary p-2 {isTabsShown ? 'pb-0' : ''} flex-none cursor-pointer"
-		on:click={() => (isOpen = !isOpen)}>
+    on:click={() => (isOpen = !isOpen)}
+    on:keypress={() => (isOpen = !isOpen)}>
     <div class="flex justify-between">
-			<Tabs on:select {tabs} bind:isOpen {title} {isCloseable} />
+      <Tabs on:select {tabs} bind:isOpen {title} {isCloseable} {activeTabID} />
       <div class="flex gap-x-4 items-center {isTabsShown ? '-mt-2' : ''}">
         <slot name="actions" />
       </div>

src/lib/components/card/card.test.ts

@@ -1,6 +1,6 @@
 import { cleanup, render } from '@testing-library/svelte';
 import { describe, expect, it, afterEach } from 'vitest';
-import Card from './card.svelte';
+import Card from './Card.svelte';
 
 describe('card.svelte', () => {
   // TODO: @testing-library/svelte claims to add this automatically but it doesn't work without explicit afterEach

src/lib/components/card/tabs.svelte

@@ -3,12 +3,14 @@
   import { createEventDispatcher } from 'svelte';
   import { fade } from 'svelte/transition';
   export let isCloseable = true;
-	export let tabs: Tab[] = [];
+  export let tabs: Tab[];
   export let title: string;
   export let isOpen = false;
+  export let activeTabID: string;
 
-	$: activeTabID = tabs[0]?.id;
-
+  if (!activeTabID && tabs.length > 0) {
+    activeTabID = tabs[0].id;
+  }
   const dispatch = createEventDispatcher<TabEvents>();
   const toggleTabs = (tab: Tab) => {
     activeTabID = tab.id;
@@ -17,7 +19,10 @@
 </script>
 
 <div class="flex cursor-default">
-	<span class="mr-2 font-semibold" on:click|stopPropagation={() => (isOpen = !isOpen)}>
+  <span
+    class="mr-2 font-semibold"
+    on:click|stopPropagation={() => (isOpen = !isOpen)}
+    on:keypress|stopPropagation={() => (isOpen = !isOpen)}>
     {#if isCloseable}
       <i class="fas fa-chevron-right icon" class:isOpen />
     {/if}
@@ -27,7 +32,8 @@
       {#each tabs as tab}
         <div
           class="tab tab-lifted {activeTabID === tab.id ? 'tab-active' : 'text-primary-content'}"
-					on:click|stopPropagation={() => toggleTabs(tab)}>
+          on:click|stopPropagation={() => toggleTabs(tab)}
+          on:keypress|stopPropagation={() => toggleTabs(tab)}>
           <i class="mr-1 {tab.icon}" />
           {tab.title}
         </div>

src/lib/components/editor.svelte

@@ -1,100 +0,0 @@
-<script lang="ts">
-	import type { EditorEvents } from '$lib/types';
-	import { stateStore } from '$lib/util/state';
-	import { themeStore } from '$lib/util/theme';
-	import { syncDiagram } from '$lib/util/util';
-	import type monaco from 'monaco-editor';
-	import { createEventDispatcher, onMount } from 'svelte';
-	import initEditor from 'monaco-mermaid';
-	import { logEvent } from '$lib/util/stats';
-
-	let divEl: HTMLDivElement = null;
-	let editor: monaco.editor.IStandaloneCodeEditor;
-	let Monaco;
-
-	export let text: string;
-	export let language: string;
-	export let editorOptions: monaco.editor.IStandaloneEditorConstructionOptions = {
-		value: text,
-		language: language,
-		minimap: {
-			enabled: false
-		},
-		theme: 'mermaid',
-		overviewRulerLanes: 0
-	};
-	let oldText = text;
-	$: editor && Monaco?.editor.setModelLanguage(editor.getModel(), language);
-
-	const handleTextUpdate = (newText: string) => {
-		if (newText !== oldText) {
-			if ($stateStore.updateEditor) {
-				editor?.setValue(newText);
-			}
-			oldText = newText;
-		}
-		editor && Monaco?.editor.setModelMarkers(editor.getModel(), 'test', $stateStore.errorMarkers);
-	};
-
-	$: handleTextUpdate(text);
-
-	themeStore.subscribe(({ isDark }) => {
-		editor && Monaco?.editor.setTheme(isDark ? 'mermaid-dark' : 'mermaid');
-	});
-
-	const dispatch = createEventDispatcher<EditorEvents>();
-	const loadMonaco = async () => {
-		let i = 0;
-		while (i++ < 10) {
-			try {
-				// @ts-ignore : This is a hack to handle a svelte-kit error when importing monaco.
-				Monaco = monaco;
-				return;
-			} catch {
-				await new Promise((r) => setTimeout(r, 500));
-			}
-		}
-		alert('Loading Monaco Editor failed. Please try refreshing the page.');
-	};
-	onMount(async () => {
-		try {
-			// @ts-ignore : This is a hack to handle a svelte-kit error when importing monaco.
-			Monaco = monaco;
-		} catch {
-			await loadMonaco(); // Fix https://github.com/mermaid-js/mermaid-live-editor/issues/175
-		}
-		initEditor(Monaco);
-		editor = Monaco.editor.create(divEl, editorOptions);
-		editor.onDidChangeModelContent(() => {
-			oldText = editor.getValue();
-			dispatch('update', {
-				text: oldText
-			});
-		});
-		editor.addAction({
-			id: 'mermaid-render-diagram',
-			label: 'Render Diagram',
-			keybindings: [Monaco.KeyMod.CtrlCmd | Monaco.KeyCode.Enter],
-			run: function () {
-				syncDiagram();
-				void logEvent('renderDiagram', {
-					method: 'keyboadShortcut'
-				});
-			}
-		});
-		Monaco?.editor.setTheme($themeStore.isDark ? 'mermaid-dark' : 'mermaid');
-		const resizeObserver = new ResizeObserver((entries) => {
-			editor.layout({
-				height: entries[0].contentRect.height,
-				width: entries[0].contentRect.width
-			});
-		});
-
-		resizeObserver.observe(divEl.parentElement);
-		return () => {
-			editor.dispose();
-		};
-	});
-</script>
-
-<div bind:this={divEl} id="editor" class="overflow-hidden" />

src/lib/components/history/history.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Card from '$lib/components/card/card.svelte';
+  import Card from '$lib/components/Card/Card.svelte';
   import { inputStateStore, getStateString } from '$lib/util/state';
   import {
     addHistoryEntry,
@@ -7,12 +7,15 @@
     clearHistoryData,
     getPreviousState,
     historyStore,
-		loaderHistoryStore
+    loaderHistoryStore,
+    restoreHistory
   } from './history';
   import { notify, prompt } from '$lib/util/notify';
   import { onMount } from 'svelte';
+  import { get } from 'svelte/store';
   import moment from 'moment';
   import type { HistoryType, State, Tab } from '$lib/types';
+  import { logEvent } from '$lib/util/stats';
 
   const HISTORY_SAVE_INTERVAL = 60000;
 
@@ -32,6 +35,39 @@
     }
   ];
 
+  const downloadHistory = () => {
+    const data = get(historyStore);
+    const blob = new Blob([JSON.stringify(data)], { type: 'application/json' });
+    const url = URL.createObjectURL(blob);
+    const a = document.createElement('a');
+    a.href = url;
+    a.download = `mermaid-history-${moment().format('YYYY-MM-DD-HHmmss')}.json`;
+    a.click();
+    URL.revokeObjectURL(url);
+    logEvent('history', {
+      action: 'download'
+    });
+  };
+
+  const uploadHistory = () => {
+    const input = document.createElement('input');
+    input.type = 'file';
+    input.accept = 'application/json';
+    input.addEventListener('change', ({ target }: Event) => {
+      const file = (<HTMLInputElement>target).files[0];
+      if (!file) {
+        return;
+      }
+      const reader = new FileReader();
+      reader.onload = (e) => {
+        const data = JSON.parse(e.target.result as string);
+        restoreHistory(data);
+      };
+      reader.readAsText(file);
+    });
+    input.click();
+  };
+
   const saveHistory = (auto = false) => {
     const currentState: string = getStateString();
     const previousState: string = getPreviousState(auto);
@@ -46,15 +82,15 @@
     }
   };
 
-	const clearHistory = (date?: number): void => {
-		if (!date && !prompt('Clear all saved items?')) {
+  const clearHistory = (id?: string): void => {
+    if (!id && !prompt('Clear all saved items?')) {
       return;
     }
-		clearHistoryData(date);
+    clearHistoryData(id);
   };
 
-	const restoreHistory = (state: State): void => {
-		inputStateStore.set({ ...state, updateEditor: true, updateDiagram: true });
+  const restoreHistoryItem = (state: State): void => {
+    inputStateStore.set({ ...state, updateDiagram: true });
   };
 
   const relativeTime = (time: number) => {
@@ -88,6 +124,19 @@
 
 <Card on:select={tabSelectHandler} bind:isOpen {tabs} title="History">
   <div slot="actions">
+    <button
+      id="uploadHistory"
+      class="btn btn-xs btn-secondary w-12"
+      on:click|stopPropagation={() => uploadHistory()}
+      title="Upload history"><i class="fa fa-upload" /></button>
+    {#if $historyStore.length > 0}
+      <button
+        id="downloadHistory"
+        class="btn btn-xs btn-secondary w-12"
+        on:click|stopPropagation={() => downloadHistory()}
+        title="Download history"><i class="fa fa-download" /></button>
+    {/if}
+    |
     <button
       id="saveHistory"
       class="btn btn-xs btn-success w-12"
@@ -103,7 +152,7 @@
   </div>
   <ul class="p-2 space-y-2 overflow-auto h-56" id="historyList">
     {#if $historyStore.length > 0}
-			{#each $historyStore as { state, time, name, url, type }}
+      {#each $historyStore as { id, state, time, name, url, type }}
         <li class="rounded p-2 shadow flex-col">
           <div class="flex">
             <div class="flex-1">
@@ -112,6 +161,7 @@
                   <a
                     href={url}
                     target="_blank"
+                    rel="noreferrer"
                     title="Open revision in new tab"
                     class="hover:underline text-blue-500">{name}</a>
                 {:else}
@@ -121,10 +171,10 @@
               </div>
             </div>
             <div class="flex gap-2 content-center">
-							<button class="btn btn-success" on:click={() => restoreHistory(state)}
+              <button class="btn btn-success" on:click={() => restoreHistoryItem(state)}
                 ><i class="fas fa-undo mr-1" />Restore</button>
               {#if type !== 'loader'}
-								<button class="btn btn-error" on:click={() => clearHistory(time)}
+                <button class="btn btn-error" on:click={() => clearHistory(id)}
                   ><i class="fas fa-trash-alt mr-1" />Delete</button>
               {/if}
             </div>

src/lib/components/history/history.test.ts

@@ -0,0 +1,120 @@
+import type { HistoryEntry } from '$lib/types';
+import { describe, it, expect } from 'vitest';
+import {
+  addHistoryEntry,
+  injectHistoryIDs,
+  clearHistoryData,
+  historyModeStore,
+  historyStore
+} from './history';
+import { defaultState } from '$lib/util/state';
+import { get } from 'svelte/store';
+
+describe('history', () => {
+  it('should handle saving individual history entry', () => {
+    expect(window.localStorage.getItem('manualHistoryStore')).toBe('[]');
+    expect(window.localStorage.getItem('autoHistoryStore')).toBe('[]');
+
+    addHistoryEntry({
+      state: defaultState,
+      time: 12345,
+      type: 'manual'
+    });
+
+    const [manualEntry]: HistoryEntry[] = JSON.parse(
+      window.localStorage.getItem('manualHistoryStore')
+    );
+
+    expect(manualEntry.time).toBe(12345);
+    expect(manualEntry.type).toBe('manual');
+    expect(manualEntry.name).not.toBeNull();
+    expect(manualEntry.state).not.toBeNull();
+
+    addHistoryEntry({
+      state: defaultState,
+      time: 54321,
+      type: 'auto'
+    });
+
+    const [autoEntry]: HistoryEntry[] = JSON.parse(window.localStorage.getItem('autoHistoryStore'));
+
+    expect(autoEntry.time).toBe(54321);
+    expect(autoEntry.type).toBe('auto');
+    expect(autoEntry.name).not.toBeNull();
+    expect(autoEntry.state).not.toBeNull();
+
+    historyModeStore.set('manual');
+    clearHistoryData();
+    historyModeStore.set('auto');
+    clearHistoryData();
+    expect(window.localStorage.getItem('manualHistoryStore')).toBe('[]');
+    expect(window.localStorage.getItem('autoHistoryStore')).toBe('[]');
+  });
+
+  it('should clear history entries', () => {
+    addHistoryEntry({
+      state: defaultState,
+      time: 12345,
+      type: 'manual'
+    });
+    addHistoryEntry({
+      state: { ...defaultState, code: 'graph TD\\n    A[Christmas] -->|Get money| B(Go shopping)' },
+      time: 123456,
+      type: 'manual'
+    });
+
+    historyModeStore.set('manual');
+    const store: HistoryEntry[] = get(historyStore);
+    expect(store.length).toBe(2);
+    clearHistoryData(store[1].id);
+    expect(get(historyStore).length).toBe(1);
+    clearHistoryData();
+    expect(get(historyStore).length).toBe(0);
+
+    historyModeStore.set('auto');
+    addHistoryEntry({
+      state: defaultState,
+      time: 54321,
+      type: 'auto'
+    });
+    addHistoryEntry({
+      state: { ...defaultState, code: 'graph TD\\n    A[Christmas] -->|Get money| B(Go shopping)' },
+      time: 654321,
+      type: 'auto'
+    });
+    expect(get(historyStore).length).toBe(2);
+    clearHistoryData();
+    expect(get(historyStore).length).toBe(0);
+    // Test calling when history is empty
+    clearHistoryData();
+    expect(get(historyStore).length).toBe(0);
+  });
+});
+
+describe('history migration', () => {
+  it('should inject history IDs as migration', () => {
+    window.localStorage.setItem(
+      'manualHistoryStore',
+      '[{"state":{"code":"graph TD\\n    A[Halloween] -->|Get money| B(Go shopping)","mermaid":"{\\n  \\"theme\\": \\"dark\\"\\n}","autoSync":true,"updateDiagram":false},"time":0,"type":"manual","name":"hollow-art"},{"state":{"code":"graph TD\\n    A[Christmas] -->|Get money| B(Go shopping)","mermaid":"{\\n  \\"theme\\": \\"dark\\"\\n}","autoSync":true,"updateDiagram":true},"time":0,"type":"manual","name":"helpful-ocean"}]'
+    );
+    window.localStorage.setItem(
+      'autoHistoryStore',
+      '[{"state":{"code":"graph TD\\n    A[New Year] -->|Get money| B(Go shopping)","mermaid":"{\\n  \\"theme\\": \\"dark\\"\\n}","autoSync":true,"updateDiagram":false},"time":0,"type":"auto","name":"barking-dog"},{"state":{"code":"graph TD\\n    A[Christmas] -->|Get money| B(Go shopping)","mermaid":"{\\n  \\"theme\\": \\"dark\\"\\n}","autoSync":true,"updateDiagram":true},"time":0,"type":"manual","name":"needy-mosquito"}]'
+    );
+    let manualHistoryStore: HistoryEntry[] = JSON.parse(
+      window.localStorage.getItem('manualHistoryStore')
+    );
+    let autoHistoryStore: HistoryEntry[] = JSON.parse(
+      window.localStorage.getItem('autoHistoryStore')
+    );
+    expect(manualHistoryStore.every(({ id }) => id !== undefined)).toBe(false);
+    expect(autoHistoryStore.every(({ id }) => id !== undefined)).toBe(false);
+
+    injectHistoryIDs();
+
+    manualHistoryStore = JSON.parse(window.localStorage.getItem('manualHistoryStore'));
+    autoHistoryStore = JSON.parse(window.localStorage.getItem('autoHistoryStore'));
+    expect(manualHistoryStore.every(({ id }) => id !== undefined)).toBe(true);
+    expect(autoHistoryStore.every(({ id }) => id !== undefined)).toBe(true);
+  });
+});

src/lib/components/history/history.ts

@@ -1,8 +1,10 @@
 import { derived, writable, get } from 'svelte/store';
 import type { Readable, Writable } from 'svelte/store';
-import { persist, localStorage } from '@macfja/svelte-persistent-store';
+import { persist, localStorage } from '$lib/util/persist';
 import { generateSlug } from 'random-word-slugs';
-import type { HistoryEntry, HistoryType } from '$lib/types';
+import type { HistoryEntry, HistoryType, Optional } from '$lib/types';
+import { v4 as uuidV4 } from 'uuid';
+import { logEvent } from '$lib/util/stats';
 
 const MAX_AUTO_HISTORY_LENGTH = 30;
 
@@ -41,28 +43,39 @@ export const historyStore: Readable<HistoryEntry[]> = derived(
   }
 );
 
-export const addHistoryEntry = (entry: HistoryEntry): void => {
+export const addHistoryEntry = (entryToAdd: Optional<HistoryEntry, 'id'>): void => {
+  const entry: HistoryEntry = {
+    ...entryToAdd,
+    id: uuidV4()
+  };
+
   if (entry.type === 'loader') {
     loaderHistoryStore.update((entries) => [entry, ...entries]);
     return;
   }
+
+  if (!entry.name) {
     entry.name = generateSlug(2);
-	if (entry.type !== 'auto') {
-		manualHistoryStore.update((entries) => [entry, ...entries]);
-		return;
   }
+
+  if (entry.type === 'auto') {
     autoHistoryStore.update((entries) => {
-		if (entries.length === MAX_AUTO_HISTORY_LENGTH) {
-			entries.pop();
+      if (entries.length >= MAX_AUTO_HISTORY_LENGTH) {
+        entries = entries.slice(0, MAX_AUTO_HISTORY_LENGTH - 1);
       }
       return [entry, ...entries];
     });
+  } else if (entry.type === 'manual') {
+    manualHistoryStore.update((entries) => [entry, ...entries]);
+    logEvent('history', { action: 'save' });
+  }
 };
 
-export const clearHistoryData = (time?: number): void => {
+export const clearHistoryData = (idToClear?: string): void => {
   (get(historyModeStore) === 'auto' ? autoHistoryStore : manualHistoryStore).update((entries) => {
     if (get(historyModeStore) !== 'loader') {
-			entries = entries.filter((entry) => time && entry.time != time);
+      entries = entries.filter(({ id }) => idToClear && id != idToClear);
+      logEvent('history', { action: 'clear', type: idToClear ? 'single' : 'all' });
     }
     return entries;
   });
@@ -75,3 +88,54 @@ export const getPreviousState = (auto: boolean): string => {
   }
   return '';
 };
+
+export const restoreHistory = (data: HistoryEntry[]) => {
+  const entries = data.filter(validateEntry);
+  const invalidEntryCount = data.length - entries.length;
+  if (invalidEntryCount > 0) {
+    console.error(`${invalidEntryCount} invalid history entries were removed.`);
+    console.error(data);
+  }
+  if (entries.length > 0) {
+    let entryCount = 0;
+    (entries[0].type === 'auto' ? autoHistoryStore : manualHistoryStore).update((existing) => {
+      const existingIDs = new Set(existing.map(({ id }) => id));
+      const newEntries = entries.filter(({ id }) => !existingIDs.has(id));
+      entryCount = newEntries.length;
+      const combined = [...existing, ...newEntries];
+      combined.sort((a, b) => b.time - a.time);
+      return combined;
+    });
+
+    alert(
+      `${entryCount} entries restored. ${invalidEntryCount} invalid, ${
+        entries.length - entryCount
+      } duplicates.`
+    );
+    logEvent('history', {
+      action: 'restore',
+      success: entryCount,
+      invalid: invalidEntryCount,
+      duplicates: entries.length - entryCount
+    });
+  } else {
+    alert('No valid entries found.');
+  }
+};
+
+export const injectHistoryIDs = (): void => {
+  const setIDs = (entries: HistoryEntry[]) => {
+    for (const entry of entries) {
+      if (!entry.id) {
+        entry.id = uuidV4();
+      }
+    }
+    return entries;
+  };
+  autoHistoryStore.update(setIDs);
+  manualHistoryStore.update(setIDs);
+};
+
+const validateEntry = (entry: HistoryEntry): boolean => {
+  return entry.type && entry.state && entry.time && true;
+};

src/lib/components/navbar.svelte

@@ -7,7 +7,7 @@
 </script>
 
 <script lang="ts">
-	import Theme from './theme.svelte';
+  import Theme from './Theme.svelte';
 
   interface Link {
     title: string;
@@ -39,7 +39,7 @@
   ];
 </script>
 
-<div class="navbar mb-2 shadow-lg bg-primary">
+<div class="navbar shadow-lg bg-primary p-0">
   <div class="flex-1 px-2 mx-2">
     <span class="text-lg font-bold">
       <a href="/">Mermaid<span class="text-xs font-thin">v{version}</span> Live Editor</a>
@@ -61,7 +61,7 @@
     <ul class="lg:flex items-center justify-between text-base pt-4 lg:pt-0">
       {#each links as { title, href, icon }}
         <li>
-					<a class="btn btn-ghost" target="_blank" {href}>
+          <a class="btn btn-ghost" target="_blank" rel="noreferrer" {href}>
             {#if icon}
               <i class={icon} />
             {/if}

src/lib/components/preset.svelte

@@ -1,22 +1,21 @@
 <script lang="ts">
   import { updateCode } from '$lib/util/state';
-	import Card from '$lib/components/card/card.svelte';
+  import Card from '$lib/components/Card/Card.svelte';
   import { logEvent } from '$lib/util/stats';
 
   const samples = {
-		'Flow Chart': `graph TD
+    Flow: `graph TD
     A[Christmas] -->|Get money| B(Go shopping)
     B --> C{Let me think}
     C -->|One| D[Laptop]
     C -->|Two| E[iPhone]
     C -->|Three| F[fa:fa-car Car]`,
-		'Sequence Diagram': `sequenceDiagram
+    Sequence: `sequenceDiagram
     Alice->>+John: Hello John, how are you?
     Alice->>+John: John, can you hear me?
     John-->>-Alice: Hi Alice, I can hear you!
-    John-->>-Alice: I feel great!
-            `,
-		'Class Diagram': `classDiagram
+    John-->>-Alice: I feel great!`,
+    Class: `classDiagram
     Animal <|-- Duck
     Animal <|-- Fish
     Animal <|-- Zebra
@@ -36,17 +35,15 @@
     class Zebra{
       +bool is_wild
       +run()
-    }
-            `,
-		'State Diagram': `stateDiagram-v2
+    }`,
+    State: `stateDiagram-v2
     [*] --> Still
     Still --> [*]
     Still --> Moving
     Moving --> Still
     Moving --> Crash
-    Crash --> [*]
-            `,
-		'Gantt Chart': `gantt
+    Crash --> [*]`,
+    Gantt: `gantt
     title A Gantt Diagram
     dateFormat  YYYY-MM-DD
     section Section
@@ -54,14 +51,12 @@
     Another task     :after a1  , 20d
     section Another
     Task in sec      :2014-01-12  , 12d
-    another task      : 24d
-            `,
-		'Pie Chart': `pie title Pets adopted by volunteers
+    another task      : 24d`,
+    Pie: `pie title Pets adopted by volunteers
     "Dogs" : 386
     "Cats" : 85
-    "Rats" : 15
-            `,
-		'ER Diagram': `erDiagram
+    "Rats" : 15`,
+    ER: `erDiagram
     CUSTOMER }|..|{ DELIVERY-ADDRESS : has
     CUSTOMER ||--o{ ORDER : places
     CUSTOMER ||--o{ INVOICE : "liable for"
@@ -69,9 +64,8 @@
     INVOICE ||--|{ ORDER : covers
     ORDER ||--|{ ORDER-ITEM : includes
     PRODUCT-CATEGORY ||--|{ PRODUCT : contains
-          PRODUCT ||--o{ ORDER-ITEM : "ordered in"
-            `,
-		'User Journey': `  journey
+    PRODUCT ||--o{ ORDER-ITEM : "ordered in"`,
+    'User Journey': `journey
     title My working day
     section Go to work
       Make tea: 5: Me
@@ -79,9 +73,8 @@
       Do work: 1: Me, Cat
     section Go home
       Go downstairs: 5: Me
-      Sit down: 3: Me
-      `,
-		'Git Graph': `    gitGraph
+      Sit down: 3: Me`,
+    Git: `gitGraph
     commit
     commit
     branch develop
@@ -91,25 +84,61 @@
     checkout main
     merge develop
     commit
-      commit
-`
+    commit`,
+    Mindmap: `mindmap
+  root((mindmap))
+    Origins
+      Long history
+      ::icon(fa fa-book)
+      Popularisation
+        British popular psychology author Tony Buzan
+    Research
+      On effectivness<br/>and features
+      On Automatic creation
+        Uses
+            Creative techniques
+            Strategic planning
+            Argument mapping
+    Tools
+      Pen and paper
+      Mermaid`
   };
 
   const loadSampleDiagram = (diagramType: string): void => {
     updateCode(samples[diagramType], {
       updateDiagram: true,
-			updateEditor: true,
       resetPanZoom: true
     });
-		void logEvent('loadSampleDiagram', { diagramType });
+    logEvent('loadSampleDiagram', { diagramType });
   };
+
+  // Adding in this array will add an icon to the preset menu
+  const newDiagrams: Array<keyof typeof samples> = ['Mindmap'];
+  const diagramOrder: Array<keyof typeof samples> = [
+    'Sequence',
+    'Flow',
+    'Class',
+    'State',
+    'ER',
+    'Gantt',
+    'User Journey',
+    'Git',
+    'Pie',
+    'Mindmap'
+  ];
 </script>
 
 <Card title="Sample Diagrams" isOpen={false}>
-	<div class="flex gap-2 flex-wrap p-2">
-		{#each Object.keys(samples) as sample}
-			<button class="btn btn-primary normal-case btn-sm" on:click={() => loadSampleDiagram(sample)}
-				>{sample}</button>
+  <div class="flex flex-wrap p-2 gap-2">
+    {#each diagramOrder as sample}
+      <button
+        class="btn btn-sm btn-primary w-28 normal-case flex-grow"
+        on:click={() => loadSampleDiagram(sample)}>
+        {sample}
+        {#if newDiagrams.includes(sample)}
+          <span class="ml-2 fa fa-heart" />
+        {/if}
+      </button>
     {/each}
   </div>
 </Card>

src/lib/components/theme.svelte

@@ -2,31 +2,32 @@
   import { setTheme, themeStore } from '$lib/util/theme';
 
   const themes = [
-		'🌝  light',
-		'🌚  dark',
-		'🧁  cupcake',
-		'🐝  bumblebee',
-		'✳️  emerald',
-		'🏢  corporate',
-		'🌃  synthwave',
-		'👴  retro',
-		'🤖  cyberpunk',
-		'🌸  valentine',
-		'🎃  halloween',
-		'🌷  garden',
-		'🌲  forest',
-		'🐟  aqua',
-		'👓  lofi',
-		'🖍  pastel',
-		'🧚‍♀️  fantasy',
-		'📝  wireframe',
-		'🏴  black',
-		'💎  luxury',
-		'🧛‍♂️  dracula'
+    '🌝 light',
+    '🌚 dark',
+    '🧁 cupcake',
+    '🐝 bumblebee',
+    '✳️ emerald',
+    '🏢 corporate',
+    '🌃 synthwave',
+    '👴 retro',
+    '🤖 cyberpunk',
+    '🌸 valentine',
+    '🎃 halloween',
+    '🌷 garden',
+    '🌲 forest',
+    '🐟 aqua',
+    '👓 lofi',
+    '🖍 pastel',
+    '🧚‍♀️ fantasy',
+    '📝 wireframe',
+    '🏴 black',
+    '💎 luxury',
+    '🧛‍♂️ dracula'
   ];
 </script>
 
 <div class="hidden lg:block dropdown">
+  <!-- svelte-ignore a11y-no-noninteractive-tabindex -->
   <div tabindex="0" class="btn btn-ghost ">
     <svg
       xmlns="http://www.w3.org/2000/svg"
@@ -48,10 +49,14 @@
   </div>
   <div
     class="mt-14 overflow-y-auto shadow-2xl top-px dropdown-content h-96 w-56 bg-base-200 text-base-content">
+    <!-- svelte-ignore a11y-no-noninteractive-tabindex -->
     <ul tabindex="0" class="p-4 menu compact">
       {#each themes as theme}
         <li class={theme.includes($themeStore.theme) ? 'bordered' : ''}>
-					<span class="btn btn-ghost justify-start" on:click={() => setTheme(theme)}>{theme}</span>
+          <span
+            class="btn btn-ghost justify-start"
+            on:click={() => setTheme(theme)}
+            on:keypress={() => setTheme(theme)}>{theme}</span>
         </li>
       {/each}
     </ul>

src/lib/components/view.svelte

@@ -1,10 +1,11 @@
 <script lang="ts">
   import { inputStateStore, stateStore, updateCodeStore } from '$lib/util/state';
   import { onMount } from 'svelte';
-	import mermaid from 'mermaid';
   import panzoom from 'svg-pan-zoom';
-	import type { State } from '$lib/types';
+  import type { State, ValidatedState } from '$lib/types';
   import { logEvent } from '$lib/util/stats';
+  import { AsyncQueue, cmdKey } from '$lib/util/util';
+  import { render as renderDiagram } from '$lib/util/mermaid';
 
   let code = '';
   let config = '';
@@ -16,16 +17,12 @@
   let manualUpdate = true;
   let panZoomEnabled = $stateStore.panZoom;
   let pzoom: SvgPanZoom.Instance;
-	let debounce: number;
 
   const handlePanZoomChange = () => {
     const pan = pzoom.getPan();
     const zoom = pzoom.getZoom();
-		clearTimeout(debounce);
-		debounce = window.setTimeout(() => {
     updateCodeStore({ pan, zoom });
-			void logEvent('panZoom');
-		}, 200);
+    logEvent('panZoom');
   };
 
   const handlePanZoom = (state: State) => {
@@ -53,8 +50,7 @@
     });
   };
 
-	onMount(() => {
-		stateStore.subscribe((state) => {
+  const handleStateChange = async (state: ValidatedState) => {
     if (state.error !== undefined) {
       error = true;
       return;
@@ -67,8 +63,8 @@
         }
         outOfSync = false;
         manualUpdate = true;
-					if (code === state.code && config === state.mermaid && panZoomEnabled === state.panZoom) {
         // Do not render if there is no change in Code/Config/PanZoom
+        if (code === state.code && config === state.mermaid && panZoomEnabled === state.panZoom) {
           return;
         }
         code = state.code;
@@ -76,38 +72,65 @@
         panZoomEnabled = state.panZoom;
         const scroll = view.parentElement.scrollTop;
         delete container.dataset.processed;
-					mermaid.initialize(Object.assign({}, JSON.parse(state.mermaid)));
-					mermaid.render('graph-div', code, (svgCode) => {
+        await renderDiagram(
+          Object.assign({}, JSON.parse(state.mermaid)),
+          code,
+          'graph-div',
+          (svgCode, bindFunctions) => {
             if (svgCode.length > 0) {
               handlePanZoom(state);
               container.innerHTML = svgCode;
+              // console.log(container.innerHTML);
               const graphDiv = document.getElementById('graph-div');
               graphDiv.setAttribute('height', '100%');
               graphDiv.style.maxWidth = '100%';
+              if (bindFunctions) {
+                bindFunctions(graphDiv);
               }
-					});
+            }
+          }
+        );
         view.parentElement.scrollTop = scroll;
         error = false;
       } else if (manualUpdate) {
         manualUpdate = false;
-				} else {
+      } else if (code !== state.code || config !== state.mermaid) {
         outOfSync = true;
       }
     } catch (e) {
-				console.log('view fail', e);
+      console.error('view fail', e);
       error = true;
     }
+  };
+
+  const q = new AsyncQueue(handleStateChange);
+
+  onMount(() => {
+    stateStore.subscribe(async (state) => {
+      await q.process(state);
     });
     window.addEventListener('resize', () => {
       if ($stateStore.panZoom && pzoom) {
         pzoom.resize();
       }
     });
+    console.log('View mounted');
   });
 </script>
 
-{#if error && $stateStore.error instanceof Error}
-	<div class="p-2 text-red-600" id="errorContainer">{$stateStore.error}</div>
+{#if (error && $stateStore.error instanceof Error) || outOfSync}
+  <div
+    class="absolute w-full p-2 z-10 {error
+      ? 'text-red-600'
+      : 'text-yellow-600'} bg-base-100 bg-opacity-80 text-center"
+    id="errorContainer">
+    {#if error}
+      {$stateStore.error}
+    {:else}
+      Diagram out of sync. <br />
+      Press <i class="fas fa-sync" /> (Sync button) or <kbd>{cmdKey} + Enter</kbd> to sync.
+    {/if}
+  </div>
 {/if}
 
 <div id="view" bind:this={view} class="p-2 h-full" class:error class:outOfSync>

src/lib/types.d.ts

@@ -16,13 +16,6 @@ export interface MarkerData {
   endColumn: number;
 }
 
-export interface EditorUpdateEvent {
-	text: string;
-}
-export interface EditorEvents {
-	update: EditorUpdateEvent;
-}
-
 export interface TabEvents {
   select: Tab;
 }
@@ -36,9 +29,9 @@ export interface Tab {
 export interface State {
   code: string;
   mermaid: string;
-	updateEditor: boolean;
   updateDiagram: boolean;
   autoSync: boolean;
+  editorMode?: EditorMode;
   panZoom?: boolean;
   pan?: { x: number; y: number };
   zoom?: number;
@@ -46,6 +39,7 @@ export interface State {
 }
 
 export interface ValidatedState extends State {
+  editorMode: EditorMode;
   error: unknown;
   errorMarkers: MarkerData[];
   serialized: string;
@@ -68,13 +62,16 @@ export interface LoaderConfig {
   config: GistLoaderConfig | FileLoaderConfig;
 }
 export type HistoryType = 'auto' | 'manual' | 'loader';
-export interface HistoryEntry {
-	state: State;
-	time: number;
-	name?: string;
+export type HistoryEntry = { id: string; state: State; time: number; url?: string } & (
+  | {
+      type: 'loader';
+      name: string;
+    }
+  | {
       type: HistoryType;
-	url?: string;
-}
+      name?: string;
+    }
+);
 
 export interface DocConfig {
   [key: string]: {
@@ -83,4 +80,7 @@ export interface DocConfig {
   };
 }
 
+export type EditorMode = 'code' | 'config';
+
 export type Loader = (url: string) => Promise<State>;
+export type Optional<T, K extends keyof T> = Pick<Partial<T>, K> & Omit<T, K>;

src/lib/util/env.ts

@@ -1,4 +1,9 @@
-export const rendererUrl: string =
-	(import.meta.env.MERMAID_RENDERER_URL as string) ?? 'https://mermaid.ink';
-export const krokiRendererUrl: string =
-	(import.meta.env.MERMAID_KROKI_RENDERER_URL as string) ?? 'https://kroki.io';
+export const env = {
+  rendererUrl: import.meta.env.MERMAID_RENDERER_URL ?? 'https://mermaid.ink',
+  krokiRendererUrl: import.meta.env.MERMAID_KROKI_RENDERER_URL ?? 'https://kroki.io',
+  mermaidCDNUrl: import.meta.env.MERMAID_CDN_URL ?? 'https://unpkg.com/@mermaid-js',
+  mermaidBaseURL: import.meta.env.MERMAID_BASE_URL ?? 'http://localhost:9000',
+  useLocalMermaid: import.meta.env.MERMAID_LOCAL ?? false,
+  isDev: import.meta.env.DEV,
+  baseURL: import.meta.env.BASE_URL
+};

src/lib/util/fileLoaders/gist.ts

@@ -4,7 +4,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import type { State } from '$lib/types';
 import { defaultState } from '../state';
-import { addHistoryEntry } from '../../components/history/history';
+import { addHistoryEntry } from '../../components/History/history';
 
 const codeFileName = 'code.mmd';
 const configFileName = 'config.json';

src/lib/util/fileLoaders/loader.ts

@@ -54,7 +54,6 @@ export const loadDataFromUrl = async (): Promise<void> => {
     updateCodeStore({
       ...state,
       autoSync: true,
-			updateDiagram: true,
-			updateEditor: true
+      updateDiagram: true
     });
 };

src/lib/util/mermaid.ts

@@ -0,0 +1,24 @@
+import mermaid, { type MermaidConfig } from 'mermaid';
+import mindmap from '@mermaid-js/mermaid-mindmap';
+
+const initialize = mermaid.registerExternalDiagrams([mindmap]);
+
+export const init = async () => {
+  await initialize;
+};
+
+export const render = async (
+  config: MermaidConfig,
+  code: string,
+  id: string,
+  callback: Parameters<typeof mermaid.render>[2]
+): Promise<void> => {
+  await init();
+  mermaid.initialize(config);
+  await mermaid.mermaidAPI.renderAsync(id, code, callback);
+};
+
+export const parse = async (code: string): Promise<boolean> => {
+  await init();
+  return (await mermaid.parseAsync(code)) as boolean;
+};

src/lib/util/migrations.test.ts

@@ -0,0 +1,34 @@
+import type { HistoryEntry } from '$lib/types';
+import { describe, it, expect, beforeEach } from 'vitest';
+
+describe('migrations', () => {
+  beforeEach(() => {
+    window.localStorage.setItem(
+      'manualHistoryStore',
+      '[{"state":{"code":"graph TD\\n    A[Halloween] -->|Get money| B(Go shopping)","mermaid":"{\\n  \\"theme\\": \\"dark\\"\\n}","autoSync":true,"updateDiagram":false},"time":0,"type":"manual","name":"hollow-art"},{"state":{"code":"graph TD\\n    A[Christmas] -->|Get money| B(Go shopping)","mermaid":"{\\n  \\"theme\\": \\"dark\\"\\n}","autoSync":true,"updateDiagram":true},"time":0,"type":"manual","name":"helpful-ocean"}]'
+    );
+    window.localStorage.setItem(
+      'autoHistoryStore',
+      '[{"state":{"code":"graph TD\\n    A[New Year] -->|Get money| B(Go shopping)","mermaid":"{\\n  \\"theme\\": \\"dark\\"\\n}","autoSync":true,"updateDiagram":false},"time":0,"type":"auto","name":"barking-dog"},{"state":{"code":"graph TD\\n    A[Christmas] -->|Get money| B(Go shopping)","mermaid":"{\\n  \\"theme\\": \\"dark\\"\\n}","autoSync":true,"updateDiagram":true},"time":0,"type":"manual","name":"needy-mosquito"}]'
+    );
+  });
+
+  it('should migrate from v0 to v1', async () => {
+    const { applyMigrations } = await import('./migrations');
+    let manualHistoryStore: HistoryEntry[] = JSON.parse(
+      window.localStorage.getItem('manualHistoryStore')
+    );
+    let autoHistoryStore: HistoryEntry[] = JSON.parse(
+      window.localStorage.getItem('autoHistoryStore')
+    );
+    expect(manualHistoryStore.every(({ id }) => id !== undefined)).toBe(false);
+    expect(autoHistoryStore.every(({ id }) => id !== undefined)).toBe(false);
+
+    applyMigrations();
+
+    manualHistoryStore = JSON.parse(window.localStorage.getItem('manualHistoryStore'));
+    autoHistoryStore = JSON.parse(window.localStorage.getItem('autoHistoryStore'));
+    expect(manualHistoryStore.every(({ id }) => id !== undefined)).toBe(true);
+    expect(autoHistoryStore.every(({ id }) => id !== undefined)).toBe(true);
+  });
+});

src/lib/util/migrations.ts

@@ -0,0 +1,35 @@
+import { writable, get, type Writable } from 'svelte/store';
+import { persist, localStorage } from '$lib/util/persist';
+import { injectHistoryIDs } from '$lib/components/History/history';
+import { logEvent } from './stats';
+
+interface MigrationState {
+  version: number;
+}
+
+const migrations: { [key: string]: () => void } = {
+  injectHistoryIDs
+};
+
+const migrationStore: Writable<MigrationState> = persist(
+  writable({ version: -1 }),
+  localStorage(),
+  'migrations'
+);
+
+export const applyMigrations = (): void => {
+  const { version }: MigrationState = get(migrationStore);
+  const allMigrations = Object.entries(migrations);
+  if (version === allMigrations.length - 1) {
+    return;
+  }
+  console.log(`Current migration version: v${version}. Migrating to v${allMigrations.length - 1}.`);
+  for (let i = version + 1; i < allMigrations.length; i++) {
+    const [key, fn] = allMigrations[i];
+    console.log(`Applying migration ${i}: ${key}.`);
+    fn();
+    logEvent('migration', { key });
+    migrationStore.set({ version: i });
+  }
+  logEvent('migration', { status: 'complete', from: version, to: allMigrations.length - 1 });
+};

src/lib/util/persist.ts

@@ -0,0 +1,265 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+// Copied from https://github.com/MacFJA/svelte-persistent-store
+// # The MIT License (MIT)
+
+// Copyright (c) 2021 [MacFJA](https://github.com/MacFJA)
+
+// > Permission is hereby granted, free of charge, to any person obtaining a copy
+// > of this software and associated documentation files (the "Software"), to deal
+// > in the Software without restriction, including without limitation the rights
+// > to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// > copies of the Software, and to permit persons to whom the Software is
+// > furnished to do so, subject to the following conditions:
+// >
+// > The above copyright notice and this permission notice shall be included in
+// > all copies or substantial portions of the Software.
+// >
+// > THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// > IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// > FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// > AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// > LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// > OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// > THE SOFTWARE.
+
+import ESSerializer from 'esserializer';
+import type { Writable } from 'svelte/store';
+
+/**
+ * Disabled warnings about missing/unavailable storages
+ */
+export function disableWarnings(): void {
+  noWarnings = true;
+}
+/**
+ * If set to true, no warning will be emitted if the requested Storage is not found.
+ * This option can be useful when the lib is used on a server.
+ */
+let noWarnings = false;
+/**
+ * List of storages where the warning have already been displayed.
+ */
+const alreadyWarnFor: Array<string> = [];
+
+/**
+ * Add a log to indicate that the requested Storage have not been found.
+ * @param {string} storageName
+ */
+const warnStorageNotFound = (storageName) => {
+  const isProduction = typeof process !== 'undefined' && process.env?.NODE_ENV === 'production';
+
+  if (!noWarnings && alreadyWarnFor.indexOf(storageName) === -1 && !isProduction) {
+    let message = `Unable to find the ${storageName}. No data will be persisted.`;
+    if (typeof window === 'undefined') {
+      message +=
+        '\n' +
+        'Are you running on a server? Most of storages are not available while running on a server.';
+    }
+    console.warn(message);
+    alreadyWarnFor.push(storageName);
+  }
+};
+
+const allowedClasses = [];
+/**
+ * Add a class to the allowed list of classes to be serialized
+ * @param classDef The class to add to the list
+ */
+export const addSerializableClass = (classDef: () => unknown): void => {
+  allowedClasses.push(classDef);
+};
+
+const serialize = (value: unknown): string => ESSerializer.serialize(value);
+const deserialize = (value: string): unknown => {
+  // @TODO: to remove in the next major
+  if (value === 'undefined') {
+    return undefined;
+  }
+
+  if (value !== null && value !== undefined) {
+    try {
+      return ESSerializer.deserialize(value, allowedClasses);
+    } catch (e) {
+      // Do nothing
+      // use the value "as is"
+    }
+    try {
+      return JSON.parse(value);
+    } catch (e) {
+      // Do nothing
+      // use the value "as is"
+    }
+  }
+  return value;
+};
+
+/**
+ * A store that keep it's value in time.
+ */
+export interface PersistentStore<T> extends Writable<T> {
+  /**
+   * Delete the store value from the persistent storage
+   */
+  delete(): void;
+}
+
+/**
+ * Storage interface
+ */
+export interface StorageInterface<T> {
+  /**
+   * Get a value from the storage.
+   *
+   * If the value doesn't exists in the storage, `null` should be returned.
+   * This method MUST be synchronous.
+   * @param key The key/name of the value to retrieve
+   */
+  getValue(key: string): T | null;
+
+  /**
+   * Save a value in the storage.
+   * @param key The key/name of the value to save
+   * @param value The value to save
+   */
+  setValue(key: string, value: T): void;
+
+  /**
+   * Remove a value from the storage
+   * @param key The key/name of the value to remove
+   */
+  deleteValue(key: string): void;
+}
+
+export interface SelfUpdateStorageInterface<T> extends StorageInterface<T> {
+  /**
+   * Add a listener to the storage values changes
+   * @param {string} key The key to listen
+   * @param {(newValue: T) => void} listener The listener callback function
+   */
+  addListener(key: string, listener: (newValue: T) => void): void;
+  /**
+   * Remove a listener from the storage values changes
+   * @param {string} key The key that was listened
+   * @param {(newValue: T) => void} listener The listener callback function to remove
+   */
+  removeListener(key: string, listener: (newValue: T) => void): void;
+}
+
+/**
+ * Make a store persistent
+ * @param {Writable<*>} store The store to enhance
+ * @param {StorageInterface} storage The storage to use
+ * @param {string} key The name of the data key
+ */
+export function persist<T>(
+  store: Writable<T>,
+  storage: StorageInterface<T>,
+  key: string
+): PersistentStore<T> {
+  const initialValue = storage.getValue(key);
+
+  if (null !== initialValue) {
+    store.set(initialValue);
+  }
+
+  if ((storage as SelfUpdateStorageInterface<T>).addListener) {
+    (storage as SelfUpdateStorageInterface<T>).addListener(key, (newValue) => {
+      store.set(newValue);
+    });
+  }
+
+  store.subscribe((value) => {
+    storage.setValue(key, value);
+  });
+
+  return {
+    ...store,
+    delete() {
+      storage.deleteValue(key);
+    }
+  };
+}
+
+function getBrowserStorage(
+  browserStorage: Storage,
+  listenExternalChanges = false
+): SelfUpdateStorageInterface<any> {
+  const listeners: Array<{ key: string; listener: (newValue: any) => void }> = [];
+  const listenerFunction = (event: StorageEvent) => {
+    const eventKey = event.key;
+    if (event.storageArea === browserStorage) {
+      listeners
+        .filter(({ key }) => key === eventKey)
+        .forEach(({ listener }) => {
+          listener(deserialize(event.newValue));
+        });
+    }
+  };
+  const connect = () => {
+    if (listenExternalChanges && typeof window !== 'undefined' && window?.addEventListener) {
+      window.addEventListener('storage', listenerFunction);
+    }
+  };
+  const disconnect = () => {
+    if (listenExternalChanges && typeof window !== 'undefined' && window?.removeEventListener) {
+      window.removeEventListener('storage', listenerFunction);
+    }
+  };
+
+  return {
+    addListener(key: string, listener: (newValue: any) => void) {
+      listeners.push({ key, listener });
+      if (listeners.length === 1) {
+        connect();
+      }
+    },
+    removeListener(key: string, listener: (newValue: any) => void) {
+      const index = listeners.indexOf({ key, listener });
+      if (index !== -1) {
+        listeners.splice(index, 1);
+      }
+      if (listeners.length === 0) {
+        disconnect();
+      }
+    },
+    getValue(key: string): any | null {
+      const value = browserStorage.getItem(key);
+      return deserialize(value);
+    },
+    deleteValue(key: string) {
+      browserStorage.removeItem(key);
+    },
+    setValue(key: string, value: any) {
+      browserStorage.setItem(key, serialize(value));
+    }
+  };
+}
+
+/**
+ * Storage implementation that use the browser local storage
+ * @param {boolean} listenExternalChanges - Update the store if the localStorage is updated from another page
+ */
+export function localStorage<T>(listenExternalChanges = false): StorageInterface<T> {
+  if (typeof window !== 'undefined' && window?.localStorage) {
+    return getBrowserStorage(window.localStorage, listenExternalChanges);
+  }
+  warnStorageNotFound('window.localStorage');
+  return noopStorage();
+}
+
+/**
+ * Storage implementation that do nothing
+ */
+export function noopStorage(): StorageInterface<any> {
+  return {
+    getValue(): null {
+      return null;
+    },
+    deleteValue() {
+      // Do nothing
+    },
+    setValue() {
+      // Do nothing
+    }
+  };
+}

src/lib/util/serde.test.ts

@@ -13,19 +13,19 @@ describe('Serde tests', () => {
 
   it('should serialize and deserialize with default serde', () => {
     expect(verifySerde(defaultState)).toMatchInlineSnapshot(
-			'"pako:eNpVkM1qw0AMhF9F6JRC_AI-FBo7ySXQQnPz5iC8cnZp9oe1TAm2373rmEKik5j5ZhAasQ2ascRromjgXCsPeT6ayiTbi6P-AkXxPh1ZwAXP9wl2m2OA3oQYrb--rfxugaAaTwvGIMb6n3m1qkf-0_MEdXOiKCFenp3zb5hg39gvk-tfHZM4pw5NR2VHRUsJKkoPBLfoODmyOp8-LopCMexYYZlXzR0NN1Go_JzRIWoS3msrIWGuuvW8RRokfN99i6Wkgf-h2lL-hFvF-Q9-YFyS"'
+      '"pako:eNpVj81qw0AMhF9F6NRC_AI-BGK7zSXQQHLz5iBsObuk-8Naphjb7551fEl1EjPfiNGEjW8Zc7xHChqulXKQ5lCXOppeLPU3yLL9fGQB6x2PMxQfRw-99iEYd__c-GKFoJxOK8Yg2rjHslnlK__jeIaqPlEQH27vzvXPz_BVm7NO5_87OnJKfdcd5R1lDUUoKb4Q3KHlaMm0qfq0KgpFs2WFeVpb7mj4FYXKLQmlQfxldA3mEgfe4RBaEq4MpaftJi5PNtJU8w"'
     );
   });
 
   it('should serialize and deserialize with base64 serde', () => {
     expect(verifySerde(defaultState, 'base64')).toMatchInlineSnapshot(
-			'"base64:eyJjb2RlIjoiZ3JhcGggVERcbiAgICBBW0NocmlzdG1hc10gLS0-fEdldCBtb25leXwgQihHbyBzaG9wcGluZylcbiAgICBCIC0tPiBDe0xldCBtZSB0aGlua31cbiAgICBDIC0tPnxPbmV8IERbTGFwdG9wXVxuICAgIEMgLS0-fFR3b3wgRVtpUGhvbmVdXG4gICAgQyAtLT58VGhyZWV8IEZbZmE6ZmEtY2FyIENhcl1cbiAgIiwibWVybWFpZCI6IntcbiAgXCJ0aGVtZVwiOiBcImRlZmF1bHRcIlxufSIsInVwZGF0ZUVkaXRvciI6ZmFsc2UsImF1dG9TeW5jIjp0cnVlLCJ1cGRhdGVEaWFncmFtIjp0cnVlfQ"'
+      '"base64:eyJjb2RlIjoiZ3JhcGggVERcbiAgICBBW0NocmlzdG1hc10gLS0-fEdldCBtb25leXwgQihHbyBzaG9wcGluZylcbiAgICBCIC0tPiBDe0xldCBtZSB0aGlua31cbiAgICBDIC0tPnxPbmV8IERbTGFwdG9wXVxuICAgIEMgLS0-fFR3b3wgRVtpUGhvbmVdXG4gICAgQyAtLT58VGhyZWV8IEZbZmE6ZmEtY2FyIENhcl1cbiAgIiwibWVybWFpZCI6IntcbiAgXCJ0aGVtZVwiOiBcImRlZmF1bHRcIlxufSIsImF1dG9TeW5jIjp0cnVlLCJ1cGRhdGVEaWFncmFtIjp0cnVlfQ"'
     );
   });
 
   it('should serialize and deserialize with pako serde', () => {
     expect(verifySerde(defaultState, 'pako')).toMatchInlineSnapshot(
-			'"pako:eNpVkM1qw0AMhF9F6JRC_AI-FBo7ySXQQnPz5iC8cnZp9oe1TAm2373rmEKik5j5ZhAasQ2ascRromjgXCsPeT6ayiTbi6P-AkXxPh1ZwAXP9wl2m2OA3oQYrb--rfxugaAaTwvGIMb6n3m1qkf-0_MEdXOiKCFenp3zb5hg39gvk-tfHZM4pw5NR2VHRUsJKkoPBLfoODmyOp8-LopCMexYYZlXzR0NN1Go_JzRIWoS3msrIWGuuvW8RRokfN99i6Wkgf-h2lL-hFvF-Q9-YFyS"'
+      '"pako:eNpVj81qw0AMhF9F6NRC_AI-BGK7zSXQQHLz5iBsObuk-8Naphjb7551fEl1EjPfiNGEjW8Zc7xHChqulXKQ5lCXOppeLPU3yLL9fGQB6x2PMxQfRw-99iEYd__c-GKFoJxOK8Yg2rjHslnlK__jeIaqPlEQH27vzvXPz_BVm7NO5_87OnJKfdcd5R1lDUUoKb4Q3KHlaMm0qfq0KgpFs2WFeVpb7mj4FYXKLQmlQfxldA3mEgfe4RBaEq4MpaftJi5PNtJU8w"'
     );
   });
 

src/lib/util/state.ts

@@ -1,13 +1,11 @@
-import { writable, get, derived } from 'svelte/store';
-import { persist, localStorage } from '@macfja/svelte-persistent-store';
-import { saveStatistics } from './stats';
+import { writable, get, type Readable, derived } from 'svelte/store';
+import { persist, localStorage } from './persist';
+import { saveStatistics, countLines } from './stats';
 import { serializeState, deserializeState } from './serde';
-import { cmdKey } from './util';
-import mermaid from 'mermaid';
+import { cmdKey, errorDebug, AsyncQueue } from './util';
+import { parse } from './mermaid';
 
-import type { Readable } from 'svelte/store';
 import type { MarkerData, State, ValidatedState } from '$lib/types';
-
 export const defaultState: State = {
   code: `graph TD
     A[Christmas] -->|Get money| B(Go shopping)
@@ -23,7 +21,6 @@ export const defaultState: State = {
     null,
     2
   ),
-	updateEditor: false,
   autoSync: true,
   updateDiagram: true
 };
@@ -42,21 +39,35 @@ const urlParseFailedState = `graph TD
 // inputStateStore handles all updates and is shared externally when exporting via URL, History, etc.
 export const inputStateStore = persist(writable(defaultState), localStorage(), 'codeStore');
 
-// All internal reads should be done via stateStore, but it should not be persisted/shared externally.
-export const stateStore: Readable<ValidatedState> = derived([inputStateStore], ([state]) => {
+export const currentState: ValidatedState = (() => {
+  const state = get(inputStateStore);
+  return {
+    ...state,
+    serialized: serializeState(state),
+    errorMarkers: [],
+    error: undefined,
+    editorMode: state.editorMode ?? 'code'
+  };
+})();
+
+let q: AsyncQueue<State>;
+
+const processState = async (state: State) => {
   const processed: ValidatedState = {
     ...state,
     serialized: '',
     errorMarkers: [],
-		error: undefined
+    error: undefined,
+    editorMode: state.editorMode ?? 'code'
   };
   // No changes should be done to fields part of `state`.
   try {
     processed.serialized = serializeState(state);
-		mermaid.parse(state.code);
+    await parse(state.code);
     JSON.parse(state.mermaid);
   } catch (e) {
     processed.error = e;
+    errorDebug();
     console.error(e);
     if (e.hash) {
       try {
@@ -75,7 +86,23 @@ export const stateStore: Readable<ValidatedState> = derived([inputStateStore], (
     }
   }
   return processed;
-});
+};
+
+// All internal reads should be done via stateStore, but it should not be persisted/shared externally.
+export const stateStore: Readable<ValidatedState> = derived(
+  [inputStateStore],
+  ([state], set) => {
+    if (!q) {
+      // Initialize the queue for first time.
+      q = new AsyncQueue(async (state: State) => {
+        const newState = await processState(state);
+        set(newState);
+      });
+    }
+    q.process(state);
+  },
+  currentState
+);
 
 export const loadState = (data: string): void => {
   let state: State;
@@ -102,7 +129,7 @@ export const loadState = (data: string): void => {
       state.mermaid = defaultState.mermaid;
     }
   }
-	updateCodeStore({ ...state, updateEditor: true });
+  updateCodeStore(state);
 };
 
 export const updateCodeStore = (newState: Partial<State>): void => {
@@ -115,14 +142,14 @@ let prompted = false;
 export const updateCode = (
   code: string,
   {
-		updateEditor,
     updateDiagram = false,
     resetPanZoom = false
-	}: { updateEditor: boolean; updateDiagram?: boolean; resetPanZoom?: boolean }
+  }: { updateDiagram?: boolean; resetPanZoom?: boolean } = {}
 ): void => {
+  console.log('updateCode', code);
+  const lines = countLines(code);
   saveStatistics(code);
-	const lines = (code.match(/\n/g) || '').length + 1;
-
+  errorDebug();
   if (lines > 50 && !prompted && get(stateStore).autoSync) {
     const turnOff = confirm(
       `Long diagram detected. Turn off Auto Sync? Use ${cmdKey} + Enter or click the sync logo to manually sync.`
@@ -140,13 +167,14 @@ export const updateCode = (
       state.pan = undefined;
       state.zoom = undefined;
     }
-		return { ...state, code, updateEditor, updateDiagram };
+    return { ...state, code, updateDiagram };
   });
 };
 
-export const updateConfig = (config: string, updateEditor: boolean): void => {
+export const updateConfig = (config: string): void => {
+  console.log('updateConfig', config);
   inputStateStore.update((state) => {
-		return { ...state, mermaid: config, updateEditor };
+    return { ...state, mermaid: config };
   });
 };
 
@@ -157,13 +185,17 @@ export const toggleDarkTheme = (dark: boolean): void => {
       config.theme = dark ? 'dark' : 'default';
     }
 
-		return { ...state, mermaid: JSON.stringify(config, null, 2), updateEditor: true };
+    return { ...state, mermaid: JSON.stringify(config, null, 2) };
   });
 };
 
+let urlDebounce: number;
 export const initURLSubscription = (): void => {
   stateStore.subscribe(({ serialized }) => {
+    clearTimeout(urlDebounce);
+    urlDebounce = window.setTimeout(() => {
       history.replaceState(undefined, undefined, `#${serialized}`);
+    }, 250);
   });
 };
 

src/lib/util/stats.test.ts

@@ -0,0 +1,19 @@
+import { describe, it, expect } from 'vitest';
+import { detectType } from './stats';
+describe('diagram detection', () => {
+  it('should detect diagrams correctly', () => {
+    expect(
+      detectType(`%%{{
+			graph`)
+    ).toBe('graph');
+    expect(detectType(`gitGraph`)).toBe('gitGraph');
+    expect(
+      detectType(`%%{{
+
+
+			flowChart
+			graph`)
+    ).toBe('flowChart');
+    expect(detectType(`loki -> thor`)).toBe(undefined);
+  });
+});

src/lib/util/stats.ts

@@ -1,52 +1,98 @@
-import { browser } from '$app/env';
+import { browser } from '$app/environment';
 import type { AnalyticsInstance } from 'analytics';
-
 export let analytics: AnalyticsInstance;
 
 export const initAnalytics = async (): Promise<void> => {
   if (browser && !analytics) {
     try {
-			const { Analytics } = await import('analytics');
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-			const googleAnalytics = await import('@analytics/google-analytics');
+      const [{ Analytics }, { default: plausible }] = await Promise.all([
+        import('analytics'),
+        import('analytics-plugin-plausible')
+      ]);
       analytics = Analytics({
         app: 'mermaid-live-editor',
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         plugins: [
-					// eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
-					googleAnalytics.init({
-						trackingId: 'UA-153180559-1'
+          plausible({
+            domain: 'mermaid.live',
+            hashMode: false,
+            trackLocalhost: false, // By default 'false'
+            apiHost: 'https://plausible.io'
           })
         ]
       });
-		} catch {
+    } catch (e) {
+      console.log(e);
       console.info('Analytics blocked ;)');
     }
   }
 };
 
-const detectType = (text: string): string => {
-	return text
+export const detectType = (text: string): string => {
+  const possibleDiagramTypes = [
+    'classDiagram',
+    'erDiagram',
+    'flowChart',
+    'gantt',
+    'gitGraph',
+    'graph',
+    'journey',
+    'pie',
+    'stateDiagram'
+  ];
+  const firstLine = text
     .replace(/^\s*%%.*\n/g, '\n')
     .trimStart()
-		.split(' ')[0];
+    .split(' ')[0]
+    .toLowerCase();
+  const detectedDiagram = possibleDiagramTypes.find((d) => firstLine.includes(d.toLowerCase()));
+  return detectedDiagram;
+};
+
+export const countLines = (code: string): number => {
+  return (code.match(/\n/g) || '').length + 1;
 };
 
-// manual debounce
-let timeout: number;
 export const saveStatistics = (graph: string): void => {
-	if (analytics) {
-		clearTimeout(timeout);
-		// Only save statistics after a 5 sec delay
-		timeout = window.setTimeout(() => {
   const graphType = detectType(graph);
-			console.debug(`ga: send event: render ${graphType}`);
-			void logEvent('render', { graphType });
-		}, 5000);
+  if (!graphType) {
+    return;
   }
+  const length = countLines(graph);
+  logEvent('render', { graphType, length });
 };
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const logEvent = async (name: string, data?: any): Promise<void> => {
-	await analytics?.track(name, data);
+const minutesToMilliSeconds = (minutes: number): number => {
+  return minutes * 60_000;
+};
+
+const defaultDelay = minutesToMilliSeconds(1);
+const delaysPerEvent = {
+  render: minutesToMilliSeconds(5),
+  panZoom: minutesToMilliSeconds(10),
+  copyClipboard: defaultDelay,
+  download: defaultDelay,
+  copyMarkdown: defaultDelay,
+  loadGist: defaultDelay,
+  loadSampleDiagram: defaultDelay,
+  renderDiagram: defaultDelay,
+  history: defaultDelay,
+  migration: defaultDelay,
+  themeChange: defaultDelay
+};
+export type AnalyticsEvent = keyof typeof delaysPerEvent;
+const timeouts: Record<string, number> = {};
+// manual debounce to reduce the number of events sent to analytics
+export const logEvent = (name: AnalyticsEvent, data?: unknown): void => {
+  if (!analytics) {
+    return;
+  }
+  const key = data ? JSON.stringify({ name, data }) : name;
+  if (timeouts[key] === undefined) {
+    void analytics.track(name, data);
+  } else {
+    clearTimeout(timeouts[key]);
+  }
+  timeouts[key] = window.setTimeout(() => {
+    delete timeouts[key];
+  }, delaysPerEvent[name]);
 };

src/lib/util/theme.ts

@@ -1,6 +1,6 @@
 import { writable } from 'svelte/store';
 import type { Writable } from 'svelte/store';
-import { persist, localStorage } from '@macfja/svelte-persistent-store';
+import { persist, localStorage } from '$lib/util/persist';
 import { logEvent } from './stats';
 
 export interface ThemeConfig {
@@ -34,5 +34,5 @@ export const setTheme = (theme: string): void => {
   const isDark = darkThemes.includes(theme);
   console.log('Setting theme', theme);
   themeStore.set({ theme, isDark });
-	void logEvent('themeChange', { theme, isDark });
+  logEvent('themeChange', { theme, isDark });
 };

src/lib/util/util.ts

@@ -2,6 +2,8 @@ import { initURLSubscription, loadState, updateCodeStore } from './state';
 import { analytics, initAnalytics } from './stats';
 import { loadDataFromUrl } from './fileLoaders/loader';
 import { initLoading } from './loading';
+import { applyMigrations } from './migrations';
+import { init } from './mermaid';
 
 export const loadStateFromURL = (): void => {
   loadState(window.location.hash.slice(1));
@@ -14,6 +16,8 @@ export const syncDiagram = (): void => {
 };
 
 export const initHandler = async (): Promise<void> => {
+  applyMigrations();
+  await initLoading('Loading Mermaid...', init());
   loadStateFromURL();
   await initLoading('Loading Gist...', loadDataFromUrl().catch(console.error));
   syncDiagram();
@@ -25,4 +29,33 @@ export const initHandler = async (): Promise<void> => {
 export const isMac = navigator.platform.toUpperCase().indexOf('MAC') >= 0;
 export const cmdKey = isMac ? 'Cmd' : 'Ctrl';
 
-export const debounceEnabled = window.localStorage.getItem('noDebounce') !== 'true';
+let count = 0;
+export const errorDebug = (limit = 100) => {
+  count += 1;
+  if (count > limit) {
+    console.log(count, limit);
+    // eslint-disable-next-line no-debugger
+    debugger;
+  }
+};
+
+// To queue async tasks so they are executed one after the other, not concurrently.
+export class AsyncQueue<T> {
+  private readonly queue: T[] = [];
+  private running = false;
+  constructor(private processor: (item: T) => Promise<void>) {}
+  public async process(item: T): Promise<void> {
+    this.queue.push(item);
+    if (this.running) {
+      return;
+    }
+    this.running = true;
+    while (this.queue.length > 0) {
+      const item = this.queue.shift();
+      if (item) {
+        await this.processor(item);
+      }
+    }
+    this.running = false;
+  }
+}

src/routes/+layout.svelte

@@ -0,0 +1,87 @@
+<script lang="ts">
+  import '../app.postcss';
+  import { base } from '$app/paths';
+  import { onMount } from 'svelte';
+  import { loadingStateStore } from '$lib/util/loading';
+  import { setTheme, themeStore } from '$lib/util/theme';
+  import { toggleDarkTheme } from '$lib/util/state';
+  import { initHandler } from '$lib/util/util';
+
+  // This can be removed once https://github.com/sveltejs/kit/issues/1612 is fixed.
+  // Then move it into src and vite will bundle it automatically.
+  onMount(() => {
+    window.addEventListener('hashchange', async (ev) => {
+      await initHandler();
+    });
+    if ('serviceWorker' in navigator) {
+      navigator.serviceWorker
+        .register(`${base}/service-worker.js`, {
+          scope: `${base}/`
+        })
+        .then(function (registration) {
+          console.log('Registration successful, scope is:', registration.scope);
+        })
+        .catch(function (error) {
+          console.log('Service worker registration failed, error:', error);
+        });
+    }
+
+    const isDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches;
+
+    if ($themeStore.theme === undefined) {
+      setTheme(isDarkMode ? 'dark' : 'light');
+    }
+
+    themeStore.subscribe(({ theme, isDark }) => {
+      if (theme) {
+        document.getElementsByTagName('html')[0].setAttribute('data-theme', theme);
+        toggleDarkTheme(isDark);
+      }
+    });
+  });
+</script>
+
+<main class="h-screen text-primary-content">
+  <slot />
+</main>
+
+{#if $loadingStateStore.loading}
+  <div
+    class="w-screen h-screen z-50 absolute left-0 top-0 bg-gray-600 opacity-50 flex align-middle justify-center">
+    <div class="text-indigo-100 text-4xl font-bold my-auto">
+      <div class="loader mx-auto" />
+      <div>{$loadingStateStore.message}</div>
+    </div>
+  </div>
+{/if}
+
+<style>
+  .loader {
+    border: 0.45em solid #f3f3f3;
+    border-radius: 50%;
+    border-top: 0.45em solid #6365f1;
+    width: 3em;
+    height: 3em;
+    -webkit-animation: spin 2s linear infinite; /* Safari */
+    animation: spin 2s linear infinite;
+  }
+
+  /* Safari */
+  @-webkit-keyframes spin {
+    0% {
+      -webkit-transform: rotate(0deg);
+    }
+    100% {
+      -webkit-transform: rotate(360deg);
+    }
+  }
+
+  @keyframes spin {
+    0% {
+      transform: rotate(0deg);
+    }
+    100% {
+      transform: rotate(360deg);
+    }
+  }
+</style>

src/routes/+layout.ts

@@ -0,0 +1,3 @@
+export const prerender = true;
+export const csr = true;
+export const ssr = false;

src/routes/+page.svelte

@@ -0,0 +1,17 @@
+<script lang="ts">
+  import { goto } from '$app/navigation';
+  import { onMount } from 'svelte';
+  import { base } from '$app/paths';
+
+  onMount(async () => {
+    // Handle old live editor links and redirect to new version
+    const hash = window.location.hash.split('/');
+    let newURL = 'edit';
+    if (hash.length > 2) {
+      newURL = `${hash[1]}#${hash[2]}`;
+    }
+    await goto(`${base}/${newURL}`, {
+      replaceState: true
+    });
+  });
+</script>

src/routes/[fallback]/manifest.json.ts

@@ -1,2 +0,0 @@
-import { GET as manifestGet } from '../manifest.json';
-export const GET = manifestGet;

src/routes/__layout.svelte

@@ -1,87 +0,0 @@
-<script lang="ts">
-	import '../app.postcss';
-	import { base } from '$app/paths';
-	import { onMount } from 'svelte';
-	import { loadingStateStore } from '$lib/util/loading';
-	import { setTheme, themeStore } from '$lib/util/theme';
-	import { toggleDarkTheme } from '$lib/util/state';
-	import { initHandler } from '$lib/util/util';
-
-	// This can be removed once https://github.com/sveltejs/kit/issues/1612 is fixed.
-	// Then move it into src and vite will bundle it automatically.
-	onMount(() => {
-		window.addEventListener('hashchange', async (ev) => {
-			await initHandler();
-		});
-		if ('serviceWorker' in navigator) {
-			navigator.serviceWorker
-				.register(`${base}/service-worker.js`, {
-					scope: `${base}/`
-				})
-				.then(function (registration) {
-					console.log('Registration successful, scope is:', registration.scope);
-				})
-				.catch(function (error) {
-					console.log('Service worker registration failed, error:', error);
-				});
-		}
-
-		const isDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches;
-
-		if ($themeStore.theme === undefined) {
-			setTheme(isDarkMode ? 'dark' : 'light');
-		}
-
-		themeStore.subscribe(({ theme, isDark }) => {
-			if (theme) {
-				document.getElementsByTagName('html')[0].setAttribute('data-theme', theme);
-				toggleDarkTheme(isDark);
-			}
-		});
-	});
-</script>
-
-<main class="h-screen text-primary-content">
-	<slot />
-</main>
-
-{#if $loadingStateStore.loading}
-	<div
-		class="w-screen h-screen z-50 absolute left-0 top-0 bg-gray-600 opacity-50 flex align-middle justify-center">
-		<div class="text-indigo-100 text-4xl font-bold my-auto">
-			<div class="loader mx-auto" />
-			<div>{$loadingStateStore.message}</div>
-		</div>
-	</div>
-{/if}
-
-<style>
-	.loader {
-		border: 0.45em solid #f3f3f3;
-		border-radius: 50%;
-		border-top: 0.45em solid #6365f1;
-		width: 3em;
-		height: 3em;
-		-webkit-animation: spin 2s linear infinite; /* Safari */
-		animation: spin 2s linear infinite;
-	}
-
-	/* Safari */
-	@-webkit-keyframes spin {
-		0% {
-			-webkit-transform: rotate(0deg);
-		}
-		100% {
-			-webkit-transform: rotate(360deg);
-		}
-	}
-
-	@keyframes spin {
-		0% {
-			transform: rotate(0deg);
-		}
-		100% {
-			transform: rotate(360deg);
-		}
-	}
-</style>

src/routes/edit.svelte

@@ -1,241 +0,0 @@
-<script lang="ts">
-	import Editor from '$lib/components/editor.svelte';
-	import Navbar from '$lib/components/navbar.svelte';
-	import Preset from '$lib/components/preset.svelte';
-	import Actions from '$lib/components/actions.svelte';
-	import View from '$lib/components/view.svelte';
-	import Card from '$lib/components/card/card.svelte';
-	import History from '$lib/components/history/history.svelte';
-	import { updateCode, updateConfig, inputStateStore, stateStore } from '$lib/util/state';
-	import { cmdKey, debounceEnabled, initHandler, syncDiagram } from '$lib/util/util';
-	import { onMount } from 'svelte';
-	import type { EditorUpdateEvent, State, Tab, DocConfig } from '$lib/types';
-	import { base } from '$app/paths';
-
-	type Modes = 'code' | 'config';
-	type Languages = 'mermaid' | 'json';
-
-	let selectedMode: Modes = 'code';
-	const languageMap: { [key in Modes]: Languages } = {
-		code: 'mermaid',
-		config: 'json'
-	};
-	const docURLBase = 'https://mermaid-js.github.io/mermaid';
-	const docMap: DocConfig = {
-		graph: {
-			code: '/#/flowchart',
-			config: '/#/flowchart?id=configuration'
-		},
-		flowchart: {
-			code: '/#/flowchart',
-			config: '/#/flowchart?id=configuration'
-		},
-		sequenceDiagram: {
-			code: '/#/sequenceDiagram',
-			config: '/#/sequenceDiagram?id=configuration'
-		},
-		classDiagram: {
-			code: '/#/classDiagram',
-			config: '/#/classDiagram?id=configuration'
-		},
-		'stateDiagram-v2': {
-			code: '/#/stateDiagram'
-		},
-		gantt: {
-			code: '/#/gantt',
-			config: '/#/gantt?id=configuration'
-		},
-		pie: {
-			code: '/#/pie'
-		},
-		erDiagram: {
-			code: '/#/entityRelationshipDiagram',
-			config: '/#/entityRelationshipDiagram?id=styling'
-		},
-		journey: {
-			code: '/#/user-journey'
-		},
-		gitGraph: {
-			code: '/#/gitgraph',
-			config: '/#/gitgraph?id=gitgraph-specific-configuration-options'
-		}
-	};
-	let text = '';
-	let docURL = docURLBase;
-	let language: Languages = 'mermaid';
-	const handleModeUpdate = (mode: Modes) => {
-		if (mode === 'code') {
-			text = $stateStore.code;
-		} else {
-			text = $stateStore.mermaid;
-		}
-	};
-	$: language = languageMap[selectedMode];
-	$: handleModeUpdate(selectedMode);
-
-	stateStore.subscribe((state: State) => {
-		if (state.updateEditor) {
-			text = selectedMode === 'code' ? state.code : state.mermaid;
-		}
-		const codeTypeMatch = /([\S]+)[\s\n]/.exec(state.code);
-		if (codeTypeMatch && codeTypeMatch.length > 1) {
-			const docKey = codeTypeMatch[1];
-			const docConfig = docMap[docKey] ?? { code: '' };
-			docURL = docURLBase + (docConfig[selectedMode] ?? docConfig.code ?? '');
-		}
-	});
-	const tabSelectHandler = (message: CustomEvent<Tab>) => {
-		selectedMode = message.detail.id === 'code' ? 'code' : 'config';
-		$inputStateStore.updateEditor = true;
-	};
-	const tabs: Tab[] = [
-		{
-			id: 'code',
-			title: 'Code',
-			icon: 'fas fa-code'
-		},
-		{
-			id: 'config',
-			title: 'Config',
-			icon: 'fas fa-cogs'
-		}
-	];
-
-	const handleUpdate = (text: string) => {
-		if (selectedMode === 'code') {
-			updateCode(text, {
-				updateEditor: false
-			});
-		} else {
-			updateConfig(text, false);
-		}
-	};
-
-	let debounce: { [key: string]: number } = {};
-	const updateHandler = ({ detail: { text } }: CustomEvent<EditorUpdateEvent>) => {
-		console.log({ debounceEnabled });
-		if (debounceEnabled) {
-			clearTimeout(debounce[selectedMode]);
-			debounce[selectedMode] = window.setTimeout(() => {
-				handleUpdate(text);
-			}, 300);
-		} else {
-			handleUpdate(text);
-		}
-	};
-
-	onMount(async () => {
-		await initHandler();
-		const resizer = document.getElementById('resizeHandler');
-		const element = document.getElementById('editorPane');
-		const resize = (e: { pageX: number }) => {
-			const newWidth = e.pageX - element.getBoundingClientRect().left;
-			if (newWidth > 50) {
-				element.style.width = `${newWidth}px`;
-			}
-		};
-
-		const stopResize = () => {
-			window.removeEventListener('mousemove', resize);
-		};
-		resizer.addEventListener('mousedown', (e) => {
-			e.preventDefault();
-			window.addEventListener('mousemove', resize);
-			window.addEventListener('mouseup', stopResize);
-		});
-	});
-</script>
-
-<div class="h-full flex flex-col overflow-hidden">
-	<Navbar />
-	<div class="flex-1 flex overflow-hidden">
-		<div class="hidden md:flex flex-col" id="editorPane" style="width: 40%">
-			<Card on:select={tabSelectHandler} {tabs} isCloseable={false} title="Mermaid">
-				<div slot="actions" class="flex flex-row items-center">
-					<div class="form-control flex-row items-center">
-						<label class="cursor-pointer label" for="autoSync">
-							<span> Auto sync</span>
-							<input
-								type="checkbox"
-								class="toggle {$stateStore.autoSync ? 'btn-secondary' : 'toggle-primary'} ml-1"
-								id="autoSync"
-								bind:checked={$inputStateStore.autoSync} />
-						</label>
-					</div>
-
-					{#if !$stateStore.autoSync}
-						<button
-							class="btn btn-secondary btn-xs mr-1"
-							title="Sync Diagram ({cmdKey} + Enter)"
-							data-cy="sync"
-							on:click={syncDiagram}><i class="fas fa-sync" /></button>
-					{/if}
-
-					<button class="btn btn-secondary btn-xs" title="View documentation">
-						<a target="_blank" href={docURL} data-cy="docs"><i class="fas fa-book mr-1" />Docs</a>
-					</button>
-				</div>
-
-				<Editor on:update={updateHandler} {language} {text} />
-			</Card>
-
-			<div class="-mt-2">
-				<Preset />
-				<History />
-				<Actions />
-			</div>
-		</div>
-		<div id="resizeHandler" class="hidden md:block" />
-		<div class="flex-1 flex flex-col overflow-hidden">
-			<Card title="Diagram" isCloseable={false}>
-				<div slot="actions" class="flex flex-row items-center">
-					<label class="cursor-pointer label py-0" for="panZoom">
-						<span>Pan & Zoom</span>
-						<input
-							type="checkbox"
-							class="toggle {$stateStore.panZoom ? 'btn-secondary' : 'toggle-primary'} ml-1"
-							id="panZoom"
-							bind:checked={$inputStateStore.panZoom} />
-					</label>
-					<a
-						href={`${base}/view#${$stateStore.serialized}`}
-						target="_blank"
-						class="btn btn-secondary btn-xs"
-						title="View diagram in new page"
-						><i class="fas fa-external-link-alt mr-1" />Full screen</a>
-				</div>
-
-				<div class="flex-1 overflow-auto">
-					<View />
-				</div>
-			</Card>
-			<div class="md:hidden rounded shadow p-2 mx-2">
-				Code editing not supported on mobile. Please use a desktop browser.
-			</div>
-		</div>
-	</div>
-</div>
-
-<style>
-	#resizeHandler {
-		cursor: col-resize;
-		padding: 0 2px;
-	}
-
-	#resizeHandler::after {
-		width: 2px;
-		height: 100%;
-		top: 0;
-		content: '';
-		position: absolute;
-		background-color: hsla(var(--b3));
-		margin-left: -1px;
-		transition-duration: 0.2s;
-	}
-
-	#resizeHandler:hover::after {
-		margin-left: -2px;
-		background-color: hsla(var(--p));
-		width: 4px;
-	}
-</style>

src/routes/edit/+page.svelte

@@ -0,0 +1,202 @@
+<script lang="ts">
+  import Editor from '$lib/components/Editor.svelte';
+  import Navbar from '$lib/components/Navbar.svelte';
+  import Preset from '$lib/components/Preset.svelte';
+  import Actions from '$lib/components/Actions.svelte';
+  import View from '$lib/components/View.svelte';
+  import Card from '$lib/components/Card/Card.svelte';
+  import History from '$lib/components/History/History.svelte';
+  import { inputStateStore, stateStore, updateCodeStore } from '$lib/util/state';
+  import { cmdKey, initHandler, syncDiagram } from '$lib/util/util';
+  import { onMount } from 'svelte';
+  import type { Tab, DocConfig, EditorMode, ValidatedState } from '$lib/types';
+  import { base } from '$app/paths';
+
+  const docURLBase = 'https://mermaid-js.github.io/mermaid';
+  const docMap: DocConfig = {
+    graph: {
+      code: '/#/flowchart',
+      config: '/#/flowchart?id=configuration'
+    },
+    flowchart: {
+      code: '/#/flowchart',
+      config: '/#/flowchart?id=configuration'
+    },
+    sequenceDiagram: {
+      code: '/#/sequenceDiagram',
+      config: '/#/sequenceDiagram?id=configuration'
+    },
+    classDiagram: {
+      code: '/#/classDiagram',
+      config: '/#/classDiagram?id=configuration'
+    },
+    'stateDiagram-v2': {
+      code: '/#/stateDiagram'
+    },
+    gantt: {
+      code: '/#/gantt',
+      config: '/#/gantt?id=configuration'
+    },
+    pie: {
+      code: '/#/pie'
+    },
+    erDiagram: {
+      code: '/#/entityRelationshipDiagram',
+      config: '/#/entityRelationshipDiagram?id=styling'
+    },
+    journey: {
+      code: '/#/user-journey'
+    },
+    gitGraph: {
+      code: '/#/gitgraph',
+      config: '/#/gitgraph?id=gitgraph-specific-configuration-options'
+    }
+  };
+  let docURL = docURLBase;
+  let activeTabID = 'code';
+  stateStore.subscribe(({ code, editorMode }: ValidatedState) => {
+    activeTabID = editorMode;
+    const codeTypeMatch = /([\S]+)[\s\n]/.exec(code);
+    if (codeTypeMatch && codeTypeMatch.length > 1) {
+      const docKey = codeTypeMatch[1];
+      const docConfig = docMap[docKey] ?? { code: '' };
+      docURL = docURLBase + (docConfig[editorMode] ?? docConfig.code ?? '');
+    }
+  });
+
+  const tabSelectHandler = (message: CustomEvent<Tab>) => {
+    const editorMode: EditorMode = message.detail.id === 'code' ? 'code' : 'config';
+    updateCodeStore({ editorMode });
+  };
+
+  const tabs: Tab[] = [
+    {
+      id: 'code',
+      title: 'Code',
+      icon: 'fas fa-code'
+    },
+    {
+      id: 'config',
+      title: 'Config',
+      icon: 'fas fa-cogs'
+    }
+  ];
+
+  onMount(async () => {
+    await initHandler();
+    const resizer = document.getElementById('resizeHandler');
+    const element = document.getElementById('editorPane');
+    const resize = (e: { pageX: number }) => {
+      const newWidth = e.pageX - element.getBoundingClientRect().left;
+      if (newWidth > 50) {
+        element.style.width = `${newWidth}px`;
+      }
+    };
+
+    const stopResize = () => {
+      window.removeEventListener('mousemove', resize);
+    };
+    resizer.addEventListener('mousedown', (e) => {
+      e.preventDefault();
+      window.addEventListener('mousemove', resize);
+      window.addEventListener('mouseup', stopResize);
+    });
+  });
+</script>
+
+<div class="h-full flex flex-col overflow-hidden">
+  <Navbar />
+  <div class="flex-1 flex overflow-hidden">
+    <div class="hidden md:flex flex-col" id="editorPane" style="width: 40%">
+      <Card on:select={tabSelectHandler} {tabs} isCloseable={false} {activeTabID} title="Mermaid">
+        <div slot="actions" class="flex flex-row items-center">
+          <div class="form-control flex-row items-center">
+            <label class="cursor-pointer label" for="autoSync">
+              <span> Auto sync</span>
+              <input
+                type="checkbox"
+                class="toggle {$stateStore.autoSync ? 'btn-secondary' : 'toggle-primary'} ml-1"
+                id="autoSync"
+                bind:checked={$inputStateStore.autoSync} />
+            </label>
+          </div>
+
+          {#if !$stateStore.autoSync}
+            <button
+              class="btn btn-secondary btn-xs mr-1"
+              title="Sync Diagram ({cmdKey} + Enter)"
+              data-cy="sync"
+              on:click={syncDiagram}><i class="fas fa-sync" /></button>
+          {/if}
+
+          <button class="btn btn-secondary btn-xs" title="View documentation">
+            <a target="_blank" rel="noreferrer" href={docURL} data-cy="docs">
+              <i class="fas fa-book mr-1" />Docs
+            </a>
+          </button>
+        </div>
+
+        <Editor />
+      </Card>
+
+      <div class="-mt-2">
+        <Preset />
+        <History />
+        <Actions />
+      </div>
+    </div>
+    <div id="resizeHandler" class="hidden md:block" />
+    <div class="flex-1 flex flex-col overflow-hidden">
+      <Card title="Diagram" isCloseable={false}>
+        <div slot="actions" class="flex flex-row items-center">
+          <label class="cursor-pointer label py-0" for="panZoom">
+            <span>Pan & Zoom</span>
+            <input
+              type="checkbox"
+              class="toggle {$stateStore.panZoom ? 'btn-secondary' : 'toggle-primary'} ml-1"
+              id="panZoom"
+              bind:checked={$inputStateStore.panZoom} />
+          </label>
+          <a
+            href={`${base}/view#${$stateStore.serialized}`}
+            target="_blank"
+            rel="noreferrer"
+            class="btn btn-secondary btn-xs"
+            title="View diagram in new page"
+            ><i class="fas fa-external-link-alt mr-1" />Full screen</a>
+        </div>
+
+        <div class="flex-1 overflow-auto">
+          <View />
+        </div>
+      </Card>
+      <div class="md:hidden rounded shadow p-2 mx-2">
+        Code editing not supported on mobile. Please use a desktop browser.
+      </div>
+    </div>
+  </div>
+</div>
+
+<style>
+  #resizeHandler {
+    cursor: col-resize;
+    padding: 0 2px;
+  }
+
+  #resizeHandler::after {
+    width: 2px;
+    height: 100%;
+    top: 0;
+    content: '';
+    position: absolute;
+    background-color: hsla(var(--b3));
+    margin-left: -1px;
+    transition-duration: 0.2s;
+  }
+
+  #resizeHandler:hover::after {
+    margin-left: -2px;
+    background-color: hsla(var(--p));
+    width: 4px;
+  }
+</style>

src/routes/index.svelte

@@ -1,17 +0,0 @@
-<script lang="ts">
-	import { goto } from '$app/navigation';
-	import { onMount } from 'svelte';
-	import { base } from '$app/paths';
-
-	onMount(async () => {
-		// Handle old live editor links and redirect to new version
-		const hash = window.location.hash.split('/');
-		let newURL = 'edit';
-		if (hash.length > 2) {
-			newURL = `${hash[1]}#${hash[2]}`;
-		}
-		await goto(`${base}/${newURL}`, {
-			replaceState: true
-		});
-	});
-</script>

src/routes/manifest.json.ts

@@ -1,28 +0,0 @@
-import { base } from '$app/paths';
-export const GET = (): { body: unknown } => {
-	return {
-		body: {
-			short_name: 'Mermaid',
-			name: 'Mermaid Live Editor',
-			icons: [
-				{
-					src: `${base}/icon-192.png`,
-					type: 'image/png',
-					sizes: '192x192'
-				},
-				{
-					src: `${base}/icon-512.png`,
-					type: 'image/png',
-					sizes: '512x512'
-				}
-			],
-			start_url: `${base}/edit/`,
-			background_color: '#6366F1',
-			display: 'standalone',
-			scope: `${base}/edit/`,
-			theme_color: '#6366F1',
-			description: 'FlowChart & Diagrams Editor.',
-			orientation: 'landscape'
-		}
-	};
-};

src/routes/view.svelte

@@ -1,8 +0,0 @@
-<script lang="ts">
-	import View from '$lib/components/view.svelte';
-	import { initHandler } from '$lib/util/util';
-	import { onMount } from 'svelte';
-	onMount(initHandler);
-</script>
-
-<View />

src/routes/view/+page.svelte

@@ -0,0 +1,8 @@
+<script lang="ts">
+  import View from '$lib/components/View.svelte';
+  import { initHandler } from '$lib/util/util';
+  import { onMount } from 'svelte';
+  onMount(initHandler);
+</script>
+
+<View />

src/tests/setup.ts

@@ -1,4 +1,11 @@
 import matchers from '@testing-library/jest-dom/matchers';
-import { expect } from 'vitest';
+import { expect, beforeAll, vi } from 'vitest';
 
 expect.extend(matchers);
+
+// TODO: Remove once https://github.com/sveltejs/kit/issues/6259 is closed.
+beforeAll(() => {
+  vi.mock('$app/environment', () => ({
+    browser: 'window' in globalThis
+  }));
+});

static/favicon.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 491 491" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <path d="M490.16,84.61C490.16,37.912 452.248,0 405.55,0L84.61,0C37.912,0 0,37.912 0,84.61L0,405.55C0,452.248 37.912,490.16 84.61,490.16L405.55,490.16C452.248,490.16 490.16,452.248 490.16,405.55L490.16,84.61Z" style="fill:rgb(255,54,112);"/>
+    <path d="M407.48,111.18C335.587,108.103 269.573,152.338 245.08,220C220.587,152.338 154.573,108.103 82.68,111.18C80.285,168.229 107.577,222.632 154.74,254.82C178.908,271.419 193.35,298.951 193.27,328.27L193.27,379.13L296.9,379.13L296.9,328.27C296.816,298.953 311.255,271.42 335.42,254.82C382.596,222.644 409.892,168.233 407.48,111.18Z" style="fill:white;fill-rule:nonzero;"/>
+</svg>

static/manifest.json

@@ -0,0 +1,18 @@
+{
+	"short_name": "Mermaid",
+	"name": "Mermaid Live Editor",
+	"icons": [
+		{
+			"src": "/favicon.png",
+			"type": "image/png",
+			"sizes": "512x512"
+		}
+	],
+	"start_url": "/edit/",
+	"background_color": "#6366F1",
+	"display": "standalone",
+	"scope": "/edit/",
+	"theme_color": "#6366F1",
+	"description": "FlowChart & Diagrams Editor.",
+	"orientation": "landscape"
+}

svelte.config.js

@@ -19,10 +19,7 @@ const config = {
           base: `/mermaid-live-editor`
         }
       : {},
-		trailingSlash: 'ignore',
-		prerender: {
-			default: true
-		}
+    trailingSlash: 'ignore'
   }
 };
 

tsconfig.json

@@ -5,7 +5,9 @@
     "src/**/*.svelte",
     "cypress/**/*.ts",
     "cypress/**/*.js",
-		"static/**/*.js"
+    "cypress/**/*.json",
+    "static/**/*.js",
+    "static/**/*.json"
   ],
   "compilerOptions": {
     "resolveJsonModule": true,

vite.config.js

@@ -4,9 +4,6 @@ const config = {
   plugins: [sveltekit()],
   envPrefix: 'MERMAID_',
   optimizeDeps: { include: ['mermaid'] },
-	ssr: {
-		noExternal: ['@macfja/svelte-persistent-store']
-	},
   server: {
     port: 3000,
     host: true