show autosave checkbox only if fileHandle exists

# Conflicts:
#	src/tests/__snapshots__/regressionTests.test.tsx.snap

.github/workflows/autorelease-excalidraw.yml

@@ -1,26 +0,0 @@
-name: Auto release @excalidraw/excalidraw-next
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  Auto-release-excalidraw-next:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 2
-      - name: Setup Node.js 14.x
-        uses: actions/setup-node@v2
-        with:
-          node-version: 14.x
-      - name: Set up publish access
-        run: |
-          npm config set //registry.npmjs.org/:_authToken ${NPM_TOKEN}
-        env:
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-      - name: Auto release
-        run: |
-          yarn autorelease

.gitignore

@@ -5,11 +5,9 @@
 .env.test.local
 .envrc
 .eslintcache
-.history
 .idea
 .vercel
 .vscode
-.yarn
 *.log
 *.tgz
 build

Dockerfile

@@ -10,7 +10,7 @@ ARG NODE_ENV=production
 COPY . .
 RUN yarn build:app:docker
 
-FROM nginx:1.21-alpine
+FROM nginx:1.17-alpine
 
 COPY --from=build /opt/node_app/build /usr/share/nginx/html
 

README.md

@@ -93,7 +93,7 @@ These instructions will get you a copy of the project up and running on your loc
 #### Requirements
 
 - [Node.js](https://nodejs.org/en/)
-- [Yarn](https://yarnpkg.com/getting-started/install) (v1 or v2.4.2+)
+- [Yarn](https://yarnpkg.com/getting-started/install)
 - [Git](https://git-scm.com/downloads)
 
 #### Clone the repo
@@ -102,20 +102,6 @@ These instructions will get you a copy of the project up and running on your loc
 git clone https://github.com/excalidraw/excalidraw.git
 ```
 
-#### Install the dependencies
-
-```bash
-yarn
-```
-
-#### Start the server
-
-```bash
-yarn start
-```
-
-Now you can open [http://localhost:3000](http://localhost:3000) and start coding in your favorite code editor.
-
 #### Commands
 
 | Command            | Description                       |

firebase-project/firebase.json

@@ -2,8 +2,5 @@
   "firestore": {
     "rules": "firestore.rules",
     "indexes": "firestore.indexes.json"
-  },
-  "storage": {
-    "rules": "storage.rules"
   }
 }

firebase-project/storage.rules

@@ -1,12 +0,0 @@
-rules_version = '2';
-service firebase.storage {
-  match /b/{bucket}/o {
-    match /{migrations} {
-      match /{scenes}/{scene} {
-      	allow get, write: if true;
-        // redundant, but let's be explicit'
-        allow list: if false;
-      }
-    }
-  }
-}

package.json

@@ -19,23 +19,22 @@
     ]
   },
   "dependencies": {
-    "@sentry/browser": "6.2.5",
-    "@sentry/integrations": "6.2.5",
+    "@sentry/browser": "6.2.2",
+    "@sentry/integrations": "6.2.1",
     "@testing-library/jest-dom": "5.11.10",
-    "@testing-library/react": "11.2.6",
+    "@testing-library/react": "11.2.5",
     "@types/jest": "26.0.22",
     "@types/react": "17.0.3",
-    "@types/react-dom": "17.0.3",
+    "@types/react-dom": "17.0.2",
     "@types/socket.io-client": "1.4.36",
-    "browser-fs-access": "0.18.0",
+    "browser-fs-access": "0.16.2",
     "clsx": "1.1.1",
-    "firebase": "8.3.3",
-    "i18next-browser-languagedetector": "6.1.0",
+    "firebase": "8.2.10",
+    "i18next-browser-languagedetector": "6.0.1",
     "lodash.throttle": "4.1.1",
     "nanoid": "3.1.22",
     "open-color": "1.8.0",
     "pako": "1.0.11",
-    "perfect-freehand": "0.4.7",
     "png-chunk-text": "1.0.0",
     "png-chunks-encode": "1.0.0",
     "png-chunks-extract": "1.0.0",
@@ -44,10 +43,10 @@
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-scripts": "4.0.3",
-    "roughjs": "4.4.1",
-    "sass": "1.32.10",
+    "roughjs": "4.3.1",
+    "sass": "1.32.8",
     "socket.io-client": "2.3.1",
-    "typescript": "4.2.4"
+    "typescript": "4.2.3"
   },
   "devDependencies": {
     "@excalidraw/eslint-config": "1.0.0",
@@ -55,9 +54,9 @@
     "@types/lodash.throttle": "4.1.6",
     "@types/pako": "1.0.1",
     "@types/resize-observer-browser": "0.1.5",
-    "eslint-config-prettier": "8.3.0",
+    "eslint-config-prettier": "8.1.0",
     "eslint-plugin-prettier": "3.3.1",
-    "firebase-tools": "9.9.0",
+    "firebase-tools": "9.6.1",
     "husky": "4.3.8",
     "jest-canvas-mock": "2.3.1",
     "lint-staged": "10.5.4",
@@ -104,7 +103,6 @@
     "test:other": "yarn prettier --list-different",
     "test:typecheck": "tsc",
     "test:update": "yarn test:app --updateSnapshot --watchAll=false",
-    "test": "yarn test:app",
-    "autorelease": "node scripts/autorelease.js"
+    "test": "yarn test:app"
   }
 }

public/index.html

@@ -107,17 +107,15 @@
 
     <!-- FIXME: remove this when we update CRA (fix SW caching) -->
     <style>
-      body,
-      html {
+      body {
         margin: 0;
         --ui-font: system-ui, BlinkMacSystemFont, -apple-system, Segoe UI,
           Roboto, Helvetica, Arial, sans-serif;
         font-family: var(--ui-font);
         -webkit-text-size-adjust: 100%;
 
-        width: 100%;
-        height: 100%;
-        overflow: hidden;
+        width: 100vw;
+        height: 100vh;
       }
 
       .visually-hidden {
@@ -127,7 +125,6 @@
         overflow: hidden;
         clip: rect(1px, 1px, 1px, 1px);
         white-space: nowrap; /* added line */
-        user-select: none;
       }
 
       .LoadingMessage {
@@ -152,21 +149,6 @@
       }
       #root {
         height: 100%;
-        -webkit-touch-callout: none;
-        -webkit-user-select: none;
-        -khtml-user-select: none;
-        -moz-user-select: none;
-        -ms-user-select: none;
-        user-select: none;
-
-        @media screen and (min-width: 1200px) {
-          -webkit-touch-callout: default;
-          -webkit-user-select: auto;
-          -khtml-user-select: auto;
-          -moz-user-select: auto;
-          -ms-user-select: auto;
-          user-select: auto;
-        }
       }
     </style>
   </head>

scripts/autorelease.js

@@ -1,51 +0,0 @@
-const fs = require("fs");
-const { exec, execSync } = require("child_process");
-
-const excalidrawDir = `${__dirname}/../src/packages/excalidraw`;
-const excalidrawPackage = `${excalidrawDir}/package.json`;
-const pkg = require(excalidrawPackage);
-
-const getShortCommitHash = () => {
-  return execSync("git rev-parse --short HEAD").toString().trim();
-};
-
-const publish = () => {
-  try {
-    execSync(`yarn  --frozen-lockfile`);
-    execSync(`yarn --frozen-lockfile`, { cwd: excalidrawDir });
-    execSync(`yarn run build:umd`, { cwd: excalidrawDir });
-    execSync(`yarn --cwd ${excalidrawDir} publish`);
-  } catch (e) {
-    console.error(e);
-  }
-};
-
-// get files changed between prev and head commit
-exec(`git diff --name-only HEAD^ HEAD`, async (error, stdout, stderr) => {
-  if (error || stderr) {
-    console.error(error);
-    process.exit(1);
-  }
-
-  const changedFiles = stdout.trim().split("\n");
-  const filesToIgnoreRegex = /src\/excalidraw-app|packages\/utils/;
-
-  const excalidrawPackageFiles = changedFiles.filter((file) => {
-    return file.indexOf("src") >= 0 && !filesToIgnoreRegex.test(file);
-  });
-
-  if (!excalidrawPackageFiles.length) {
-    process.exit(0);
-  }
-
-  // update package.json
-  pkg.version = `${pkg.version}-${getShortCommitHash()}`;
-  pkg.name = "@excalidraw/excalidraw-next";
-  fs.writeFileSync(excalidrawPackage, JSON.stringify(pkg, null, 2), "utf8");
-
-  // update readme
-  const data = fs.readFileSync(`${excalidrawDir}/README_NEXT.md`, "utf8");
-  fs.writeFileSync(`${excalidrawDir}/README.md`, data, "utf8");
-
-  publish();
-});

scripts/locales-coverage-description.js

@@ -37,9 +37,6 @@ const crowdinMap = {
   "uk-UA": "en-uk",
   "zh-CN": "en-zhcn",
   "zh-TW": "en-zhtw",
-  "lv-LV": "en-lv",
-  "cs-CZ": "en-cs",
-  "kk-KZ": "en-kk",
 };
 
 const flags = {
@@ -77,9 +74,6 @@ const flags = {
   "uk-UA": "🇺🇦",
   "zh-CN": "🇨🇳",
   "zh-TW": "🇹🇼",
-  "lv-LV": "🇱🇻",
-  "cs-CZ": "🇨🇿",
-  "kk-KZ": "🇰🇿",
 };
 
 const languages = {
@@ -117,9 +111,6 @@ const languages = {
   "uk-UA": "Українська",
   "zh-CN": "简体中文",
   "zh-TW": "繁體中文",
-  "lv-LV": "Latviešu",
-  "cs-CZ": "Česky",
-  "kk-KZ": "Қазақ тілі",
 };
 
 const percentages = fs.readFileSync(

scripts/release.js

@@ -1,39 +0,0 @@
-const fs = require("fs");
-const util = require("util");
-const exec = util.promisify(require("child_process").exec);
-const updateReadme = require("./updateReadme");
-const updateChangelog = require("./updateChangelog");
-
-const excalidrawDir = `${__dirname}/../src/packages/excalidraw`;
-const excalidrawPackage = `${excalidrawDir}/package.json`;
-
-const updatePackageVersion = (nextVersion) => {
-  const pkg = require(excalidrawPackage);
-  pkg.version = nextVersion;
-  const content = `${JSON.stringify(pkg, null, 2)}\n`;
-  fs.writeFileSync(excalidrawPackage, content, "utf-8");
-};
-
-const release = async (nextVersion) => {
-  try {
-    updateReadme();
-    await updateChangelog(nextVersion);
-    updatePackageVersion(nextVersion);
-    await exec(`git add -u`);
-    await exec(
-      `git commit -m "docs: release excalidraw@excalidraw@${nextVersion}  🎉"`,
-    );
-    /* eslint-disable no-console */
-    console.log("Done!");
-  } catch (e) {
-    console.error(e);
-    process.exit(1);
-  }
-};
-
-const nextVersion = process.argv.slice(2)[0];
-if (!nextVersion) {
-  console.error("Pass the next version to release!");
-  process.exit(1);
-}
-release(nextVersion);

scripts/updateChangelog.js

@@ -1,97 +0,0 @@
-const fs = require("fs");
-const util = require("util");
-const exec = util.promisify(require("child_process").exec);
-
-const excalidrawDir = `${__dirname}/../src/packages/excalidraw`;
-const excalidrawPackage = `${excalidrawDir}/package.json`;
-const pkg = require(excalidrawPackage);
-const lastVersion = pkg.version;
-const existingChangeLog = fs.readFileSync(
-  `${excalidrawDir}/CHANGELOG.md`,
-  "utf8",
-);
-
-const supportedTypes = ["feat", "fix", "style", "refactor", "perf", "build"];
-const headerForType = {
-  feat: "Features",
-  fix: "Fixes",
-  style: "Styles",
-  refactor: " Refactor",
-  perf: "Performance",
-  build: "Build",
-};
-
-const getCommitHashForLastVersion = async () => {
-  try {
-    const commitMessage = `"release @excalidraw/excalidraw@${lastVersion}"`;
-    const { stdout } = await exec(
-      `git log --format=format:"%H" --grep=${commitMessage}`,
-    );
-    return stdout;
-  } catch (e) {
-    console.error(e);
-  }
-};
-
-const getLibraryCommitsSinceLastRelease = async () => {
-  const commitHash = await getCommitHashForLastVersion();
-  const { stdout } = await exec(
-    `git log --pretty=format:%s ${commitHash}...master`,
-  );
-  const commitsSinceLastRelease = stdout.split("\n");
-  const commitList = {};
-  supportedTypes.forEach((type) => {
-    commitList[type] = [];
-  });
-
-  commitsSinceLastRelease.forEach((commit) => {
-    const indexOfColon = commit.indexOf(":");
-    const type = commit.slice(0, indexOfColon);
-    if (!supportedTypes.includes(type)) {
-      return;
-    }
-    const messageWithoutType = commit.slice(indexOfColon + 1).trim();
-    const messageWithCapitalizeFirst =
-      messageWithoutType.charAt(0).toUpperCase() + messageWithoutType.slice(1);
-    const prNumber = commit.match(/\(#([0-9]*)\)/)[1];
-
-    // return if the changelog already contains the pr number which would happen for package updates
-    if (existingChangeLog.includes(prNumber)) {
-      return;
-    }
-    const prMarkdown = `[#${prNumber}](https://github.com/excalidraw/excalidraw/pull/${prNumber})`;
-    const messageWithPRLink = messageWithCapitalizeFirst.replace(
-      /\(#[0-9]*\)/,
-      prMarkdown,
-    );
-    commitList[type].push(messageWithPRLink);
-  });
-  return commitList;
-};
-
-const updateChangelog = async (nextVersion) => {
-  const commitList = await getLibraryCommitsSinceLastRelease();
-  let changelogForLibrary =
-    "## Excalidraw Library\n\n**_This section lists the updates made to the excalidraw library and will not affect the integration._**\n\n";
-  supportedTypes.forEach((type) => {
-    if (commitList[type].length) {
-      changelogForLibrary += `### ${headerForType[type]}\n\n`;
-      const commits = commitList[type];
-      commits.forEach((commit) => {
-        changelogForLibrary += `- ${commit}\n\n`;
-      });
-    }
-  });
-  changelogForLibrary += "---\n";
-  const lastVersionIndex = existingChangeLog.indexOf(`## ${lastVersion}`);
-  let updatedContent =
-    existingChangeLog.slice(0, lastVersionIndex) +
-    changelogForLibrary +
-    existingChangeLog.slice(lastVersionIndex);
-  const currentDate = new Date().toISOString().slice(0, 10);
-  const newVersion = `## ${nextVersion} (${currentDate})`;
-  updatedContent = updatedContent.replace(`## Unreleased`, newVersion);
-  fs.writeFileSync(`${excalidrawDir}/CHANGELOG.md`, updatedContent, "utf8");
-};
-
-module.exports = updateChangelog;

scripts/updateReadme.js

@@ -1,27 +0,0 @@
-const fs = require("fs");
-
-const updateReadme = () => {
-  const excalidrawDir = `${__dirname}/../src/packages/excalidraw`;
-  let data = fs.readFileSync(`${excalidrawDir}/README_NEXT.md`, "utf8");
-
-  // remove note for unstable release
-  data = data.replace(
-    /<!-- unstable-readme-start-->[\s\S]*?<!-- unstable-readme-end-->/,
-    "",
-  );
-
-  // replace "excalidraw-next" with "excalidraw"
-  data = data.replace(/excalidraw-next/g, "excalidraw");
-  data = data.trim();
-
-  const demoIndex = data.indexOf("### Demo");
-  const excalidrawNextNote =
-    "#### Note\n\n**If you don't want to wait for the next stable release and try out the unreleased changes you can use [@excalidraw/excalidraw-next](https://www.npmjs.com/package/@excalidraw/excalidraw-next).**\n\n";
-  // Add excalidraw next note to try out for unreleased changes
-  data = data.slice(0, demoIndex) + excalidrawNextNote + data.slice(demoIndex);
-
-  // update readme
-  fs.writeFileSync(`${excalidrawDir}/README.md`, data, "utf8");
-};
-
-module.exports = updateReadme;

src/actions/actionAddToLibrary.ts

@@ -2,20 +2,18 @@ import { register } from "./register";
 import { getSelectedElements } from "../scene";
 import { getNonDeletedElements } from "../element";
 import { deepCopyElement } from "../element/newElement";
+import { Library } from "../data/library";
 
 export const actionAddToLibrary = register({
   name: "addToLibrary",
-  perform: (elements, appState, _, app) => {
+  perform: (elements, appState) => {
     const selectedElements = getSelectedElements(
       getNonDeletedElements(elements),
       appState,
     );
 
-    app.library.loadLibrary().then((items) => {
-      app.library.saveLibrary([
-        ...items,
-        selectedElements.map(deepCopyElement),
-      ]);
+    Library.loadLibrary().then((items) => {
+      Library.saveLibrary([...items, selectedElements.map(deepCopyElement)]);
     });
     return false;
   },

src/actions/actionCanvas.tsx

@@ -3,13 +3,12 @@ import { getDefaultAppState } from "../appState";
 import { ColorPicker } from "../components/ColorPicker";
 import { resetZoom, trash, zoomIn, zoomOut } from "../components/icons";
 import { ToolButton } from "../components/ToolButton";
-import { DarkModeToggle } from "../components/DarkModeToggle";
 import { ZOOM_STEP } from "../constants";
 import { getCommonBounds, getNonDeletedElements } from "../element";
 import { newElementWith } from "../element/mutateElement";
 import { ExcalidrawElement } from "../element/types";
 import { t } from "../i18n";
-import { useIsMobile } from "../components/App";
+import { useIsMobile } from "../is-mobile";
 import { CODES, KEYS } from "../keys";
 import { getNormalizedZoom, getSelectedElements } from "../scene";
 import { centerScrollOn } from "../scene/scroll";
@@ -22,8 +21,8 @@ export const actionChangeViewBackgroundColor = register({
   name: "changeViewBackgroundColor",
   perform: (_, appState, value) => {
     return {
-      appState: { ...appState, ...value },
-      commitToHistory: !!value.viewBackgroundColor,
+      appState: { ...appState, viewBackgroundColor: value },
+      commitToHistory: true,
     };
   },
   PanelComponent: ({ appState, updateData }) => {
@@ -33,11 +32,7 @@ export const actionChangeViewBackgroundColor = register({
           label={t("labels.canvasBackground")}
           type="canvasBackground"
           color={appState.viewBackgroundColor}
-          onChange={(color) => updateData({ viewBackgroundColor: color })}
-          isActive={appState.openPopup === "canvasColorPicker"}
-          setActive={(active) =>
-            updateData({ openPopup: active ? "canvasColorPicker" : null })
-          }
+          onChange={(color) => updateData(color)}
           data-testid="canvas-background-picker"
         />
       </div>
@@ -59,6 +54,7 @@ export const actionClearCanvas = register({
         exportBackground: appState.exportBackground,
         exportEmbedScene: appState.exportEmbedScene,
         gridSize: appState.gridSize,
+        shouldAddWatermark: appState.shouldAddWatermark,
         showStats: appState.showStats,
         pasteDialog: appState.pasteDialog,
       },
@@ -264,27 +260,3 @@ export const actionZoomToFit = register({
     !event.altKey &&
     !event[KEYS.CTRL_OR_CMD],
 });
-
-export const actionToggleTheme = register({
-  name: "toggleTheme",
-  perform: (_, appState, value) => {
-    return {
-      appState: {
-        ...appState,
-        theme: value || (appState.theme === "light" ? "dark" : "light"),
-      },
-      commitToHistory: false,
-    };
-  },
-  PanelComponent: ({ appState, updateData }) => (
-    <div style={{ marginInlineStart: "0.25rem" }}>
-      <DarkModeToggle
-        value={appState.theme}
-        onChange={(theme) => {
-          updateData(theme);
-        }}
-      />
-    </div>
-  ),
-  keyTest: (event) => event.altKey && event.shiftKey && event.code === CODES.D,
-});

src/actions/actionClipboard.tsx

@@ -50,6 +50,7 @@ export const actionCopyAsSvg = register({
           ? selectedElements
           : getNonDeletedElements(elements),
         appState,
+        app.canvas,
         appState,
       );
       return {
@@ -88,6 +89,7 @@ export const actionCopyAsPng = register({
           ? selectedElements
           : getNonDeletedElements(elements),
         appState,
+        app.canvas,
         appState,
       );
       return {

src/actions/actionExport.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 import { trackEvent } from "../analytics";
-import { load, questionCircle, saveAs } from "../components/icons";
+import { load, questionCircle, save, saveAs } from "../components/icons";
 import { ProjectName } from "../components/ProjectName";
 import { ToolButton } from "../components/ToolButton";
 import "../components/ToolIcon.scss";
@@ -8,16 +8,10 @@ import { Tooltip } from "../components/Tooltip";
 import { DarkModeToggle, Appearence } from "../components/DarkModeToggle";
 import { loadFromJSON, saveAsJSON } from "../data";
 import { t } from "../i18n";
-import { useIsMobile } from "../components/App";
+import { useIsMobile } from "../is-mobile";
 import { KEYS } from "../keys";
 import { register } from "./register";
-import { supported as fsSupported } from "browser-fs-access";
-import { CheckboxItem } from "../components/CheckboxItem";
-import { getExportSize } from "../scene/export";
-import { DEFAULT_EXPORT_PADDING, EXPORT_SCALES } from "../constants";
-import { getSelectedElements, isSomeElementSelected } from "../scene";
-import { getNonDeletedElements } from "../element";
-import { ActiveFile } from "../components/ActiveFile";
+import { supported } from "browser-fs-access";
 
 export const actionChangeProjectName = register({
   name: "changeProjectName",
@@ -37,54 +31,6 @@ export const actionChangeProjectName = register({
   ),
 });
 
-export const actionChangeExportScale = register({
-  name: "changeExportScale",
-  perform: (_elements, appState, value) => {
-    return {
-      appState: { ...appState, exportScale: value },
-      commitToHistory: false,
-    };
-  },
-  PanelComponent: ({ elements: allElements, appState, updateData }) => {
-    const elements = getNonDeletedElements(allElements);
-    const exportSelected = isSomeElementSelected(elements, appState);
-    const exportedElements = exportSelected
-      ? getSelectedElements(elements, appState)
-      : elements;
-
-    return (
-      <>
-        {EXPORT_SCALES.map((s) => {
-          const [width, height] = getExportSize(
-            exportedElements,
-            DEFAULT_EXPORT_PADDING,
-            s,
-          );
-
-          const scaleButtonTitle = `${t(
-            "buttons.scale",
-          )} ${s}x (${width}x${height})`;
-
-          return (
-            <ToolButton
-              key={s}
-              size="s"
-              type="radio"
-              icon={`${s}x`}
-              name="export-canvas-scale"
-              title={scaleButtonTitle}
-              aria-label={scaleButtonTitle}
-              id="export-canvas-scale"
-              checked={s === appState.exportScale}
-              onChange={() => updateData(s)}
-            />
-          );
-        })}
-      </>
-    );
-  },
-});
-
 export const actionChangeExportBackground = register({
   name: "changeExportBackground",
   perform: (_elements, appState, value) => {
@@ -94,12 +40,14 @@ export const actionChangeExportBackground = register({
     };
   },
   PanelComponent: ({ appState, updateData }) => (
-    <CheckboxItem
-      checked={appState.exportBackground}
-      onChange={(checked) => updateData(checked)}
-    >
+    <label>
+      <input
+        type="checkbox"
+        checked={appState.exportBackground}
+        onChange={(event) => updateData(event.target.checked)}
+      />{" "}
       {t("labels.withBackground")}
-    </CheckboxItem>
+    </label>
   ),
 });
 
@@ -112,20 +60,46 @@ export const actionChangeExportEmbedScene = register({
     };
   },
   PanelComponent: ({ appState, updateData }) => (
-    <CheckboxItem
-      checked={appState.exportEmbedScene}
-      onChange={(checked) => updateData(checked)}
-    >
+    <label style={{ display: "flex" }}>
+      <input
+        type="checkbox"
+        checked={appState.exportEmbedScene}
+        onChange={(event) => updateData(event.target.checked)}
+      />{" "}
       {t("labels.exportEmbedScene")}
-      <Tooltip label={t("labels.exportEmbedScene_details")} long={true}>
-        <div className="Tooltip-icon">{questionCircle}</div>
+      <Tooltip
+        label={t("labels.exportEmbedScene_details")}
+        position="above"
+        long={true}
+      >
+        <div className="TooltipIcon">{questionCircle}</div>
       </Tooltip>
-    </CheckboxItem>
+    </label>
   ),
 });
 
-export const actionSaveToActiveFile = register({
-  name: "saveToActiveFile",
+export const actionChangeShouldAddWatermark = register({
+  name: "changeShouldAddWatermark",
+  perform: (_elements, appState, value) => {
+    return {
+      appState: { ...appState, shouldAddWatermark: value },
+      commitToHistory: false,
+    };
+  },
+  PanelComponent: ({ appState, updateData }) => (
+    <label>
+      <input
+        type="checkbox"
+        checked={appState.shouldAddWatermark}
+        onChange={(event) => updateData(event.target.checked)}
+      />{" "}
+      {t("labels.addWatermark")}
+    </label>
+  ),
+});
+
+export const actionSaveScene = register({
+  name: "saveScene",
   perform: async (elements, appState, value) => {
     const fileHandleExists = !!appState.fileHandle;
     try {
@@ -154,16 +128,21 @@ export const actionSaveToActiveFile = register({
   },
   keyTest: (event) =>
     event.key === KEYS.S && event[KEYS.CTRL_OR_CMD] && !event.shiftKey,
-  PanelComponent: ({ updateData, appState }) => (
-    <ActiveFile
-      onSave={() => updateData(null)}
-      fileName={appState.fileHandle?.name}
+  PanelComponent: ({ updateData }) => (
+    <ToolButton
+      type="button"
+      icon={save}
+      title={t("buttons.save")}
+      aria-label={t("buttons.save")}
+      showAriaLabel={useIsMobile()}
+      onClick={() => updateData(null)}
+      data-testid="save-button"
     />
   ),
 });
 
-export const actionSaveFileToDisk = register({
-  name: "saveFileToDisk",
+export const actionSaveAsScene = register({
+  name: "saveAsScene",
   perform: async (elements, appState, value) => {
     try {
       const { fileHandle } = await saveAsJSON(elements, {
@@ -187,7 +166,7 @@ export const actionSaveFileToDisk = register({
       title={t("buttons.saveAs")}
       aria-label={t("buttons.saveAs")}
       showAriaLabel={useIsMobile()}
-      hidden={!fsSupported}
+      hidden={!supported}
       onClick={() => updateData(null)}
       data-testid="save-as-button"
     />
@@ -201,7 +180,7 @@ export const actionLoadScene = register({
       const {
         elements: loadedElements,
         appState: loadedAppState,
-      } = await loadFromJSON(appState, elements);
+      } = await loadFromJSON(appState);
       return {
         elements: loadedElements,
         appState: loadedAppState,
@@ -259,3 +238,37 @@ export const actionExportWithDarkMode = register({
     </div>
   ),
 });
+
+export const actionToggleAutosave = register({
+  name: "toggleAutosave",
+  perform(elements, appState) {
+    trackEvent("toggle", "autosave");
+    return {
+      appState: {
+        ...appState,
+        autosave: !appState.autosave,
+      },
+      commitToHistory: false,
+    };
+  },
+  PanelComponent: ({ appState, updateData }) =>
+    supported && appState.fileHandle ? (
+      <label style={{ display: "flex" }}>
+        <input
+          type="checkbox"
+          checked={appState.autosave}
+          onChange={(event) => updateData(event.target.checked)}
+        />{" "}
+        {t("labels.toggleAutosave")}
+        <Tooltip
+          label={t("labels.toggleAutosave_details")}
+          position="above"
+          long={true}
+        >
+          <div className="TooltipIcon">{questionCircle}</div>
+        </Tooltip>
+      </label>
+    ) : (
+      <></>
+    ),
+});

src/actions/actionFinalize.tsx

@@ -18,7 +18,7 @@ import { isBindingElement } from "../element/typeChecks";
 
 export const actionFinalize = register({
   name: "finalize",
-  perform: (elements, appState, _, { canvas, focusContainer }) => {
+  perform: (elements, appState, _, { canvas }) => {
     if (appState.editingLinearElement) {
       const {
         elementId,
@@ -51,19 +51,19 @@ export const actionFinalize = register({
 
     let newElements = elements;
     if (window.document.activeElement instanceof HTMLElement) {
-      focusContainer();
+      window.document.activeElement.blur();
     }
 
     const multiPointElement = appState.multiElement
       ? appState.multiElement
-      : appState.editingElement?.type === "freedraw"
+      : appState.editingElement?.type === "draw"
       ? appState.editingElement
       : null;
 
     if (multiPointElement) {
       // pen and mouse have hover
       if (
-        multiPointElement.type !== "freedraw" &&
+        multiPointElement.type !== "draw" &&
         appState.lastPointerDownWith !== "touch"
       ) {
         const { points, lastCommittedPoint } = multiPointElement;
@@ -86,7 +86,7 @@ export const actionFinalize = register({
       const isLoop = isPathALoop(multiPointElement.points, appState.zoom.value);
       if (
         multiPointElement.type === "line" ||
-        multiPointElement.type === "freedraw"
+        multiPointElement.type === "draw"
       ) {
         if (isLoop) {
           const linePoints = multiPointElement.points;
@@ -118,24 +118,22 @@ export const actionFinalize = register({
         );
       }
 
-      if (!appState.elementLocked && appState.elementType !== "freedraw") {
+      if (!appState.elementLocked && appState.elementType !== "draw") {
         appState.selectedElementIds[multiPointElement.id] = true;
       }
     }
-
     if (
-      (!appState.elementLocked && appState.elementType !== "freedraw") ||
+      (!appState.elementLocked && appState.elementType !== "draw") ||
       !multiPointElement
     ) {
       resetCursor(canvas);
     }
-
     return {
       elements: newElements,
       appState: {
         ...appState,
         elementType:
-          (appState.elementLocked || appState.elementType === "freedraw") &&
+          (appState.elementLocked || appState.elementType === "draw") &&
           multiPointElement
             ? appState.elementType
             : "selection",
@@ -147,14 +145,14 @@ export const actionFinalize = register({
         selectedElementIds:
           multiPointElement &&
           !appState.elementLocked &&
-          appState.elementType !== "freedraw"
+          appState.elementType !== "draw"
             ? {
                 ...appState.selectedElementIds,
                 [multiPointElement.id]: true,
               }
             : appState.selectedElementIds,
       },
-      commitToHistory: appState.elementType === "freedraw",
+      commitToHistory: appState.elementType === "draw",
     };
   },
   keyTest: (event, appState) =>

src/actions/actionFlip.ts

@@ -6,7 +6,7 @@ import { ExcalidrawElement, NonDeleted } from "../element/types";
 import { normalizeAngle, resizeSingleElement } from "../element/resizeElements";
 import { AppState } from "../types";
 import { getTransformHandles } from "../element/transformHandles";
-import { isFreeDrawElement, isLinearElement } from "../element/typeChecks";
+import { isLinearElement } from "../element/typeChecks";
 import { updateBoundElements } from "../element/binding";
 import { LinearElementEditor } from "../element/linearElementEditor";
 
@@ -114,7 +114,7 @@ const flipElement = (
   const originalAngle = normalizeAngle(element.angle);
 
   let finalOffsetX = 0;
-  if (isLinearElement(element) || isFreeDrawElement(element)) {
+  if (isLinearElement(element)) {
     finalOffsetX =
       element.points.reduce((max, point) => Math.max(max, point[0]), 0) * 2 -
       element.width;

src/actions/actionHistory.tsx

@@ -3,7 +3,7 @@ import React from "react";
 import { undo, redo } from "../components/icons";
 import { ToolButton } from "../components/ToolButton";
 import { t } from "../i18n";
-import History, { HistoryEntry } from "../history";
+import { SceneHistory, HistoryEntry } from "../history";
 import { ExcalidrawElement } from "../element/types";
 import { AppState } from "../types";
 import { isWindows, KEYS } from "../keys";
@@ -59,7 +59,7 @@ const writeData = (
   return { commitToHistory };
 };
 
-type ActionCreator = (history: History) => Action;
+type ActionCreator = (history: SceneHistory) => Action;
 
 export const createUndoAction: ActionCreator = (history) => ({
   name: "undo",

src/actions/actionMenu.tsx

@@ -70,10 +70,7 @@ export const actionFullScreen = register({
 
 export const actionShortcuts = register({
   name: "toggleShortcuts",
-  perform: (_elements, appState, _, { focusContainer }) => {
-    if (appState.showHelpDialog) {
-      focusContainer();
-    }
+  perform: (_elements, appState) => {
     return {
       appState: {
         ...appState,

src/actions/actionProperties.tsx

@@ -13,13 +13,6 @@ import {
   FillCrossHatchIcon,
   FillHachureIcon,
   FillSolidIcon,
-  FontFamilyCodeIcon,
-  FontFamilyHandDrawnIcon,
-  FontFamilyNormalIcon,
-  FontSizeExtraLargeIcon,
-  FontSizeLargeIcon,
-  FontSizeMediumIcon,
-  FontSizeSmallIcon,
   SloppinessArchitectIcon,
   SloppinessArtistIcon,
   SloppinessCartoonistIcon,
@@ -27,15 +20,18 @@ import {
   StrokeStyleDottedIcon,
   StrokeStyleSolidIcon,
   StrokeWidthIcon,
-  TextAlignCenterIcon,
+  FontSizeSmallIcon,
+  FontSizeMediumIcon,
+  FontSizeLargeIcon,
+  FontSizeExtraLargeIcon,
+  FontFamilyHandDrawnIcon,
+  FontFamilyNormalIcon,
+  FontFamilyCodeIcon,
   TextAlignLeftIcon,
+  TextAlignCenterIcon,
   TextAlignRightIcon,
 } from "../components/icons";
-import {
-  DEFAULT_FONT_FAMILY,
-  DEFAULT_FONT_SIZE,
-  FONT_FAMILY,
-} from "../constants";
+import { DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE } from "../constants";
 import {
   getNonDeletedElements,
   isTextElement,
@@ -48,7 +44,7 @@ import {
   ExcalidrawElement,
   ExcalidrawLinearElement,
   ExcalidrawTextElement,
-  FontFamilyValues,
+  FontFamily,
   TextAlign,
 } from "../element/types";
 import { getLanguage, t } from "../i18n";
@@ -103,18 +99,13 @@ export const actionChangeStrokeColor = register({
   name: "changeStrokeColor",
   perform: (elements, appState, value) => {
     return {
-      ...(value.currentItemStrokeColor && {
-        elements: changeProperty(elements, appState, (el) =>
-          newElementWith(el, {
-            strokeColor: value.currentItemStrokeColor,
-          }),
-        ),
-      }),
-      appState: {
-        ...appState,
-        ...value,
-      },
-      commitToHistory: !!value.currentItemStrokeColor,
+      elements: changeProperty(elements, appState, (el) =>
+        newElementWith(el, {
+          strokeColor: value,
+        }),
+      ),
+      appState: { ...appState, currentItemStrokeColor: value },
+      commitToHistory: true,
     };
   },
   PanelComponent: ({ elements, appState, updateData }) => (
@@ -129,11 +120,7 @@ export const actionChangeStrokeColor = register({
           (element) => element.strokeColor,
           appState.currentItemStrokeColor,
         )}
-        onChange={(color) => updateData({ currentItemStrokeColor: color })}
-        isActive={appState.openPopup === "strokeColorPicker"}
-        setActive={(active) =>
-          updateData({ openPopup: active ? "strokeColorPicker" : null })
-        }
+        onChange={updateData}
       />
     </>
   ),
@@ -143,18 +130,13 @@ export const actionChangeBackgroundColor = register({
   name: "changeBackgroundColor",
   perform: (elements, appState, value) => {
     return {
-      ...(value.currentItemBackgroundColor && {
-        elements: changeProperty(elements, appState, (el) =>
-          newElementWith(el, {
-            backgroundColor: value.currentItemBackgroundColor,
-          }),
-        ),
-      }),
-      appState: {
-        ...appState,
-        ...value,
-      },
-      commitToHistory: !!value.currentItemBackgroundColor,
+      elements: changeProperty(elements, appState, (el) =>
+        newElementWith(el, {
+          backgroundColor: value,
+        }),
+      ),
+      appState: { ...appState, currentItemBackgroundColor: value },
+      commitToHistory: true,
     };
   },
   PanelComponent: ({ elements, appState, updateData }) => (
@@ -169,11 +151,7 @@ export const actionChangeBackgroundColor = register({
           (element) => element.backgroundColor,
           appState.currentItemBackgroundColor,
         )}
-        onChange={(color) => updateData({ currentItemBackgroundColor: color })}
-        isActive={appState.openPopup === "backgroundColorPicker"}
-        setActive={(active) =>
-          updateData({ openPopup: active ? "backgroundColorPicker" : null })
-        }
+        onChange={updateData}
       />
     </>
   ),
@@ -503,23 +481,19 @@ export const actionChangeFontFamily = register({
     };
   },
   PanelComponent: ({ elements, appState, updateData }) => {
-    const options: {
-      value: FontFamilyValues;
-      text: string;
-      icon: JSX.Element;
-    }[] = [
+    const options: { value: FontFamily; text: string; icon: JSX.Element }[] = [
       {
-        value: FONT_FAMILY.Virgil,
+        value: 1,
         text: t("labels.handDrawn"),
         icon: <FontFamilyHandDrawnIcon theme={appState.theme} />,
       },
       {
-        value: FONT_FAMILY.Helvetica,
+        value: 2,
         text: t("labels.normal"),
         icon: <FontFamilyNormalIcon theme={appState.theme} />,
       },
       {
-        value: FONT_FAMILY.Cascadia,
+        value: 3,
         text: t("labels.code"),
         icon: <FontFamilyCodeIcon theme={appState.theme} />,
       },
@@ -528,7 +502,7 @@ export const actionChangeFontFamily = register({
     return (
       <fieldset>
         <legend>{t("labels.fontFamily")}</legend>
-        <ButtonIconSelect<FontFamilyValues | false>
+        <ButtonIconSelect<FontFamily | false>
           group="font-family"
           options={options}
           value={getFormValue(

src/actions/actionToggleStats.tsx

@@ -1,5 +1,4 @@
 import { register } from "./register";
-import { CODES, KEYS } from "../keys";
 
 export const actionToggleStats = register({
   name: "stats",
@@ -14,6 +13,4 @@ export const actionToggleStats = register({
   },
   checked: (appState) => appState.showStats,
   contextItemLabel: "stats.title",
-  keyTest: (event) =>
-    !event[KEYS.CTRL_OR_CMD] && event.altKey && event.code === CODES.SLASH,
 });

src/actions/actionToggleViewMode.tsx

@@ -10,6 +10,7 @@ export const actionToggleViewMode = register({
       appState: {
         ...appState,
         viewModeEnabled: !this.checked!(appState),
+        selectedElementIds: {},
       },
       commitToHistory: false,
     };

src/actions/index.ts

@@ -26,7 +26,6 @@ export {
   actionZoomOut,
   actionResetZoom,
   actionZoomToFit,
-  actionToggleTheme,
 } from "./actionCanvas";
 
 export { actionFinalize } from "./actionFinalize";
@@ -34,8 +33,9 @@ export { actionFinalize } from "./actionFinalize";
 export {
   actionChangeProjectName,
   actionChangeExportBackground,
-  actionSaveToActiveFile,
-  actionSaveFileToDisk,
+  actionToggleAutosave,
+  actionSaveScene,
+  actionSaveAsScene,
   actionLoadScene,
 } from "./actionExport";
 

src/actions/manager.tsx

@@ -9,16 +9,10 @@ import {
 import { ExcalidrawElement } from "../element/types";
 import { AppProps, AppState } from "../types";
 import { MODES } from "../constants";
-import Library from "../data/library";
 
 // This is the <App> component, but for now we don't care about anything but its
 // `canvas` state.
-type App = {
-  canvas: HTMLCanvasElement | null;
-  focusContainer: () => void;
-  props: AppProps;
-  library: Library;
-};
+type App = { canvas: HTMLCanvasElement | null; props: AppProps };
 
 export class ActionManager implements ActionsManagerInterface {
   actions = {} as ActionsManagerInterface["actions"];
@@ -57,7 +51,7 @@ export class ActionManager implements ActionsManagerInterface {
     actions.forEach((action) => this.registerAction(action));
   }
 
-  handleKeyDown(event: React.KeyboardEvent | KeyboardEvent) {
+  handleKeyDown(event: KeyboardEvent) {
     const canvasActions = this.app.props.UIOptions.canvasActions;
     const data = Object.values(this.actions)
       .sort((a, b) => (b.keyPriority || 0) - (a.keyPriority || 0))

src/actions/shortcuts.ts

@@ -57,7 +57,7 @@ const shortcutMap: Record<ShortcutName, string[]> = {
   ungroup: [getShortcutKey("CtrlOrCmd+Shift+G")],
   gridMode: [getShortcutKey("CtrlOrCmd+'")],
   zenMode: [getShortcutKey("Alt+Z")],
-  stats: [getShortcutKey("Alt+/")],
+  stats: [],
   addToLibrary: [],
   flipHorizontal: [getShortcutKey("Shift+H")],
   flipVertical: [getShortcutKey("Shift+V")],

src/actions/types.ts

@@ -1,7 +1,6 @@
 import React from "react";
 import { ExcalidrawElement } from "../element/types";
 import { AppState, ExcalidrawProps } from "../types";
-import Library from "../data/library";
 
 /** if false, the action should be prevented */
 export type ActionResult =
@@ -16,17 +15,11 @@ export type ActionResult =
     }
   | false;
 
-type AppAPI = {
-  canvas: HTMLCanvasElement | null;
-  focusContainer(): void;
-  library: Library;
-};
-
 type ActionFn = (
   elements: readonly ExcalidrawElement[],
   appState: Readonly<AppState>,
   formData: any,
-  app: AppAPI,
+  app: { canvas: HTMLCanvasElement | null },
 ) => ActionResult | Promise<ActionResult>;
 
 export type UpdaterFn = (res: ActionResult) => void;
@@ -52,13 +45,13 @@ export type ActionName =
   | "changeBackgroundColor"
   | "changeFillStyle"
   | "changeStrokeWidth"
-  | "changeStrokeShape"
   | "changeSloppiness"
   | "changeStrokeStyle"
   | "changeArrowhead"
   | "changeOpacity"
   | "changeFontSize"
   | "toggleCanvasMenu"
+  | "toggleAutosave"
   | "toggleEditMenu"
   | "undo"
   | "redo"
@@ -66,9 +59,9 @@ export type ActionName =
   | "changeProjectName"
   | "changeExportBackground"
   | "changeExportEmbedScene"
-  | "changeExportScale"
-  | "saveToActiveFile"
-  | "saveFileToDisk"
+  | "changeShouldAddWatermark"
+  | "saveScene"
+  | "saveAsScene"
   | "loadScene"
   | "duplicateSelection"
   | "deleteSelectedElements"
@@ -99,8 +92,7 @@ export type ActionName =
   | "flipHorizontal"
   | "flipVertical"
   | "viewMode"
-  | "exportWithDarkMode"
-  | "toggleTheme";
+  | "exportWithDarkMode";
 
 export interface Action {
   name: ActionName;
@@ -114,7 +106,7 @@ export interface Action {
   perform: ActionFn;
   keyPriority?: number;
   keyTest?: (
-    event: React.KeyboardEvent | KeyboardEvent,
+    event: KeyboardEvent,
     appState: AppState,
     elements: readonly ExcalidrawElement[],
   ) => boolean;
@@ -129,7 +121,6 @@ export interface Action {
 export interface ActionsManagerInterface {
   actions: Record<ActionName, Action>;
   registerAction: (action: Action) => void;
-  handleKeyDown: (event: React.KeyboardEvent | KeyboardEvent) => boolean;
+  handleKeyDown: (event: KeyboardEvent) => boolean;
   renderAction: (name: ActionName) => React.ReactElement | null;
-  executeAction: (action: Action) => void;
 }

src/appState.ts

@@ -3,21 +3,17 @@ import {
   DEFAULT_FONT_FAMILY,
   DEFAULT_FONT_SIZE,
   DEFAULT_TEXT_ALIGN,
-  EXPORT_SCALES,
 } from "./constants";
 import { t } from "./i18n";
 import { AppState, NormalizedZoomValue } from "./types";
 import { getDateTime } from "./utils";
 
-const defaultExportScale = EXPORT_SCALES.includes(devicePixelRatio)
-  ? devicePixelRatio
-  : 1;
-
 export const getDefaultAppState = (): Omit<
   AppState,
   "offsetTop" | "offsetLeft" | "width" | "height"
 > => {
   return {
+    autosave: false,
     theme: "light",
     collaborators: new Map(),
     currentChartType: "bar",
@@ -44,7 +40,6 @@ export const getDefaultAppState = (): Omit<
     elementType: "selection",
     errorMessage: null,
     exportBackground: true,
-    exportScale: defaultExportScale,
     exportEmbedScene: false,
     exportWithDarkMode: false,
     fileHandle: null,
@@ -58,7 +53,6 @@ export const getDefaultAppState = (): Omit<
     multiElement: null,
     name: `${t("labels.untitled")}-${getDateTime()}`,
     openMenu: null,
-    openPopup: null,
     pasteDialog: { shown: false, data: null },
     previousSelectedElementIds: {},
     resizingElement: null,
@@ -68,6 +62,7 @@ export const getDefaultAppState = (): Omit<
     selectedElementIds: {},
     selectedGroupIds: {},
     selectionElement: null,
+    shouldAddWatermark: false,
     shouldCacheIgnoreZoom: false,
     showHelpDialog: false,
     showStats: false,
@@ -96,6 +91,7 @@ const APP_STATE_STORAGE_CONF = (<
 >(
   config: { [K in keyof T]: K extends keyof AppState ? T[K] : never },
 ) => config)({
+  autosave: { browser: true, export: false },
   theme: { browser: true, export: false },
   collaborators: { browser: false, export: false },
   currentChartType: { browser: true, export: false },
@@ -123,7 +119,6 @@ const APP_STATE_STORAGE_CONF = (<
   errorMessage: { browser: false, export: false },
   exportBackground: { browser: true, export: false },
   exportEmbedScene: { browser: true, export: false },
-  exportScale: { browser: true, export: false },
   exportWithDarkMode: { browser: true, export: false },
   fileHandle: { browser: false, export: false },
   gridSize: { browser: true, export: true },
@@ -139,7 +134,6 @@ const APP_STATE_STORAGE_CONF = (<
   offsetLeft: { browser: false, export: false },
   offsetTop: { browser: false, export: false },
   openMenu: { browser: true, export: false },
-  openPopup: { browser: false, export: false },
   pasteDialog: { browser: false, export: false },
   previousSelectedElementIds: { browser: true, export: false },
   resizingElement: { browser: false, export: false },
@@ -149,6 +143,7 @@ const APP_STATE_STORAGE_CONF = (<
   selectedElementIds: { browser: true, export: false },
   selectedGroupIds: { browser: true, export: false },
   selectionElement: { browser: false, export: false },
+  shouldAddWatermark: { browser: true, export: false },
   shouldCacheIgnoreZoom: { browser: true, export: false },
   showHelpDialog: { browser: false, export: false },
   showStats: { browser: true, export: false },

src/clipboard.ts

@@ -6,6 +6,7 @@ import { getSelectedElements } from "./scene";
 import { AppState } from "./types";
 import { SVG_EXPORT_TAG } from "./scene/export";
 import { tryParseSpreadsheet, Spreadsheet, VALID_SPREADSHEET } from "./charts";
+import { canvasToBlob } from "./data/blob";
 import { EXPORT_DATA_TYPES } from "./constants";
 
 type ElementsClipboard = {
@@ -13,13 +14,6 @@ type ElementsClipboard = {
   elements: ExcalidrawElement[];
 };
 
-export interface ClipboardData {
-  spreadsheet?: Spreadsheet;
-  elements?: readonly ExcalidrawElement[];
-  text?: string;
-  errorMessage?: string;
-}
-
 let CLIPBOARD = "";
 let PREFER_APP_CLIPBOARD = false;
 
@@ -116,7 +110,12 @@ const getSystemClipboard = async (
  */
 export const parseClipboard = async (
   event: ClipboardEvent | null,
-): Promise<ClipboardData> => {
+): Promise<{
+  spreadsheet?: Spreadsheet;
+  elements?: readonly ExcalidrawElement[];
+  text?: string;
+  errorMessage?: string;
+}> => {
   const systemClipboard = await getSystemClipboard(event);
 
   // if system clipboard empty, couldn't be resolved, or contains previously
@@ -151,7 +150,8 @@ export const parseClipboard = async (
   }
 };
 
-export const copyBlobToClipboardAsPng = async (blob: Blob) => {
+export const copyCanvasToClipboardAsPng = async (canvas: HTMLCanvasElement) => {
+  const blob = await canvasToBlob(canvas);
   await navigator.clipboard.write([
     new window.ClipboardItem({ "image/png": blob }),
   ]);

src/components/Actions.tsx

@@ -3,14 +3,13 @@ import { ActionManager } from "../actions/manager";
 import { getNonDeletedElements } from "../element";
 import { ExcalidrawElement } from "../element/types";
 import { t } from "../i18n";
-import { useIsMobile } from "../components/App";
+import { useIsMobile } from "../is-mobile";
 import {
   canChangeSharpness,
   canHaveArrowheads,
   getTargetElements,
   hasBackground,
-  hasStrokeStyle,
-  hasStrokeWidth,
+  hasStroke,
   hasText,
 } from "../scene";
 import { SHAPES } from "../shapes";
@@ -54,17 +53,10 @@ export const SelectedShapeActions = ({
       {showChangeBackgroundIcons && renderAction("changeBackgroundColor")}
       {showFillIcons && renderAction("changeFillStyle")}
 
-      {(hasStrokeWidth(elementType) ||
-        targetElements.some((element) => hasStrokeWidth(element.type))) &&
-        renderAction("changeStrokeWidth")}
-
-      {(elementType === "freedraw" ||
-        targetElements.some((element) => element.type === "freedraw")) &&
-        renderAction("changeStrokeShape")}
-
-      {(hasStrokeStyle(elementType) ||
-        targetElements.some((element) => hasStrokeStyle(element.type))) && (
+      {(hasStroke(elementType) ||
+        targetElements.some((element) => hasStroke(element.type))) && (
         <>
+          {renderAction("changeStrokeWidth")}
           {renderAction("changeStrokeStyle")}
           {renderAction("changeSloppiness")}
         </>
@@ -151,14 +143,23 @@ export const SelectedShapeActions = ({
   );
 };
 
+const LIBRARY_ICON = (
+  // fa-th-large
+  <svg viewBox="0 0 512 512">
+    <path d="M296 32h192c13.255 0 24 10.745 24 24v160c0 13.255-10.745 24-24 24H296c-13.255 0-24-10.745-24-24V56c0-13.255 10.745-24 24-24zm-80 0H24C10.745 32 0 42.745 0 56v160c0 13.255 10.745 24 24 24h192c13.255 0 24-10.745 24-24V56c0-13.255-10.745-24-24-24zM0 296v160c0 13.255 10.745 24 24 24h192c13.255 0 24-10.745 24-24V296c0-13.255-10.745-24-24-24H24c-13.255 0-24 10.745-24 24zm296 184h192c13.255 0 24-10.745 24-24V296c0-13.255-10.745-24-24-24H296c-13.255 0-24 10.745-24 24v160c0 13.255 10.745 24 24 24z" />
+  </svg>
+);
+
 export const ShapesSwitcher = ({
   canvas,
   elementType,
   setAppState,
+  isLibraryOpen,
 }: {
   canvas: HTMLCanvasElement | null;
   elementType: ExcalidrawElement["type"];
   setAppState: React.Component<any, AppState>["setState"];
+  isLibraryOpen: boolean;
 }) => (
   <>
     {SHAPES.map(({ value, icon, key }, index) => {
@@ -192,6 +193,19 @@ export const ShapesSwitcher = ({
         />
       );
     })}
+    <ToolButton
+      className="Shape ToolIcon_type_button__library"
+      type="button"
+      icon={LIBRARY_ICON}
+      name="editor-library"
+      keyBindingLabel="9"
+      aria-keyshortcuts="9"
+      title={`${capitalizeString(t("toolBar.library"))} — 9`}
+      aria-label={capitalizeString(t("toolBar.library"))}
+      onClick={() => {
+        setAppState({ isLibraryOpen: !isLibraryOpen });
+      }}
+    />
   </>
 );
 

src/components/ActiveFile.scss

@@ -1,21 +0,0 @@
-.excalidraw {
-  .ActiveFile {
-    .ActiveFile__fileName {
-      display: flex;
-      align-items: center;
-
-      span {
-        text-overflow: ellipsis;
-        overflow: hidden;
-        white-space: nowrap;
-        width: 9.3em;
-      }
-
-      svg {
-        width: 1.15em;
-        margin-inline-end: 0.3em;
-        transform: scaleY(0.9);
-      }
-    }
-  }
-}

src/components/ActiveFile.tsx

@@ -1,29 +0,0 @@
-import React from "react";
-import Stack from "../components/Stack";
-import { ToolButton } from "../components/ToolButton";
-import { save, file } from "../components/icons";
-import { t } from "../i18n";
-
-import "./ActiveFile.scss";
-
-type ActiveFileProps = {
-  fileName?: string;
-  onSave: () => void;
-};
-
-export const ActiveFile = ({ fileName, onSave }: ActiveFileProps) => (
-  <Stack.Row className="ActiveFile" gap={1} align="center">
-    <span className="ActiveFile__fileName">
-      {file}
-      <span>{fileName}</span>
-    </span>
-    <ToolButton
-      type="icon"
-      icon={save}
-      title={t("buttons.save")}
-      aria-label={t("buttons.save")}
-      onClick={onSave}
-      data-testid="save-button"
-    />
-  </Stack.Row>
-);

src/components/BackgroundPickerAndDarkModeToggle.tsx

@@ -1,6 +1,7 @@
 import React from "react";
 import { ActionManager } from "../actions/manager";
 import { AppState } from "../types";
+import { DarkModeToggle } from "./DarkModeToggle";
 
 export const BackgroundPickerAndDarkModeToggle = ({
   appState,
@@ -15,6 +16,15 @@ export const BackgroundPickerAndDarkModeToggle = ({
 }) => (
   <div style={{ display: "flex" }}>
     {actionManager.renderAction("changeViewBackgroundColor")}
-    {showThemeBtn && actionManager.renderAction("toggleTheme")}
+    {showThemeBtn && (
+      <div style={{ marginInlineStart: "0.25rem" }}>
+        <DarkModeToggle
+          value={appState.theme}
+          onChange={(theme) => {
+            setAppState({ theme });
+          }}
+        />
+      </div>
+    )}
   </div>
 );

src/components/Card.scss

@@ -1,53 +0,0 @@
-@import "../css/variables.module";
-
-.excalidraw {
-  .Card {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-
-    max-width: 290px;
-
-    margin: 1em;
-
-    text-align: center;
-
-    .Card-icon {
-      font-size: 2.6em;
-      display: flex;
-      flex: 0 0 auto;
-      padding: 1.4rem;
-      border-radius: 50%;
-      background: var(--card-color);
-      color: $oc-white;
-
-      svg {
-        width: 2.8rem;
-        height: 2.8rem;
-      }
-    }
-
-    .Card-details {
-      font-size: 0.96em;
-      min-height: 90px;
-      padding: 0 1em;
-      margin-bottom: auto;
-    }
-
-    & .Card-button.ToolIcon_type_button {
-      height: 2.5rem;
-      margin-top: 1em;
-      margin-bottom: 0.3em;
-      background-color: var(--card-color);
-      &:hover {
-        background-color: var(--card-color-darker);
-      }
-      &:active {
-        background-color: var(--card-color-darkest);
-      }
-      .ToolIcon__label {
-        color: $oc-white;
-      }
-    }
-  }
-}

src/components/Card.tsx

@@ -1,20 +0,0 @@
-import OpenColor from "open-color";
-
-import "./Card.scss";
-
-export const Card: React.FC<{
-  color: keyof OpenColor;
-}> = ({ children, color }) => {
-  return (
-    <div
-      className="Card"
-      style={{
-        ["--card-color" as any]: OpenColor[color][7],
-        ["--card-color-darker" as any]: OpenColor[color][8],
-        ["--card-color-darkest" as any]: OpenColor[color][9],
-      }}
-    >
-      {children}
-    </div>
-  );
-};

src/components/CheckboxItem.scss

@@ -1,89 +0,0 @@
-@import "../css/variables.module";
-
-.excalidraw {
-  .Checkbox {
-    margin: 4px 0.3em;
-    display: flex;
-    align-items: center;
-
-    cursor: pointer;
-    user-select: none;
-
-    -webkit-tap-highlight-color: transparent;
-
-    &:hover:not(.is-checked) .Checkbox-box:not(:focus) {
-      box-shadow: 0 0 0 2px #{$oc-blue-4};
-    }
-
-    &:hover:not(.is-checked) .Checkbox-box:not(:focus) {
-      svg {
-        display: block;
-        opacity: 0.3;
-      }
-    }
-
-    &:active {
-      .Checkbox-box {
-        box-shadow: 0 0 2px 1px inset #{$oc-blue-7} !important;
-      }
-    }
-
-    &:hover {
-      .Checkbox-box {
-        background-color: fade-out($oc-blue-1, 0.8);
-      }
-    }
-
-    &.is-checked {
-      .Checkbox-box {
-        background-color: #{$oc-blue-1};
-        svg {
-          display: block;
-        }
-      }
-      &:hover .Checkbox-box {
-        background-color: #{$oc-blue-2};
-      }
-    }
-
-    .Checkbox-box {
-      width: 22px;
-      height: 22px;
-      padding: 0;
-      flex: 0 0 auto;
-
-      margin: 0 1em;
-
-      display: flex;
-      align-items: center;
-      justify-content: center;
-
-      box-shadow: 0 0 0 2px #{$oc-blue-7};
-      background-color: transparent;
-      border-radius: 4px;
-
-      color: #{$oc-blue-7};
-
-      &:focus {
-        box-shadow: 0 0 0 3px #{$oc-blue-7};
-      }
-
-      svg {
-        display: none;
-        width: 16px;
-        height: 16px;
-        stroke-width: 3px;
-      }
-    }
-
-    .Checkbox-label {
-      display: flex;
-      align-items: center;
-    }
-
-    .Tooltip-icon {
-      width: 1em;
-      height: 1em;
-    }
-  }
-}

src/components/CheckboxItem.tsx

@@ -1,27 +0,0 @@
-import React from "react";
-import clsx from "clsx";
-import { checkIcon } from "./icons";
-
-import "./CheckboxItem.scss";
-
-export const CheckboxItem: React.FC<{
-  checked: boolean;
-  onChange: (checked: boolean) => void;
-}> = ({ children, checked, onChange }) => {
-  return (
-    <div
-      className={clsx("Checkbox", { "is-checked": checked })}
-      onClick={(event) => {
-        onChange(!checked);
-        ((event.currentTarget as HTMLDivElement).querySelector(
-          ".Checkbox-box",
-        ) as HTMLButtonElement).focus();
-      }}
-    >
-      <button className="Checkbox-box" role="checkbox" aria-checked={checked}>
-        {checkIcon}
-      </button>
-      <div className="Checkbox-label">{children}</div>
-    </div>
-  );
-};

src/components/CollabButton.tsx

@@ -2,7 +2,7 @@ import React from "react";
 import clsx from "clsx";
 import { ToolButton } from "./ToolButton";
 import { t } from "../i18n";
-import { useIsMobile } from "../components/App";
+import { useIsMobile } from "../is-mobile";
 import { users } from "./icons";
 
 import "./CollabButton.scss";

src/components/ColorPicker.scss

@@ -160,7 +160,7 @@
   }
 
   .color-picker-input {
-    width: 11ch; /* length of `transparent` */
+    width: 12ch; /* length of `transparent` + 1 */
     margin: 0;
     font-size: 1rem;
     background-color: var(--input-bg-color);
@@ -218,7 +218,7 @@
       left: 2px;
     }
 
-    @include isMobile {
+    @media #{$is-mobile-query} {
       display: none;
     }
   }

src/components/ColorPicker.tsx

@@ -115,7 +115,6 @@ const Picker = ({
       onClose();
     }
     event.nativeEvent.stopImmediatePropagation();
-    event.stopPropagation();
   };
 
   return (
@@ -238,16 +237,13 @@ export const ColorPicker = ({
   color,
   onChange,
   label,
-  isActive,
-  setActive,
 }: {
   type: "canvasBackground" | "elementBackground" | "elementStroke";
   color: string | null;
   onChange: (color: string) => void;
   label: string;
-  isActive: boolean;
-  setActive: (active: boolean) => void;
 }) => {
+  const [isActive, setActive] = React.useState(false);
   const pickerButton = React.useRef<HTMLButtonElement>(null);
 
   return (

src/components/ContextMenu.scss

@@ -76,7 +76,7 @@
     z-index: 1;
   }
 
-  @include isMobile {
+  @media #{$is-mobile-query} {
     .context-menu-option {
       display: block;
 

src/components/DarkModeToggle.tsx

@@ -2,7 +2,6 @@ import "./ToolIcon.scss";
 
 import React from "react";
 import { t } from "../i18n";
-import { ToolButton } from "./ToolButton";
 
 export type Appearence = "light" | "dark";
 
@@ -13,19 +12,31 @@ export const DarkModeToggle = (props: {
   onChange: (value: Appearence) => void;
   title?: string;
 }) => {
-  const title =
-    props.title ||
-    (props.value === "dark" ? t("buttons.lightMode") : t("buttons.darkMode"));
+  const title = props.title
+    ? props.title
+    : props.value === "dark"
+    ? t("buttons.lightMode")
+    : t("buttons.darkMode");
 
   return (
-    <ToolButton
-      type="icon"
-      icon={props.value === "light" ? ICONS.MOON : ICONS.SUN}
-      title={title}
-      aria-label={title}
-      onClick={() => props.onChange(props.value === "dark" ? "light" : "dark")}
+    <label
+      className="ToolIcon ToolIcon_type_floating ToolIcon_size_M"
       data-testid="toggle-dark-mode"
-    />
+      title={title}
+    >
+      <input
+        className="ToolIcon_type_checkbox ToolIcon_toggle_opaque"
+        type="checkbox"
+        onChange={(event) =>
+          props.onChange(event.target.checked ? "dark" : "light")
+        }
+        checked={props.value === "dark"}
+        aria-label={title}
+      />
+      <div className="ToolIcon__icon">
+        {props.value === "light" ? ICONS.MOON : ICONS.SUN}
+      </div>
+    </label>
   );
 };
 

src/components/Dialog.scss

@@ -31,7 +31,7 @@
     padding: 0 16px 16px;
   }
 
-  @include isMobile {
+  @media #{$is-mobile-query} {
     .Dialog {
       --metric: calc(var(--space-factor) * 4);
       --inset-left: #{"max(var(--metric), var(--sal))"};

src/components/Dialog.tsx

@@ -1,14 +1,13 @@
 import clsx from "clsx";
-import React, { useEffect, useState } from "react";
+import React, { useEffect } from "react";
 import { useCallbackRefState } from "../hooks/useCallbackRefState";
 import { t } from "../i18n";
-import { useExcalidrawContainer, useIsMobile } from "../components/App";
+import { useIsMobile } from "../is-mobile";
 import { KEYS } from "../keys";
 import "./Dialog.scss";
 import { back, close } from "./icons";
 import { Island } from "./Island";
 import { Modal } from "./Modal";
-import { AppState } from "../types";
 
 export const Dialog = (props: {
   children: React.ReactNode;
@@ -17,11 +16,8 @@ export const Dialog = (props: {
   onCloseRequest(): void;
   title: React.ReactNode;
   autofocus?: boolean;
-  theme?: AppState["theme"];
 }) => {
   const [islandNode, setIslandNode] = useCallbackRefState<HTMLDivElement>();
-  const [lastActiveElement] = useState(document.activeElement);
-  const { id } = useExcalidrawContainer();
 
   useEffect(() => {
     if (!islandNode) {
@@ -69,25 +65,19 @@ export const Dialog = (props: {
     return focusableElements ? Array.from(focusableElements) : [];
   };
 
-  const onClose = () => {
-    (lastActiveElement as HTMLElement).focus();
-    props.onCloseRequest();
-  };
-
   return (
     <Modal
       className={clsx("Dialog", props.className)}
       labelledBy="dialog-title"
       maxWidth={props.small ? 550 : 800}
-      onCloseRequest={onClose}
-      theme={props.theme}
+      onCloseRequest={props.onCloseRequest}
     >
       <Island ref={setIslandNode}>
-        <h2 id={`${id}-dialog-title`} className="Dialog__title">
+        <h2 id="dialog-title" className="Dialog__title">
           <span className="Dialog__titleContent">{props.title}</span>
           <button
             className="Modal__close"
-            onClick={onClose}
+            onClick={props.onCloseRequest}
             aria-label={t("buttons.close")}
           >
             {useIsMobile() ? back : close}

src/components/ErrorDialog.tsx

@@ -2,7 +2,6 @@ import React, { useState } from "react";
 import { t } from "../i18n";
 
 import { Dialog } from "./Dialog";
-import { useExcalidrawContainer } from "./App";
 
 export const ErrorDialog = ({
   message,
@@ -12,7 +11,6 @@ export const ErrorDialog = ({
   onClose?: () => void;
 }) => {
   const [modalIsShown, setModalIsShown] = useState(!!message);
-  const { container: excalidrawContainer } = useExcalidrawContainer();
 
   const handleClose = React.useCallback(() => {
     setModalIsShown(false);
@@ -20,9 +18,7 @@ export const ErrorDialog = ({
     if (onClose) {
       onClose();
     }
-    // TODO: Fix the A11y issues so this is never needed since we should always focus on last active element
-    excalidrawContainer?.focus();
-  }, [onClose, excalidrawContainer]);
+  }, [onClose]);
 
   return (
     <>

src/components/ExportDialog.scss

@@ -28,7 +28,34 @@
     justify-content: space-between;
   }
 
-  @include isMobile {
+  .ExportDialog__name {
+    grid-column: project-name;
+    margin: auto;
+    display: flex;
+    align-items: center;
+
+    .TextInput {
+      height: calc(1rem - 3px);
+      width: 200px;
+      overflow: hidden;
+      text-align: center;
+      margin-left: 8px;
+      text-overflow: ellipsis;
+
+      &--readonly {
+        background: none;
+        border: none;
+        &:hover {
+          background: none;
+        }
+        width: auto;
+        max-width: 200px;
+        padding-left: 2px;
+      }
+    }
+  }
+
+  @media #{$is-mobile-query} {
     .ExportDialog {
       display: flex;
       flex-direction: column;
@@ -57,63 +84,4 @@
       overflow-y: auto;
     }
   }
-
-  .ExportDialog--json {
-    .ExportDialog-cards {
-      display: grid;
-      grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
-      justify-items: center;
-      row-gap: 2em;
-
-      @media (max-width: 460px) {
-        grid-template-columns: repeat(auto-fit, minmax(240px, 1fr));
-        .Card-details {
-          min-height: 40px;
-        }
-      }
-
-      .ProjectName {
-        width: fit-content;
-        margin: 1em auto;
-        align-items: flex-start;
-        flex-direction: column;
-
-        .TextInput {
-          width: auto;
-        }
-      }
-
-      .ProjectName-label {
-        margin: 0.625em 0;
-        font-weight: bold;
-      }
-    }
-  }
-
-  button.ExportDialog-imageExportButton {
-    width: 5rem;
-    height: 5rem;
-    margin: 0 0.2em;
-
-    border-radius: 1rem;
-    background-color: var(--button-color);
-    box-shadow: 0 3px 5px -1px rgba(0, 0, 0, 0.28),
-      0 6px 10px 0 rgba(0, 0, 0, 0.14);
-
-    font-family: Cascadia;
-    font-size: 1.8em;
-    color: $oc-white;
-
-    &:hover {
-      background-color: var(--button-color-darker);
-    }
-    &:active {
-      background-color: var(--button-color-darkest);
-      box-shadow: none;
-    }
-
-    svg {
-      width: 0.9em;
-    }
-  }
 }

src/components/ExportDialog.tsx

@@ -6,19 +6,18 @@ import { canvasToBlob } from "../data/blob";
 import { NonDeletedExcalidrawElement } from "../element/types";
 import { CanvasError } from "../errors";
 import { t } from "../i18n";
-import { useIsMobile } from "./App";
+import { useIsMobile } from "../is-mobile";
 import { getSelectedElements, isSomeElementSelected } from "../scene";
-import { exportToCanvas } from "../scene/export";
+import { exportToCanvas, getExportSize } from "../scene/export";
 import { AppState } from "../types";
 import { Dialog } from "./Dialog";
-import { clipboard, exportImage } from "./icons";
+import "./ExportDialog.scss";
+import { clipboard, exportFile, link } from "./icons";
 import Stack from "./Stack";
 import { ToolButton } from "./ToolButton";
-import "./ExportDialog.scss";
-import { supported as fsSupported } from "browser-fs-access";
-import OpenColor from "open-color";
-import { CheckboxItem } from "./CheckboxItem";
-import { DEFAULT_EXPORT_PADDING } from "../constants";
+
+const scales = [1, 2, 3];
+const defaultScale = scales.includes(devicePixelRatio) ? devicePixelRatio : 1;
 
 const supportsContextFilters =
   "filter" in document.createElement("canvas").getContext("2d")!;
@@ -53,37 +52,15 @@ export type ExportCB = (
   scale?: number,
 ) => void;
 
-const ExportButton: React.FC<{
-  color: keyof OpenColor;
-  onClick: () => void;
-  title: string;
-  shade?: number;
-}> = ({ children, title, onClick, color, shade = 6 }) => {
-  return (
-    <button
-      className="ExportDialog-imageExportButton"
-      style={{
-        ["--button-color" as any]: OpenColor[color][shade],
-        ["--button-color-darker" as any]: OpenColor[color][shade + 1],
-        ["--button-color-darkest" as any]: OpenColor[color][shade + 2],
-      }}
-      title={title}
-      aria-label={title}
-      onClick={onClick}
-    >
-      {children}
-    </button>
-  );
-};
-
-const ImageExportModal = ({
+const ExportModal = ({
   elements,
   appState,
-  exportPadding = DEFAULT_EXPORT_PADDING,
+  exportPadding = 10,
   actionManager,
   onExportToPng,
   onExportToSvg,
   onExportToClipboard,
+  onExportToBackend,
 }: {
   appState: AppState;
   elements: readonly NonDeletedExcalidrawElement[];
@@ -92,12 +69,18 @@ const ImageExportModal = ({
   onExportToPng: ExportCB;
   onExportToSvg: ExportCB;
   onExportToClipboard: ExportCB;
+  onExportToBackend?: ExportCB;
   onCloseRequest: () => void;
 }) => {
   const someElementIsSelected = isSomeElementSelected(elements, appState);
+  const [scale, setScale] = useState(defaultScale);
   const [exportSelected, setExportSelected] = useState(someElementIsSelected);
   const previewRef = useRef<HTMLDivElement>(null);
-  const { exportBackground, viewBackgroundColor } = appState;
+  const {
+    exportBackground,
+    viewBackgroundColor,
+    shouldAddWatermark,
+  } = appState;
 
   const exportedElements = exportSelected
     ? getSelectedElements(elements, appState)
@@ -117,6 +100,8 @@ const ImageExportModal = ({
         exportBackground,
         viewBackgroundColor,
         exportPadding,
+        scale,
+        shouldAddWatermark,
       });
 
       // if converting to blob fails, there's some problem that will
@@ -139,6 +124,8 @@ const ImageExportModal = ({
     exportBackground,
     exportPadding,
     viewBackgroundColor,
+    scale,
+    shouldAddWatermark,
   ]);
 
   return (
@@ -146,84 +133,107 @@ const ImageExportModal = ({
       <div className="ExportDialog__preview" ref={previewRef} />
       {supportsContextFilters &&
         actionManager.renderAction("exportWithDarkMode")}
-      <div style={{ display: "grid", gridTemplateColumns: "1fr" }}>
-        <div
-          style={{
-            display: "grid",
-            gridTemplateColumns: "repeat(auto-fit, minmax(190px, 1fr))",
-            // dunno why this is needed, but when the items wrap it creates
-            // an overflow
-            overflow: "hidden",
-          }}
-        >
-          {actionManager.renderAction("changeExportBackground")}
-          {someElementIsSelected && (
-            <CheckboxItem
-              checked={exportSelected}
-              onChange={(checked) => setExportSelected(checked)}
-            >
-              {t("labels.onlySelected")}
-            </CheckboxItem>
-          )}
-          {actionManager.renderAction("changeExportEmbedScene")}
+      <Stack.Col gap={2} align="center">
+        <div className="ExportDialog__actions">
+          <Stack.Row gap={2}>
+            <ToolButton
+              type="button"
+              label="PNG"
+              title={t("buttons.exportToPng")}
+              aria-label={t("buttons.exportToPng")}
+              onClick={() => onExportToPng(exportedElements, scale)}
+            />
+            <ToolButton
+              type="button"
+              label="SVG"
+              title={t("buttons.exportToSvg")}
+              aria-label={t("buttons.exportToSvg")}
+              onClick={() => onExportToSvg(exportedElements, scale)}
+            />
+            {probablySupportsClipboardBlob && (
+              <ToolButton
+                type="button"
+                icon={clipboard}
+                title={t("buttons.copyPngToClipboard")}
+                aria-label={t("buttons.copyPngToClipboard")}
+                onClick={() => onExportToClipboard(exportedElements, scale)}
+              />
+            )}
+            {onExportToBackend && (
+              <ToolButton
+                type="button"
+                icon={link}
+                title={t("buttons.getShareableLink")}
+                aria-label={t("buttons.getShareableLink")}
+                onClick={() => onExportToBackend(exportedElements)}
+              />
+            )}
+          </Stack.Row>
+          <div className="ExportDialog__name">
+            {actionManager.renderAction("changeProjectName")}
+          </div>
+          <Stack.Row gap={2}>
+            {scales.map((s) => {
+              const [width, height] = getExportSize(
+                exportedElements,
+                exportPadding,
+                shouldAddWatermark,
+                s,
+              );
+
+              const scaleButtonTitle = `${t(
+                "buttons.scale",
+              )} ${s}x (${width}x${height})`;
+
+              return (
+                <ToolButton
+                  key={s}
+                  size="s"
+                  type="radio"
+                  icon={`${s}x`}
+                  name="export-canvas-scale"
+                  title={scaleButtonTitle}
+                  aria-label={scaleButtonTitle}
+                  id="export-canvas-scale"
+                  checked={s === scale}
+                  onChange={() => setScale(s)}
+                />
+              );
+            })}
+          </Stack.Row>
         </div>
-      </div>
-      <div style={{ display: "flex", alignItems: "center", marginTop: ".6em" }}>
-        <Stack.Row gap={2}>
-          {actionManager.renderAction("changeExportScale")}
-        </Stack.Row>
-        <p style={{ marginLeft: "1em", userSelect: "none" }}>Scale</p>
-      </div>
-      <div
-        style={{
-          display: "flex",
-          alignItems: "center",
-          justifyContent: "center",
-          margin: ".6em 0",
-        }}
-      >
-        {!fsSupported && actionManager.renderAction("changeProjectName")}
-      </div>
-      <Stack.Row gap={2} justifyContent="center" style={{ margin: "2em 0" }}>
-        <ExportButton
-          color="indigo"
-          title={t("buttons.exportToPng")}
-          aria-label={t("buttons.exportToPng")}
-          onClick={() => onExportToPng(exportedElements)}
-        >
-          PNG
-        </ExportButton>
-        <ExportButton
-          color="red"
-          title={t("buttons.exportToSvg")}
-          aria-label={t("buttons.exportToSvg")}
-          onClick={() => onExportToSvg(exportedElements)}
-        >
-          SVG
-        </ExportButton>
-        {probablySupportsClipboardBlob && (
-          <ExportButton
-            title={t("buttons.copyPngToClipboard")}
-            onClick={() => onExportToClipboard(exportedElements)}
-            color="gray"
-            shade={7}
-          >
-            {clipboard}
-          </ExportButton>
+        {actionManager.renderAction("toggleAutosave")}
+        {actionManager.renderAction("changeExportBackground")}
+        {someElementIsSelected && (
+          <div>
+            <label>
+              <input
+                type="checkbox"
+                checked={exportSelected}
+                onChange={(event) =>
+                  setExportSelected(event.currentTarget.checked)
+                }
+              />{" "}
+              {t("labels.onlySelected")}
+            </label>
+          </div>
         )}
-      </Stack.Row>
+        {actionManager.renderAction("changeExportEmbedScene")}
+        {actionManager.renderAction("changeShouldAddWatermark")}
+      </Stack.Col>
     </div>
   );
 };
 
-export const ImageExportDialog = ({
+export const ExportDialog = ({
   elements,
   appState,
-  exportPadding = DEFAULT_EXPORT_PADDING,
+  exportPadding = 10,
   actionManager,
   onExportToPng,
   onExportToSvg,
   onExportToClipboard,
+  onExportToBackend,
 }: {
   appState: AppState;
   elements: readonly NonDeletedExcalidrawElement[];
@@ -232,11 +242,14 @@ export const ImageExportDialog = ({
   onExportToPng: ExportCB;
   onExportToSvg: ExportCB;
   onExportToClipboard: ExportCB;
+  onExportToBackend?: ExportCB;
 }) => {
   const [modalIsShown, setModalIsShown] = useState(false);
+  const triggerButton = useRef<HTMLButtonElement>(null);
 
   const handleClose = React.useCallback(() => {
     setModalIsShown(false);
+    triggerButton.current?.focus();
   }, []);
 
   return (
@@ -245,16 +258,17 @@ export const ImageExportDialog = ({
         onClick={() => {
           setModalIsShown(true);
         }}
-        data-testid="image-export-button"
-        icon={exportImage}
+        data-testid="export-button"
+        icon={exportFile}
         type="button"
-        aria-label={t("buttons.exportImage")}
+        aria-label={t("buttons.export")}
         showAriaLabel={useIsMobile()}
-        title={t("buttons.exportImage")}
+        title={t("buttons.export")}
+        ref={triggerButton}
       />
       {modalIsShown && (
-        <Dialog onCloseRequest={handleClose} title={t("buttons.exportImage")}>
-          <ImageExportModal
+        <Dialog onCloseRequest={handleClose} title={t("buttons.export")}>
+          <ExportModal
             elements={elements}
             appState={appState}
             exportPadding={exportPadding}
@@ -262,6 +276,7 @@ export const ImageExportDialog = ({
             onExportToPng={onExportToPng}
             onExportToSvg={onExportToSvg}
             onExportToClipboard={onExportToClipboard}
+            onExportToBackend={onExportToBackend}
             onCloseRequest={handleClose}
           />
         </Dialog>

src/components/FixedSideContainer.scss

@@ -1,5 +1,6 @@
 .excalidraw {
   .FixedSideContainer {
+    --margin: 0.25rem;
     position: absolute;
     pointer-events: none;
   }
@@ -9,9 +10,9 @@
   }
 
   .FixedSideContainer_side_top {
-    left: var(--space-factor);
-    top: var(--space-factor);
-    right: var(--space-factor);
+    left: var(--margin);
+    top: var(--margin);
+    right: var(--margin);
     z-index: 2;
   }
 
@@ -22,16 +23,16 @@
 
 /* TODO: if these are used, make sure to implement RTL support
 .FixedSideContainer_side_left {
-  left: var(--space-factor);
-  top: var(--space-factor);
-  bottom: var(--space-factor);
+  left: var(--margin);
+  top: var(--margin);
+  bottom: var(--margin);
   z-index: 1;
 }
 
 .FixedSideContainer_side_right {
-  right: var(--space-factor);
-  top: var(--space-factor);
-  bottom: var(--space-factor);
+  right: var(--margin);
+  top: var(--margin);
+  bottom: var(--margin);
   z-index: 3;
 }
 */

src/components/GitHubCorner.tsx

@@ -3,19 +3,13 @@ import React from "react";
 
 // https://github.com/tholman/github-corners
 export const GitHubCorner = React.memo(
-  ({ theme, dir }: { theme: "light" | "dark"; dir: string }) => (
+  ({ theme }: { theme: "light" | "dark" }) => (
     <svg
       xmlns="http://www.w3.org/2000/svg"
       width="40"
       height="40"
       viewBox="0 0 250 250"
-      className="rtl-mirror"
-      style={{
-        marginTop: "calc(var(--space-factor) * -1)",
-        [dir === "rtl"
-          ? "marginLeft"
-          : "marginRight"]: "calc(var(--space-factor) * -1)",
-      }}
+      className="github-corner rtl-mirror"
     >
       <a
         href="https://github.com/excalidraw/excalidraw"
@@ -25,18 +19,18 @@ export const GitHubCorner = React.memo(
       >
         <path
           d="M0 0l115 115h15l12 27 108 108V0z"
-          fill={theme === "light" ? oc.gray[6] : oc.gray[7]}
+          fill={theme === "light" ? oc.gray[6] : oc.gray[8]}
         />
         <path
           className="octo-arm"
           d="M128 109c-15-9-9-19-9-19 3-7 2-11 2-11-1-7 3-2 3-2 4 5 2 11 2 11-3 10 5 15 9 16"
           style={{ transformOrigin: "130px 106px" }}
-          fill={theme === "light" ? oc.white : "var(--default-bg-color)"}
+          fill={theme === "light" ? oc.white : oc.black}
         />
         <path
           className="octo-body"
           d="M115 115s4 2 5 0l14-14c3-2 6-3 8-3-8-11-15-24 2-41 5-5 10-7 16-7 1-2 3-7 12-11 0 0 5 3 7 16 4 2 8 5 12 9s7 8 9 12c14 3 17 7 17 7-4 8-9 11-11 11 0 6-2 11-7 16-16 16-30 10-41 2 0 3-1 7-5 11l-12 11c-1 1 1 5 1 5z"
-          fill={theme === "light" ? oc.white : "var(--default-bg-color)"}
+          fill={theme === "light" ? oc.white : oc.black}
         />
       </a>
     </svg>

src/components/HelpDialog.tsx

@@ -153,17 +153,10 @@ export const HelpDialog = ({ onClose }: { onClose?: () => void }) => {
                 <Shortcut label={t("toolBar.arrow")} shortcuts={["A", "5"]} />
                 <Shortcut label={t("toolBar.line")} shortcuts={["P", "6"]} />
                 <Shortcut
-                  label={t("toolBar.freedraw")}
+                  label={t("toolBar.draw")}
                   shortcuts={["Shift+P", "7"]}
                 />
                 <Shortcut label={t("toolBar.text")} shortcuts={["T", "8"]} />
-                <Shortcut
-                  label={t("helpDialog.editSelectedShape")}
-                  shortcuts={[
-                    getShortcutKey("Enter"),
-                    t("helpDialog.doubleClick"),
-                  ]}
-                />
                 <Shortcut
                   label={t("helpDialog.textNewLine")}
                   shortcuts={[
@@ -238,14 +231,6 @@ export const HelpDialog = ({ onClose }: { onClose?: () => void }) => {
                   label={t("labels.viewMode")}
                   shortcuts={[getShortcutKey("Alt+R")]}
                 />
-                <Shortcut
-                  label={t("labels.toggleTheme")}
-                  shortcuts={[getShortcutKey("Alt+Shift+D")]}
-                />
-                <Shortcut
-                  label={t("stats.title")}
-                  shortcuts={[getShortcutKey("Alt+/")]}
-                />
               </ShortcutIsland>
             </Column>
             <Column>
@@ -372,14 +357,6 @@ export const HelpDialog = ({ onClose }: { onClose?: () => void }) => {
                   label={t("labels.flipVertical")}
                   shortcuts={[getShortcutKey("Shift+V")]}
                 />
-                <Shortcut
-                  label={t("labels.showStroke")}
-                  shortcuts={[getShortcutKey("S")]}
-                />
-                <Shortcut
-                  label={t("labels.showBackground")}
-                  shortcuts={[getShortcutKey("G")]}
-                />
               </ShortcutIsland>
             </Column>
           </Columns>

src/components/HintViewer.scss

@@ -19,7 +19,7 @@ $wide-viewport-width: 1000px;
     color: $oc-gray-6;
     font-size: 0.8rem;
 
-    @include isMobile {
+    @media #{$is-mobile-query} {
       position: static;
       padding-right: 2em;
     }

src/components/HintViewer.tsx

@@ -5,7 +5,7 @@ import { getSelectedElements } from "../scene";
 
 import "./HintViewer.scss";
 import { AppState } from "../types";
-import { isLinearElement, isTextElement } from "../element/typeChecks";
+import { isLinearElement } from "../element/typeChecks";
 import { getShortcutKey } from "../utils";
 
 interface Hint {
@@ -23,7 +23,7 @@ const getHints = ({ appState, elements }: Hint) => {
     return t("hints.linearElementMulti");
   }
 
-  if (elementType === "freedraw") {
+  if (elementType === "draw") {
     return t("hints.freeDraw");
   }
 
@@ -57,14 +57,6 @@ const getHints = ({ appState, elements }: Hint) => {
     return t("hints.lineEditor_info");
   }
 
-  if (selectedElements.length === 1 && isTextElement(selectedElements[0])) {
-    return t("hints.text_selected");
-  }
-
-  if (appState.editingElement && isTextElement(appState.editingElement)) {
-    return t("hints.text_editing");
-  }
-
   return null;
 };
 

src/components/IconPicker.scss

@@ -111,7 +111,7 @@
     :root[dir="rtl"] & {
       left: 2px;
     }
-    @include isMobile {
+    @media #{$is-mobile-query} {
       display: none;
     }
   }

src/components/IconPicker.tsx

@@ -88,7 +88,6 @@ function Picker<T>({
       onClose();
     }
     event.nativeEvent.stopImmediatePropagation();
-    event.stopPropagation();
   };
 
   return (

src/components/Island.scss

@@ -2,6 +2,7 @@
   .Island {
     --padding: 0;
     background-color: var(--island-bg-color);
+    backdrop-filter: saturate(100%) blur(10px);
     box-shadow: var(--shadow-island);
     border-radius: 4px;
     padding: calc(var(--padding) * var(--space-factor));

src/components/JSONExportDialog.tsx

@@ -1,127 +0,0 @@
-import React, { useState } from "react";
-import { ActionsManagerInterface } from "../actions/types";
-import { NonDeletedExcalidrawElement } from "../element/types";
-import { t } from "../i18n";
-import { useIsMobile } from "./App";
-import { AppState, ExportOpts } from "../types";
-import { Dialog } from "./Dialog";
-import { exportFile, exportToFileIcon, link } from "./icons";
-import { ToolButton } from "./ToolButton";
-import { actionSaveFileToDisk } from "../actions/actionExport";
-import { Card } from "./Card";
-
-import "./ExportDialog.scss";
-import { supported as fsSupported } from "browser-fs-access";
-
-export type ExportCB = (
-  elements: readonly NonDeletedExcalidrawElement[],
-  scale?: number,
-) => void;
-
-const JSONExportModal = ({
-  elements,
-  appState,
-  actionManager,
-  exportOpts,
-  canvas,
-}: {
-  appState: AppState;
-  elements: readonly NonDeletedExcalidrawElement[];
-  actionManager: ActionsManagerInterface;
-  onCloseRequest: () => void;
-  exportOpts: ExportOpts;
-  canvas: HTMLCanvasElement | null;
-}) => {
-  const { onExportToBackend } = exportOpts;
-  return (
-    <div className="ExportDialog ExportDialog--json">
-      <div className="ExportDialog-cards">
-        {exportOpts.saveFileToDisk && (
-          <Card color="lime">
-            <div className="Card-icon">{exportToFileIcon}</div>
-            <h2>{t("exportDialog.disk_title")}</h2>
-            <div className="Card-details">
-              {t("exportDialog.disk_details")}
-              {!fsSupported && actionManager.renderAction("changeProjectName")}
-            </div>
-            <ToolButton
-              className="Card-button"
-              type="button"
-              title={t("exportDialog.disk_button")}
-              aria-label={t("exportDialog.disk_button")}
-              showAriaLabel={true}
-              onClick={() => {
-                actionManager.executeAction(actionSaveFileToDisk);
-              }}
-            />
-          </Card>
-        )}
-        {onExportToBackend && (
-          <Card color="pink">
-            <div className="Card-icon">{link}</div>
-            <h2>{t("exportDialog.link_title")}</h2>
-            <div className="Card-details">{t("exportDialog.link_details")}</div>
-            <ToolButton
-              className="Card-button"
-              type="button"
-              title={t("exportDialog.link_button")}
-              aria-label={t("exportDialog.link_button")}
-              showAriaLabel={true}
-              onClick={() => onExportToBackend(elements, appState, canvas)}
-            />
-          </Card>
-        )}
-        {exportOpts.renderCustomUI &&
-          exportOpts.renderCustomUI(elements, appState, canvas)}
-      </div>
-    </div>
-  );
-};
-
-export const JSONExportDialog = ({
-  elements,
-  appState,
-  actionManager,
-  exportOpts,
-  canvas,
-}: {
-  appState: AppState;
-  elements: readonly NonDeletedExcalidrawElement[];
-  actionManager: ActionsManagerInterface;
-  exportOpts: ExportOpts;
-  canvas: HTMLCanvasElement | null;
-}) => {
-  const [modalIsShown, setModalIsShown] = useState(false);
-
-  const handleClose = React.useCallback(() => {
-    setModalIsShown(false);
-  }, []);
-
-  return (
-    <>
-      <ToolButton
-        onClick={() => {
-          setModalIsShown(true);
-        }}
-        data-testid="json-export-button"
-        icon={exportFile}
-        type="button"
-        aria-label={t("buttons.export")}
-        showAriaLabel={useIsMobile()}
-        title={t("buttons.export")}
-      />
-      {modalIsShown && (
-        <Dialog onCloseRequest={handleClose} title={t("buttons.export")}>
-          <JSONExportModal
-            elements={elements}
-            appState={appState}
-            actionManager={actionManager}
-            onCloseRequest={handleClose}
-            exportOpts={exportOpts}
-            canvas={canvas}
-          />
-        </Dialog>
-      )}
-    </>
-  );
-};

src/components/LayerUI.scss

@@ -40,17 +40,50 @@
   .layer-ui__wrapper {
     z-index: var(--zIndex-layerUI);
 
-    &__top-right {
+    .encrypted-icon {
+      position: relative;
+      margin-inline-start: 15px;
       display: flex;
+      justify-content: center;
+      align-items: center;
+      border-radius: var(--space-factor);
+      color: $oc-green-9;
+
+      svg {
+        width: 1.2rem;
+        height: 1.2rem;
+      }
+    }
+
+    &__github-corner {
+      top: 0;
+
+      :root[dir="ltr"] & {
+        right: 0;
+      }
+
+      :root[dir="rtl"] & {
+        left: 0;
+      }
+
+      position: absolute;
+      width: 40px;
     }
 
     &__footer {
-      width: 100%;
+      position: absolute;
+      z-index: 100;
+      bottom: 0;
 
-      &-right {
-        z-index: 100;
-        display: flex;
+      :root[dir="ltr"] & {
+        right: 0;
       }
+
+      :root[dir="rtl"] & {
+        left: 0;
+      }
+
+      width: 190px;
     }
 
     .zen-mode-transition {
@@ -72,16 +105,12 @@
         transform: translate(-999px, 0);
       }
 
-      :root[dir="ltr"] &.layer-ui__wrapper__footer-left--transition-left {
+      :root[dir="ltr"] &.App-menu_bottom--transition-left {
         transform: translate(-92px, 0);
       }
-      :root[dir="rtl"] &.layer-ui__wrapper__footer-left--transition-left {
+      :root[dir="rtl"] &.App-menu_bottom--transition-left {
         transform: translate(92px, 0);
       }
-
-      &.layer-ui__wrapper__footer-left--transition-bottom {
-        transform: translate(0, 92px);
-      }
     }
 
     .disable-zen-mode {
@@ -108,17 +137,5 @@
         transition-delay: 0.8s;
       }
     }
-
-    .layer-ui__wrapper__footer-center {
-      pointer-events: none;
-      & > * {
-        pointer-events: all;
-      }
-    }
-    .layer-ui__wrapper__footer-left,
-    .layer-ui__wrapper__footer-right,
-    .disable-zen-mode--visible {
-      pointer-events: all;
-    }
   }
 }

src/components/LayerUI.tsx

@@ -10,10 +10,11 @@ import { ActionManager } from "../actions/manager";
 import { CLASSES } from "../constants";
 import { exportCanvas } from "../data";
 import { importLibraryFromJSON, saveLibraryAsJSON } from "../data/json";
+import { Library } from "../data/library";
 import { isTextElement, showSelectedShapeActions } from "../element";
 import { NonDeletedExcalidrawElement } from "../element/types";
 import { Language, t } from "../i18n";
-import { useIsMobile } from "../components/App";
+import { useIsMobile } from "../is-mobile";
 import { calculateScrollCenter, getSelectedElements } from "../scene";
 import { ExportType } from "../scene/types";
 import {
@@ -28,15 +29,16 @@ import { SelectedShapeActions, ShapesSwitcher, ZoomActions } from "./Actions";
 import { BackgroundPickerAndDarkModeToggle } from "./BackgroundPickerAndDarkModeToggle";
 import CollabButton from "./CollabButton";
 import { ErrorDialog } from "./ErrorDialog";
-import { ExportCB, ImageExportDialog } from "./ImageExportDialog";
+import { ExportCB, ExportDialog } from "./ExportDialog";
 import { FixedSideContainer } from "./FixedSideContainer";
+import { GitHubCorner } from "./GitHubCorner";
 import { HintViewer } from "./HintViewer";
-import { exportFile, load, trash } from "./icons";
+import { exportFile, load, shield, trash } from "./icons";
 import { Island } from "./Island";
 import "./LayerUI.scss";
 import { LibraryUnit } from "./LibraryUnit";
 import { LoadingMessage } from "./LoadingMessage";
-import { LockButton } from "./LockButton";
+import { LockIcon } from "./LockIcon";
 import { MobileMenu } from "./MobileMenu";
 import { PasteChartDialog } from "./PasteChartDialog";
 import { Section } from "./Section";
@@ -45,9 +47,6 @@ import Stack from "./Stack";
 import { ToolButton } from "./ToolButton";
 import { Tooltip } from "./Tooltip";
 import { UserList } from "./UserList";
-import Library from "../data/library";
-import { JSONExportDialog } from "./JSONExportDialog";
-import { LibraryButton } from "./LibraryButton";
 
 interface LayerUIProps {
   actionManager: ActionManager;
@@ -64,14 +63,15 @@ interface LayerUIProps {
   toggleZenMode: () => void;
   langCode: Language["code"];
   isCollaborating: boolean;
-  renderTopRightUI?: (isMobile: boolean, appState: AppState) => JSX.Element;
-  renderCustomFooter?: (isMobile: boolean, appState: AppState) => JSX.Element;
+  onExportToBackend?: (
+    exportedElements: readonly NonDeletedExcalidrawElement[],
+    appState: AppState,
+    canvas: HTMLCanvasElement | null,
+  ) => void;
+  renderCustomFooter?: (isMobile: boolean) => JSX.Element;
   viewModeEnabled: boolean;
   libraryReturnUrl: ExcalidrawProps["libraryReturnUrl"];
   UIOptions: AppProps["UIOptions"];
-  focusContainer: () => void;
-  library: Library;
-  id: string;
 }
 
 const useOnClickOutside = (
@@ -103,34 +103,26 @@ const useOnClickOutside = (
 };
 
 const LibraryMenuItems = ({
-  libraryItems,
+  library,
   onRemoveFromLibrary,
   onAddToLibrary,
   onInsertShape,
   pendingElements,
-  theme,
   setAppState,
   setLibraryItems,
   libraryReturnUrl,
-  focusContainer,
-  library,
-  id,
 }: {
-  libraryItems: LibraryItems;
+  library: LibraryItems;
   pendingElements: LibraryItem;
   onRemoveFromLibrary: (index: number) => void;
   onInsertShape: (elements: LibraryItem) => void;
   onAddToLibrary: (elements: LibraryItem) => void;
-  theme: AppState["theme"];
   setAppState: React.Component<any, AppState>["setState"];
   setLibraryItems: (library: LibraryItems) => void;
   libraryReturnUrl: ExcalidrawProps["libraryReturnUrl"];
-  focusContainer: () => void;
-  library: Library;
-  id: string;
 }) => {
   const isMobile = useIsMobile();
-  const numCells = libraryItems.length + (pendingElements.length > 0 ? 1 : 0);
+  const numCells = library.length + (pendingElements.length > 0 ? 1 : 0);
   const CELLS_PER_ROW = isMobile ? 4 : 6;
   const numRows = Math.max(1, Math.ceil(numCells / CELLS_PER_ROW));
   const rows = [];
@@ -148,7 +140,7 @@ const LibraryMenuItems = ({
         aria-label={t("buttons.load")}
         icon={load}
         onClick={() => {
-          importLibraryFromJSON(library)
+          importLibraryFromJSON()
             .then(() => {
               // Close and then open to get the libraries updated
               setAppState({ isLibraryOpen: false });
@@ -160,7 +152,7 @@ const LibraryMenuItems = ({
             });
         }}
       />
-      {!!libraryItems.length && (
+      {!!library.length && (
         <>
           <ToolButton
             key="export"
@@ -169,7 +161,7 @@ const LibraryMenuItems = ({
             aria-label={t("buttons.export")}
             icon={exportFile}
             onClick={() => {
-              saveLibraryAsJSON(library)
+              saveLibraryAsJSON()
                 .catch(muteFSAbortError)
                 .catch((error) => {
                   setAppState({ errorMessage: error.message });
@@ -184,9 +176,8 @@ const LibraryMenuItems = ({
             icon={trash}
             onClick={() => {
               if (window.confirm(t("alerts.resetLibrary"))) {
-                library.resetLibrary();
+                Library.resetLibrary();
                 setLibraryItems([]);
-                focusContainer();
               }
             }}
           />
@@ -195,7 +186,7 @@ const LibraryMenuItems = ({
       <a
         href={`https://libraries.excalidraw.com?target=${
           window.name || "_blank"
-        }&referrer=${referrer}&useHash=true&token=${id}&theme=${theme}`}
+        }&referrer=${referrer}&useHash=true&token=${Library.csrfToken}`}
         target="_excalidraw_libraries"
       >
         {t("labels.libraries")}
@@ -210,13 +201,13 @@ const LibraryMenuItems = ({
       const shouldAddPendingElements: boolean =
         pendingElements.length > 0 &&
         !addedPendingElements &&
-        y + x >= libraryItems.length;
+        y + x >= library.length;
       addedPendingElements = addedPendingElements || shouldAddPendingElements;
 
       children.push(
         <Stack.Col key={x}>
           <LibraryUnit
-            elements={libraryItems[y + x]}
+            elements={library[y + x]}
             pendingElements={
               shouldAddPendingElements ? pendingElements : undefined
             }
@@ -224,7 +215,7 @@ const LibraryMenuItems = ({
             onClick={
               shouldAddPendingElements
                 ? onAddToLibrary.bind(null, pendingElements)
-                : onInsertShape.bind(null, libraryItems[y + x])
+                : onInsertShape.bind(null, library[y + x])
             }
           />
         </Stack.Col>,
@@ -249,23 +240,15 @@ const LibraryMenu = ({
   onInsertShape,
   pendingElements,
   onAddToLibrary,
-  theme,
   setAppState,
   libraryReturnUrl,
-  focusContainer,
-  library,
-  id,
 }: {
   pendingElements: LibraryItem;
   onClickOutside: (event: MouseEvent) => void;
   onInsertShape: (elements: LibraryItem) => void;
   onAddToLibrary: () => void;
-  theme: AppState["theme"];
   setAppState: React.Component<any, AppState>["setState"];
   libraryReturnUrl: ExcalidrawProps["libraryReturnUrl"];
-  focusContainer: () => void;
-  library: Library;
-  id: string;
 }) => {
   const ref = useRef<HTMLDivElement | null>(null);
   useOnClickOutside(ref, (event) => {
@@ -291,7 +274,7 @@ const LibraryMenu = ({
           resolve("loading");
         }, 100);
       }),
-      library.loadLibrary().then((items) => {
+      Library.loadLibrary().then((items) => {
         setLibraryItems(items);
         setIsLoading("ready");
       }),
@@ -303,33 +286,24 @@ const LibraryMenu = ({
     return () => {
       clearTimeout(loadingTimerRef.current!);
     };
-  }, [library]);
+  }, []);
 
-  const removeFromLibrary = useCallback(
-    async (indexToRemove) => {
-      const items = await library.loadLibrary();
-      const nextItems = items.filter((_, index) => index !== indexToRemove);
-      library.saveLibrary(nextItems).catch((error) => {
-        setLibraryItems(items);
-        setAppState({ errorMessage: t("alerts.errorRemovingFromLibrary") });
-      });
-      setLibraryItems(nextItems);
-    },
-    [library, setAppState],
-  );
+  const removeFromLibrary = useCallback(async (indexToRemove) => {
+    const items = await Library.loadLibrary();
+    const nextItems = items.filter((_, index) => index !== indexToRemove);
+    Library.saveLibrary(nextItems);
+    setLibraryItems(nextItems);
+  }, []);
 
   const addToLibrary = useCallback(
     async (elements: LibraryItem) => {
-      const items = await library.loadLibrary();
+      const items = await Library.loadLibrary();
       const nextItems = [...items, elements];
       onAddToLibrary();
-      library.saveLibrary(nextItems).catch((error) => {
-        setLibraryItems(items);
-        setAppState({ errorMessage: t("alerts.errorAddingToLibrary") });
-      });
+      Library.saveLibrary(nextItems);
       setLibraryItems(nextItems);
     },
-    [onAddToLibrary, library, setAppState],
+    [onAddToLibrary],
   );
 
   return loadingState === "preloading" ? null : (
@@ -340,7 +314,7 @@ const LibraryMenu = ({
         </div>
       ) : (
         <LibraryMenuItems
-          libraryItems={libraryItems}
+          library={libraryItems}
           onRemoveFromLibrary={removeFromLibrary}
           onAddToLibrary={addToLibrary}
           onInsertShape={onInsertShape}
@@ -348,10 +322,6 @@ const LibraryMenu = ({
           setAppState={setAppState}
           setLibraryItems={setLibraryItems}
           libraryReturnUrl={libraryReturnUrl}
-          focusContainer={focusContainer}
-          library={library}
-          theme={theme}
-          id={id}
         />
       )}
     </Island>
@@ -372,69 +342,75 @@ const LayerUI = ({
   showThemeBtn,
   toggleZenMode,
   isCollaborating,
-  renderTopRightUI,
+  onExportToBackend,
   renderCustomFooter,
   viewModeEnabled,
   libraryReturnUrl,
   UIOptions,
-  focusContainer,
-  library,
-  id,
 }: LayerUIProps) => {
   const isMobile = useIsMobile();
 
-  const renderJSONExportDialog = () => {
+  const renderEncryptedIcon = () => (
+    <a
+      className={clsx("encrypted-icon tooltip zen-mode-visibility", {
+        "zen-mode-visibility--hidden": zenModeEnabled,
+      })}
+      href="https://blog.excalidraw.com/end-to-end-encryption/"
+      target="_blank"
+      rel="noopener noreferrer"
+      aria-label={t("encrypted.link")}
+    >
+      <Tooltip label={t("encrypted.tooltip")} position="above" long={true}>
+        {shield}
+      </Tooltip>
+    </a>
+  );
+
+  const renderExportDialog = () => {
     if (!UIOptions.canvasActions.export) {
       return null;
     }
 
-    return (
-      <JSONExportDialog
-        elements={elements}
-        appState={appState}
-        actionManager={actionManager}
-        exportOpts={UIOptions.canvasActions.export}
-        canvas={canvas}
-      />
-    );
-  };
-
-  const renderImageExportDialog = () => {
-    if (!UIOptions.canvasActions.saveAsImage) {
-      return null;
-    }
-
     const createExporter = (type: ExportType): ExportCB => async (
       exportedElements,
+      scale,
     ) => {
-      await exportCanvas(type, exportedElements, appState, {
-        exportBackground: appState.exportBackground,
-        name: appState.name,
-        viewBackgroundColor: appState.viewBackgroundColor,
-      })
-        .catch(muteFSAbortError)
-        .catch((error) => {
-          console.error(error);
-          setAppState({ errorMessage: error.message });
-        });
+      if (canvas) {
+        await exportCanvas(type, exportedElements, appState, canvas, {
+          exportBackground: appState.exportBackground,
+          name: appState.name,
+          viewBackgroundColor: appState.viewBackgroundColor,
+          scale,
+          shouldAddWatermark: appState.shouldAddWatermark,
+        })
+          .catch(muteFSAbortError)
+          .catch((error) => {
+            console.error(error);
+            setAppState({ errorMessage: error.message });
+          });
+      }
     };
 
     return (
-      <ImageExportDialog
+      <ExportDialog
         elements={elements}
         appState={appState}
         actionManager={actionManager}
         onExportToPng={createExporter("png")}
         onExportToSvg={createExporter("svg")}
         onExportToClipboard={createExporter("clipboard")}
+        onExportToBackend={
+          onExportToBackend
+            ? (elements) => {
+                onExportToBackend &&
+                  onExportToBackend(elements, appState, canvas);
+              }
+            : undefined
+        }
       />
     );
   };
 
-  const Separator = () => {
-    return <div style={{ width: ".625em" }} />;
-  };
-
   const renderViewModeCanvasActions = () => {
     return (
       <Section
@@ -448,8 +424,9 @@ const LayerUI = ({
         <Island padding={2} style={{ zIndex: 1 }}>
           <Stack.Col gap={4}>
             <Stack.Row gap={1} justifyContent="space-between">
-              {renderJSONExportDialog()}
-              {renderImageExportDialog()}
+              {actionManager.renderAction("saveScene")}
+              {actionManager.renderAction("saveAsScene")}
+              {renderExportDialog()}
             </Stack.Row>
           </Stack.Col>
         </Island>
@@ -468,12 +445,11 @@ const LayerUI = ({
       <Island padding={2} style={{ zIndex: 1 }}>
         <Stack.Col gap={4}>
           <Stack.Row gap={1} justifyContent="space-between">
-            {actionManager.renderAction("clearCanvas")}
-            <Separator />
             {actionManager.renderAction("loadScene")}
-            {renderJSONExportDialog()}
-            {renderImageExportDialog()}
-            <Separator />
+            {actionManager.renderAction("saveScene")}
+            {actionManager.renderAction("saveAsScene")}
+            {renderExportDialog()}
+            {actionManager.renderAction("clearCanvas")}
             {onCollabButtonClick && (
               <CollabButton
                 isCollaborating={isCollaborating}
@@ -488,9 +464,6 @@ const LayerUI = ({
             setAppState={setAppState}
             showThemeBtn={showThemeBtn}
           />
-          {appState.fileHandle && (
-            <>{actionManager.renderAction("saveToActiveFile")}</>
-          )}
         </Stack.Col>
       </Island>
     </Section>
@@ -509,8 +482,7 @@ const LayerUI = ({
         style={{
           // we want to make sure this doesn't overflow so substracting 200
           // which is approximately height of zoom footer and top left menu items with some buffer
-          // if active file name is displayed, subtracting 248 to account for its height
-          maxHeight: `${appState.height - (appState.fileHandle ? 248 : 200)}px`,
+          maxHeight: `${appState.height - 200}px`,
         }}
       >
         <SelectedShapeActions
@@ -545,10 +517,6 @@ const LayerUI = ({
       onAddToLibrary={deselectItems}
       setAppState={setAppState}
       libraryReturnUrl={libraryReturnUrl}
-      focusContainer={focusContainer}
-      library={library}
-      theme={appState.theme}
-      id={id}
     />
   ) : null;
 
@@ -575,12 +543,6 @@ const LayerUI = ({
               {(heading) => (
                 <Stack.Col gap={4} align="start">
                   <Stack.Row gap={1}>
-                    <LockButton
-                      zenModeEnabled={zenModeEnabled}
-                      checked={appState.elementLocked}
-                      onChange={onLockToggle}
-                      title={t("toolBar.lock")}
-                    />
                     <Island
                       padding={1}
                       className={clsx({ "zen-mode": zenModeEnabled })}
@@ -592,12 +554,15 @@ const LayerUI = ({
                           canvas={canvas}
                           elementType={appState.elementType}
                           setAppState={setAppState}
+                          isLibraryOpen={appState.isLibraryOpen}
                         />
                       </Stack.Row>
                     </Island>
-                    <LibraryButton
-                      appState={appState}
-                      setAppState={setAppState}
+                    <LockIcon
+                      zenModeEnabled={zenModeEnabled}
+                      checked={appState.elementLocked}
+                      onChange={onLockToggle}
+                      title={t("toolBar.lock")}
                     />
                   </Stack.Row>
                   {libraryMenu}
@@ -605,30 +570,24 @@ const LayerUI = ({
               )}
             </Section>
           )}
-          <div
-            className={clsx(
-              "layer-ui__wrapper__top-right zen-mode-transition",
-              {
-                "transition-right": zenModeEnabled,
-              },
-            )}
+          <UserList
+            className={clsx("zen-mode-transition", {
+              "transition-right": zenModeEnabled,
+            })}
           >
-            <UserList>
-              {appState.collaborators.size > 0 &&
-                Array.from(appState.collaborators)
-                  // Collaborator is either not initialized or is actually the current user.
-                  .filter(([_, client]) => Object.keys(client).length !== 0)
-                  .map(([clientId, client]) => (
-                    <Tooltip
-                      label={client.username || "Unknown user"}
-                      key={clientId}
-                    >
-                      {actionManager.renderAction("goToCollaborator", clientId)}
-                    </Tooltip>
-                  ))}
-            </UserList>
-            {renderTopRightUI?.(isMobile, appState)}
-          </div>
+            {appState.collaborators.size > 0 &&
+              Array.from(appState.collaborators)
+                // Collaborator is either not initialized or is actually the current user.
+                .filter(([_, client]) => Object.keys(client).length !== 0)
+                .map(([clientId, client]) => (
+                  <Tooltip
+                    label={client.username || "Unknown user"}
+                    key={clientId}
+                  >
+                    {actionManager.renderAction("goToCollaborator", clientId)}
+                  </Tooltip>
+                ))}
+          </UserList>
         </div>
       </FixedSideContainer>
     );
@@ -636,61 +595,61 @@ const LayerUI = ({
 
   const renderBottomAppMenu = () => {
     return (
-      <footer
-        role="contentinfo"
-        className="layer-ui__wrapper__footer App-menu App-menu_bottom"
+      <div
+        className={clsx("App-menu App-menu_bottom zen-mode-transition", {
+          "App-menu_bottom--transition-left": zenModeEnabled,
+        })}
       >
-        <div
-          className={clsx(
-            "layer-ui__wrapper__footer-left zen-mode-transition",
-            {
-              "layer-ui__wrapper__footer-left--transition-left": zenModeEnabled,
-            },
-          )}
-        >
-          <Stack.Col gap={2}>
-            <Section heading="canvasActions">
-              <Island padding={1}>
-                <ZoomActions
-                  renderAction={actionManager.renderAction}
-                  zoom={appState.zoom}
-                />
-              </Island>
-            </Section>
-          </Stack.Col>
-        </div>
-        <div
-          className={clsx(
-            "layer-ui__wrapper__footer-center zen-mode-transition",
-            {
-              "layer-ui__wrapper__footer-left--transition-bottom": zenModeEnabled,
-            },
-          )}
-        >
-          {renderCustomFooter?.(false, appState)}
-        </div>
-        <div
-          className={clsx(
-            "layer-ui__wrapper__footer-right zen-mode-transition",
-            {
-              "transition-right disable-pointerEvents": zenModeEnabled,
-            },
-          )}
-        >
-          {actionManager.renderAction("toggleShortcuts")}
-        </div>
-        <button
-          className={clsx("disable-zen-mode", {
-            "disable-zen-mode--visible": showExitZenModeBtn,
-          })}
-          onClick={toggleZenMode}
-        >
-          {t("buttons.exitZenMode")}
-        </button>
-      </footer>
+        <Stack.Col gap={2}>
+          <Section heading="canvasActions">
+            <Island padding={1}>
+              <ZoomActions
+                renderAction={actionManager.renderAction}
+                zoom={appState.zoom}
+              />
+            </Island>
+            {renderEncryptedIcon()}
+          </Section>
+        </Stack.Col>
+      </div>
     );
   };
 
+  const renderGitHubCorner = () => {
+    return (
+      <aside
+        className={clsx(
+          "layer-ui__wrapper__github-corner zen-mode-transition",
+          {
+            "transition-right": zenModeEnabled,
+          },
+        )}
+      >
+        <GitHubCorner theme={appState.theme} />
+      </aside>
+    );
+  };
+  const renderFooter = () => (
+    <footer role="contentinfo" className="layer-ui__wrapper__footer">
+      <div
+        className={clsx("zen-mode-transition", {
+          "transition-right disable-pointerEvents": zenModeEnabled,
+        })}
+      >
+        {renderCustomFooter?.(false)}
+        {actionManager.renderAction("toggleShortcuts")}
+      </div>
+      <button
+        className={clsx("disable-zen-mode", {
+          "disable-zen-mode--visible": showExitZenModeBtn,
+        })}
+        onClick={toggleZenMode}
+      >
+        {t("buttons.exitZenMode")}
+      </button>
+    </footer>
+  );
+
   const dialogs = (
     <>
       {appState.isLoading && <LoadingMessage />}
@@ -701,11 +660,7 @@ const LayerUI = ({
         />
       )}
       {appState.showHelpDialog && (
-        <HelpDialog
-          onClose={() => {
-            setAppState({ showHelpDialog: false });
-          }}
-        />
+        <HelpDialog onClose={() => setAppState({ showHelpDialog: false })} />
       )}
       {appState.pasteDialog.shown && (
         <PasteChartDialog
@@ -730,8 +685,7 @@ const LayerUI = ({
         elements={elements}
         actionManager={actionManager}
         libraryMenu={libraryMenu}
-        renderJSONExportDialog={renderJSONExportDialog}
-        renderImageExportDialog={renderImageExportDialog}
+        exportButton={renderExportDialog()}
         setAppState={setAppState}
         onCollabButtonClick={onCollabButtonClick}
         onLockToggle={onLockToggle}
@@ -754,6 +708,8 @@ const LayerUI = ({
       {dialogs}
       {renderFixedSideContainer()}
       {renderBottomAppMenu()}
+      {renderGitHubCorner()}
+      {renderFooter()}
       {appState.scrolledOutside && (
         <button
           className="scroll-back-to-content"

src/components/LibraryButton.tsx

@@ -1,46 +0,0 @@
-import React from "react";
-import clsx from "clsx";
-import { t } from "../i18n";
-import { AppState } from "../types";
-import { capitalizeString } from "../utils";
-
-const LIBRARY_ICON = (
-  <svg viewBox="0 0 576 512">
-    <path
-      fill="currentColor"
-      d="M542.22 32.05c-54.8 3.11-163.72 14.43-230.96 55.59-4.64 2.84-7.27 7.89-7.27 13.17v363.87c0 11.55 12.63 18.85 23.28 13.49 69.18-34.82 169.23-44.32 218.7-46.92 16.89-.89 30.02-14.43 30.02-30.66V62.75c.01-17.71-15.35-31.74-33.77-30.7zM264.73 87.64C197.5 46.48 88.58 35.17 33.78 32.05 15.36 31.01 0 45.04 0 62.75V400.6c0 16.24 13.13 29.78 30.02 30.66 49.49 2.6 149.59 12.11 218.77 46.95 10.62 5.35 23.21-1.94 23.21-13.46V100.63c0-5.29-2.62-10.14-7.27-12.99z"
-    ></path>
-  </svg>
-);
-
-export const LibraryButton: React.FC<{
-  appState: AppState;
-  setAppState: React.Component<any, AppState>["setState"];
-}> = ({ appState, setAppState }) => {
-  return (
-    <label
-      className={clsx(
-        "ToolIcon ToolIcon_type_floating ToolIcon__library zen-mode-visibility",
-        `ToolIcon_size_m`,
-        {
-          "zen-mode-visibility--hidden": appState.zenModeEnabled,
-        },
-      )}
-      title={`${capitalizeString(t("toolBar.library"))} — 9`}
-      style={{ marginInlineStart: "var(--space-factor)" }}
-    >
-      <input
-        className="ToolIcon_type_checkbox"
-        type="checkbox"
-        name="editor-library"
-        onChange={(event) => {
-          setAppState({ isLibraryOpen: event.target.checked });
-        }}
-        checked={appState.isLibraryOpen}
-        aria-label={capitalizeString(t("toolBar.library"))}
-        aria-keyshortcuts="9"
-      />
-      <div className="ToolIcon__icon">{LIBRARY_ICON}</div>
-    </label>
-  );
-};

src/components/LibraryUnit.tsx

@@ -4,7 +4,7 @@ import React, { useEffect, useRef, useState } from "react";
 import { close } from "../components/icons";
 import { MIME_TYPES } from "../constants";
 import { t } from "../i18n";
-import { useIsMobile } from "../components/App";
+import { useIsMobile } from "../is-mobile";
 import { exportToSvg } from "../scene/export";
 import { LibraryItem } from "../types";
 import "./LibraryUnit.scss";
@@ -36,27 +36,22 @@ export const LibraryUnit = ({
     if (!elementsToRender) {
       return;
     }
-    let svg: SVGSVGElement;
+    const svg = exportToSvg(elementsToRender, {
+      exportBackground: false,
+      viewBackgroundColor: oc.white,
+      shouldAddWatermark: false,
+    });
+    for (const child of ref.current!.children) {
+      if (child.tagName !== "svg") {
+        continue;
+      }
+      ref.current!.removeChild(child);
+    }
+    ref.current!.appendChild(svg);
+
     const current = ref.current!;
-
-    (async () => {
-      svg = await exportToSvg(elementsToRender, {
-        exportBackground: false,
-        viewBackgroundColor: oc.white,
-      });
-      for (const child of ref.current!.children) {
-        if (child.tagName !== "svg") {
-          continue;
-        }
-        current!.removeChild(child);
-      }
-      current!.appendChild(svg);
-    })();
-
     return () => {
-      if (svg) {
-        current.removeChild(svg);
-      }
+      current.removeChild(svg);
     };
   }, [elements, pendingElements]);
 

src/components/LockIcon.tsx

@@ -8,8 +8,10 @@ type LockIconSize = "s" | "m";
 type LockIconProps = {
   title?: string;
   name?: string;
+  id?: string;
   checked: boolean;
   onChange?(): void;
+  size?: LockIconSize;
   zenModeEnabled?: boolean;
 };
 
@@ -39,12 +41,12 @@ const ICONS = {
   ),
 };
 
-export const LockButton = (props: LockIconProps) => {
+export const LockIcon = (props: LockIconProps) => {
   return (
     <label
       className={clsx(
         "ToolIcon ToolIcon__lock ToolIcon_type_floating zen-mode-visibility",
-        `ToolIcon_size_${DEFAULT_SIZE}`,
+        `ToolIcon_size_${props.size || DEFAULT_SIZE}`,
         {
           "zen-mode-visibility--hidden": props.zenModeEnabled,
         },
@@ -55,6 +57,7 @@ export const LockButton = (props: LockIconProps) => {
         className="ToolIcon_type_checkbox"
         type="checkbox"
         name={props.name}
+        id={props.id}
         onChange={props.onChange}
         checked={props.checked}
         aria-label={props.title}

src/components/MobileMenu.tsx

@@ -13,16 +13,14 @@ import { SelectedShapeActions, ShapesSwitcher } from "./Actions";
 import { Section } from "./Section";
 import CollabButton from "./CollabButton";
 import { SCROLLBAR_WIDTH, SCROLLBAR_MARGIN } from "../scene/scrollbars";
-import { LockButton } from "./LockButton";
+import { LockIcon } from "./LockIcon";
 import { UserList } from "./UserList";
 import { BackgroundPickerAndDarkModeToggle } from "./BackgroundPickerAndDarkModeToggle";
-import { LibraryButton } from "./LibraryButton";
 
 type MobileMenuProps = {
   appState: AppState;
   actionManager: ActionManager;
-  renderJSONExportDialog: () => React.ReactNode;
-  renderImageExportDialog: () => React.ReactNode;
+  exportButton: React.ReactNode;
   setAppState: React.Component<any, AppState>["setState"];
   elements: readonly NonDeletedExcalidrawElement[];
   libraryMenu: JSX.Element | null;
@@ -30,7 +28,7 @@ type MobileMenuProps = {
   onLockToggle: () => void;
   canvas: HTMLCanvasElement | null;
   isCollaborating: boolean;
-  renderCustomFooter?: (isMobile: boolean, appState: AppState) => JSX.Element;
+  renderCustomFooter?: (isMobile: boolean) => JSX.Element;
   viewModeEnabled: boolean;
   showThemeBtn: boolean;
 };
@@ -40,8 +38,7 @@ export const MobileMenu = ({
   elements,
   libraryMenu,
   actionManager,
-  renderJSONExportDialog,
-  renderImageExportDialog,
+  exportButton,
   setAppState,
   onCollabButtonClick,
   onLockToggle,
@@ -65,15 +62,15 @@ export const MobileMenu = ({
                       canvas={canvas}
                       elementType={appState.elementType}
                       setAppState={setAppState}
+                      isLibraryOpen={appState.isLibraryOpen}
                     />
                   </Stack.Row>
                 </Island>
-                <LockButton
+                <LockIcon
                   checked={appState.elementLocked}
                   onChange={onLockToggle}
                   title={t("toolBar.lock")}
                 />
-                <LibraryButton appState={appState} setAppState={setAppState} />
               </Stack.Row>
               {libraryMenu}
             </Stack.Col>
@@ -110,17 +107,19 @@ export const MobileMenu = ({
     if (viewModeEnabled) {
       return (
         <>
-          {renderJSONExportDialog()}
-          {renderImageExportDialog()}
+          {actionManager.renderAction("saveScene")}
+          {actionManager.renderAction("saveAsScene")}
+          {exportButton}
         </>
       );
     }
     return (
       <>
-        {actionManager.renderAction("clearCanvas")}
         {actionManager.renderAction("loadScene")}
-        {renderJSONExportDialog()}
-        {renderImageExportDialog()}
+        {actionManager.renderAction("saveScene")}
+        {actionManager.renderAction("saveAsScene")}
+        {exportButton}
+        {actionManager.renderAction("clearCanvas")}
         {onCollabButtonClick && (
           <CollabButton
             isCollaborating={isCollaborating}
@@ -156,7 +155,7 @@ export const MobileMenu = ({
               <div className="panelColumn">
                 <Stack.Col gap={4}>
                   {renderCanvasActions()}
-                  {renderCustomFooter?.(true, appState)}
+                  {renderCustomFooter?.(true)}
                   {appState.collaborators.size > 0 && (
                     <fieldset>
                       <legend>{t("labels.collaborators")}</legend>

src/components/Modal.scss

@@ -26,7 +26,8 @@
     right: 0;
     bottom: 0;
     z-index: 1;
-    background-color: transparentize($oc-black, 0.3);
+    background-color: transparentize($oc-black, 0.7);
+    backdrop-filter: blur(2px);
   }
 
   .Modal__content {
@@ -44,17 +45,14 @@
 
     // for modals, reset blurry bg
     background: var(--island-bg-color);
+    backdrop-filter: none;
 
     border: 1px solid var(--dialog-border-color);
     box-shadow: 0 2px 10px transparentize($oc-black, 0.75);
     border-radius: 6px;
     box-sizing: border-box;
 
-    &:focus {
-      outline: none;
-    }
-
-    @include isMobile {
+    @media #{$is-mobile-query} {
       max-width: 100%;
       border: 0;
       border-radius: 0;
@@ -84,7 +82,7 @@
     }
   }
 
-  @include isMobile {
+  @media #{$is-mobile-query} {
     .Modal {
       padding: 0;
     }

src/components/Modal.tsx

@@ -1,11 +1,9 @@
 import "./Modal.scss";
 
-import React, { useState, useLayoutEffect, useRef } from "react";
+import React, { useState, useLayoutEffect } from "react";
 import { createPortal } from "react-dom";
 import clsx from "clsx";
 import { KEYS } from "../keys";
-import { useExcalidrawContainer, useIsMobile } from "./App";
-import { AppState } from "../types";
 
 export const Modal = (props: {
   className?: string;
@@ -13,10 +11,8 @@ export const Modal = (props: {
   maxWidth?: number;
   onCloseRequest(): void;
   labelledBy: string;
-  theme?: AppState["theme"];
 }) => {
-  const { theme = "light" } = props;
-  const modalRoot = useBodyRoot(theme);
+  const modalRoot = useBodyRoot();
 
   if (!modalRoot) {
     return null;
@@ -25,7 +21,6 @@ export const Modal = (props: {
   const handleKeydown = (event: React.KeyboardEvent) => {
     if (event.key === KEYS.ESCAPE) {
       event.nativeEvent.stopImmediatePropagation();
-      event.stopPropagation();
       props.onCloseRequest();
     }
   };
@@ -42,7 +37,6 @@ export const Modal = (props: {
       <div
         className="Modal__content"
         style={{ "--max-width": `${props.maxWidth}px` }}
-        tabIndex={0}
       >
         {props.children}
       </div>
@@ -51,29 +45,16 @@ export const Modal = (props: {
   );
 };
 
-const useBodyRoot = (theme: AppState["theme"]) => {
+const useBodyRoot = () => {
   const [div, setDiv] = useState<HTMLDivElement | null>(null);
 
-  const isMobile = useIsMobile();
-  const isMobileRef = useRef(isMobile);
-  isMobileRef.current = isMobile;
-
-  const { container: excalidrawContainer } = useExcalidrawContainer();
-
   useLayoutEffect(() => {
-    if (div) {
-      div.classList.toggle("excalidraw--mobile", isMobile);
-    }
-  }, [div, isMobile]);
-
-  useLayoutEffect(() => {
-    const isDarkTheme =
-      !!excalidrawContainer?.classList.contains("theme--dark") ||
-      theme === "dark";
+    const isDarkTheme = !!document
+      .querySelector(".excalidraw")
+      ?.classList.contains("theme--dark");
     const div = document.createElement("div");
 
     div.classList.add("excalidraw", "excalidraw-modal-container");
-    div.classList.toggle("excalidraw--mobile", isMobileRef.current);
 
     if (isDarkTheme) {
       div.classList.add("theme--dark");
@@ -86,7 +67,7 @@ const useBodyRoot = (theme: AppState["theme"]) => {
     return () => {
       document.body.removeChild(div);
     };
-  }, [excalidrawContainer, theme]);
+  }, []);
 
   return div;
 };

src/components/PasteChartDialog.scss

@@ -2,7 +2,7 @@
 
 .excalidraw {
   .PasteChartDialog {
-    @include isMobile {
+    @media #{$is-mobile-query} {
       .Island {
         display: flex;
         flex-direction: column;
@@ -13,7 +13,7 @@
       align-items: center;
       justify-content: space-around;
       flex-wrap: wrap;
-      @include isMobile {
+      @media #{$is-mobile-query} {
         flex-direction: column;
         justify-content: center;
       }

src/components/PasteChartDialog.tsx

@@ -34,21 +34,20 @@ const ChartPreviewBtn = (props: {
       0,
     );
     setChartElements(elements);
-    let svg: SVGSVGElement;
+
+    const svg = exportToSvg(elements, {
+      exportBackground: false,
+      viewBackgroundColor: oc.white,
+      shouldAddWatermark: false,
+    });
+
     const previewNode = previewRef.current!;
 
-    (async () => {
-      svg = await exportToSvg(elements, {
-        exportBackground: false,
-        viewBackgroundColor: oc.white,
-      });
+    previewNode.appendChild(svg);
 
-      previewNode.appendChild(svg);
-
-      if (props.selected) {
-        (previewNode.parentNode as HTMLDivElement).focus();
-      }
-    })();
+    if (props.selected) {
+      (previewNode.parentNode as HTMLDivElement).focus();
+    }
 
     return () => {
       previewNode.removeChild(svg);

src/components/ProjectName.scss

@@ -1,25 +0,0 @@
-.ProjectName {
-  margin: auto;
-  display: flex;
-  align-items: center;
-
-  .TextInput {
-    height: calc(1rem - 3px);
-    width: 200px;
-    overflow: hidden;
-    text-align: center;
-    margin-left: 8px;
-    text-overflow: ellipsis;
-
-    &--readonly {
-      background: none;
-      border: none;
-      &:hover {
-        background: none;
-      }
-      width: auto;
-      max-width: 200px;
-      padding-left: 2px;
-    }
-  }
-}

src/components/ProjectName.tsx

@@ -1,10 +1,6 @@
 import "./TextInput.scss";
 
-import React, { useState } from "react";
-import { focusNearestParent } from "../utils";
-
-import "./ProjectName.scss";
-import { useExcalidrawContainer } from "./App";
+import React, { Component } from "react";
 
 type Props = {
   value: string;
@@ -13,19 +9,21 @@ type Props = {
   isNameEditable: boolean;
 };
 
-export const ProjectName = (props: Props) => {
-  const { id } = useExcalidrawContainer();
-  const [fileName, setFileName] = useState<string>(props.value);
-
-  const handleBlur = (event: any) => {
-    focusNearestParent(event.target);
+type State = {
+  fileName: string;
+};
+export class ProjectName extends Component<Props, State> {
+  state = {
+    fileName: this.props.value,
+  };
+  private handleBlur = (event: any) => {
     const value = event.target.value;
-    if (value !== props.value) {
-      props.onChange(value);
+    if (value !== this.props.value) {
+      this.props.onChange(value);
     }
   };
 
-  const handleKeyDown = (event: React.KeyboardEvent<HTMLElement>) => {
+  private handleKeyDown = (event: React.KeyboardEvent<HTMLElement>) => {
     if (event.key === "Enter") {
       event.preventDefault();
       if (event.nativeEvent.isComposing || event.keyCode === 229) {
@@ -35,25 +33,29 @@ export const ProjectName = (props: Props) => {
     }
   };
 
-  return (
-    <div className="ProjectName">
-      <label className="ProjectName-label" htmlFor="filename">
-        {`${props.label}${props.isNameEditable ? "" : ":"}`}
-      </label>
-      {props.isNameEditable ? (
-        <input
-          className="TextInput"
-          onBlur={handleBlur}
-          onKeyDown={handleKeyDown}
-          id={`${id}-filename`}
-          value={fileName}
-          onChange={(event) => setFileName(event.target.value)}
-        />
-      ) : (
-        <span className="TextInput TextInput--readonly" id={`${id}-filename`}>
-          {props.value}
-        </span>
-      )}
-    </div>
-  );
-};
+  public render() {
+    return (
+      <>
+        <label htmlFor="file-name">
+          {`${this.props.label}${this.props.isNameEditable ? "" : ":"}`}
+        </label>
+        {this.props.isNameEditable ? (
+          <input
+            className="TextInput"
+            onBlur={this.handleBlur}
+            onKeyDown={this.handleKeyDown}
+            id="file-name"
+            value={this.state.fileName}
+            onChange={(event) =>
+              this.setState({ fileName: event.target.value })
+            }
+          />
+        ) : (
+          <span className="TextInput TextInput--readonly" id="file-name">
+            {this.props.value}
+          </span>
+        )}
+      </>
+    );
+  }
+}

src/components/Section.tsx

@@ -1,6 +1,5 @@
 import React from "react";
 import { t } from "../i18n";
-import { useExcalidrawContainer } from "./App";
 
 interface SectionProps extends React.HTMLProps<HTMLElement> {
   heading: string;
@@ -8,14 +7,13 @@ interface SectionProps extends React.HTMLProps<HTMLElement> {
 }
 
 export const Section = ({ heading, children, ...props }: SectionProps) => {
-  const { id } = useExcalidrawContainer();
   const header = (
-    <h2 className="visually-hidden" id={`${id}-${heading}-title`}>
+    <h2 className="visually-hidden" id={`${heading}-title`}>
       {t(`headings.${heading}`)}
     </h2>
   );
   return (
-    <section {...props} aria-labelledby={`${id}-${heading}-title`}>
+    <section {...props} aria-labelledby={`${heading}-title`}>
       {typeof children === "function" ? (
         children(header)
       ) : (

src/components/Stats.scss

@@ -6,7 +6,7 @@
     top: 64px;
     right: 12px;
     font-size: 12px;
-    z-index: 10;
+    z-index: 999;
 
     h3 {
       margin: 0 24px 8px 0;

src/components/Stats.tsx

@@ -2,7 +2,7 @@ import React from "react";
 import { getCommonBounds } from "../element/bounds";
 import { NonDeletedExcalidrawElement } from "../element/types";
 import { t } from "../i18n";
-import { useIsMobile } from "../components/App";
+import { useIsMobile } from "../is-mobile";
 import { getTargetElements } from "../scene";
 import { AppState, ExcalidrawProps } from "../types";
 import { close } from "./icons";

src/components/Toast.scss

@@ -10,7 +10,7 @@
     cursor: default;
     left: 50%;
     margin-left: -150px;
-    padding: 4px 0;
+    padding: 8px;
     position: absolute;
     text-align: center;
     width: 300px;

src/components/ToolButton.tsx

@@ -2,7 +2,6 @@ import "./ToolIcon.scss";
 
 import React from "react";
 import clsx from "clsx";
-import { useExcalidrawContainer } from "./App";
 
 type ToolIconSize = "s" | "m";
 
@@ -30,13 +29,9 @@ type ToolButtonProps =
       children?: React.ReactNode;
       onClick?(): void;
     })
-  | (ToolButtonBaseProps & {
-      type: "icon";
-      children?: React.ReactNode;
-      onClick?(): void;
-    })
   | (ToolButtonBaseProps & {
       type: "radio";
+
       checked: boolean;
       onChange?(): void;
     });
@@ -44,12 +39,11 @@ type ToolButtonProps =
 const DEFAULT_SIZE: ToolIconSize = "m";
 
 export const ToolButton = React.forwardRef((props: ToolButtonProps, ref) => {
-  const { id: excalId } = useExcalidrawContainer();
   const innerRef = React.useRef(null);
   React.useImperativeHandle(ref, () => innerRef.current);
   const sizeCn = `ToolIcon_size_${props.size || DEFAULT_SIZE}`;
 
-  if (props.type === "button" || props.type === "icon") {
+  if (props.type === "button") {
     return (
       <button
         className={clsx(
@@ -62,7 +56,6 @@ export const ToolButton = React.forwardRef((props: ToolButtonProps, ref) => {
           {
             ToolIcon: !props.hidden,
             "ToolIcon--selected": props.selected,
-            "ToolIcon--plain": props.type === "icon",
           },
         )}
         data-testid={props["data-testid"]}
@@ -73,16 +66,14 @@ export const ToolButton = React.forwardRef((props: ToolButtonProps, ref) => {
         onClick={props.onClick}
         ref={innerRef}
       >
-        {(props.icon || props.label) && (
-          <div className="ToolIcon__icon" aria-hidden="true">
-            {props.icon || props.label}
-            {props.keyBindingLabel && (
-              <span className="ToolIcon__keybinding">
-                {props.keyBindingLabel}
-              </span>
-            )}
-          </div>
-        )}
+        <div className="ToolIcon__icon" aria-hidden="true">
+          {props.icon || props.label}
+          {props.keyBindingLabel && (
+            <span className="ToolIcon__keybinding">
+              {props.keyBindingLabel}
+            </span>
+          )}
+        </div>
         {props.showAriaLabel && (
           <div className="ToolIcon__label">{props["aria-label"]}</div>
         )}
@@ -100,7 +91,7 @@ export const ToolButton = React.forwardRef((props: ToolButtonProps, ref) => {
         aria-label={props["aria-label"]}
         aria-keyshortcuts={props["aria-keyshortcuts"]}
         data-testid={props["data-testid"]}
-        id={`${excalId}-${props.id}`}
+        id={props.id}
         onChange={props.onChange}
         checked={props.checked}
         ref={innerRef}

src/components/ToolIcon.scss

@@ -8,26 +8,9 @@
     position: relative;
     font-family: Cascadia;
     cursor: pointer;
+    background-color: var(--button-gray-1);
     -webkit-tap-highlight-color: transparent;
     border-radius: var(--space-factor);
-    user-select: none;
-
-    background-color: var(--button-gray-1);
-
-    &:hover {
-      background-color: var(--button-gray-2);
-    }
-    &:active {
-      background-color: var(--button-gray-3);
-    }
-  }
-
-  .ToolIcon--plain {
-    background-color: transparent;
-    .ToolIcon__icon {
-      width: 2rem;
-      height: 2rem;
-    }
   }
 
   .ToolIcon__icon {
@@ -74,6 +57,14 @@
     margin: 0;
     font-size: inherit;
 
+    &:hover {
+      background-color: var(--button-gray-1);
+    }
+
+    &:active {
+      background-color: var(--button-gray-2);
+    }
+
     &:focus {
       box-shadow: 0 0 0 2px var(--focus-highlight-color);
     }
@@ -86,14 +77,6 @@
       }
     }
 
-    &:hover {
-      background-color: var(--button-gray-2);
-    }
-
-    &:active {
-      background-color: var(--button-gray-3);
-    }
-
     &--show {
       visibility: visible;
     }
@@ -111,9 +94,6 @@
 
     &:not(.ToolIcon_toggle_opaque):checked + .ToolIcon__icon {
       background-color: var(--button-gray-2);
-      &:active {
-        background-color: var(--button-gray-3);
-      }
     }
 
     &:focus + .ToolIcon__icon {
@@ -141,21 +121,12 @@
     }
 
     .ToolIcon__icon {
-      background-color: var(--button-gray-1);
-      &:hover {
-        background-color: var(--button-gray-2);
-      }
-      &:active {
-        background-color: var(--button-gray-3);
-      }
-
       width: 2rem;
       height: 2em;
     }
   }
 
   .ToolIcon.ToolIcon__lock {
-    margin-inline-end: var(--space-factor);
     &.ToolIcon_type_floating {
       margin-left: 0.1rem;
     }
@@ -186,9 +157,10 @@
   // move the lock button out of the way on small viewports
   // it begins to collide with the GitHub icon before we switch to mobile mode
   @media (max-width: 760px) {
-    .ToolIcon.ToolIcon_type_floating {
+    .ToolIcon.ToolIcon__lock {
       display: inline-block;
       position: absolute;
+      top: 60px;
       right: -8px;
 
       margin-left: 0;
@@ -213,13 +185,16 @@
         position: static;
       }
     }
-    .ToolIcon.ToolIcon__library {
-      top: 100px;
-    }
+  }
 
-    .ToolIcon.ToolIcon__lock {
-      margin-inline-end: 0;
-      top: 60px;
+  .TooltipIcon {
+    width: 0.9em;
+    height: 0.9em;
+    margin-left: 5px;
+    margin-top: 1px;
+
+    @media #{$is-mobile-query} {
+      display: none;
     }
   }
 

src/components/Tooltip.scss

@@ -1,39 +1,58 @@
 @import "../css/variables.module";
-.excalidraw-tooltip {
-  position: absolute;
-  z-index: 1000;
-
-  padding: 8px;
-  border-radius: 6px;
-  box-sizing: border-box;
-  pointer-events: none;
-  word-wrap: break-word;
-
-  background: $oc-black;
-
-  line-height: 1.5;
-  text-align: center;
-  font-size: 13px;
-  font-weight: 500;
-  color: $oc-white;
-
-  display: none;
-
-  &.excalidraw-tooltip--visible {
-    display: block;
-  }
-}
-
 .excalidraw {
-  .Tooltip-icon {
-    width: 0.9em;
-    height: 0.9em;
-    margin-left: 5px;
-    margin-top: 1px;
-    display: flex;
+  .Tooltip {
+    position: relative;
+  }
 
-    @include isMobile {
-      display: none;
+  .Tooltip__label {
+    --arrow-size: 4px;
+    visibility: hidden;
+    background: $oc-black;
+    color: $oc-white;
+    text-align: center;
+    border-radius: 6px;
+    padding: 8px;
+    position: absolute;
+    z-index: 10;
+    font-size: 13px;
+    line-height: 1.5;
+    font-weight: 500;
+    // extra pixel offset for unknown reasons
+    left: calc(50% + var(--arrow-size) / 2 - 1px);
+    transform: translateX(-50%);
+    word-wrap: break-word;
+
+    &::after {
+      content: "";
+      border: var(--arrow-size) solid transparent;
+      position: absolute;
+      left: calc(50% - var(--arrow-size));
+    }
+
+    &--above {
+      bottom: calc(100% + var(--arrow-size) + 3px);
+
+      &::after {
+        border-top-color: $oc-black;
+        top: 100%;
+      }
+    }
+
+    &--below {
+      top: calc(100% + var(--arrow-size) + 3px);
+
+      &::after {
+        border-bottom-color: $oc-black;
+        bottom: 100%;
+      }
     }
   }
+
+  .Tooltip:hover .Tooltip__label {
+    visibility: visible;
+  }
+
+  .Tooltip__label:hover {
+    visibility: visible;
+  }
 }

src/components/Tooltip.tsx

@@ -1,92 +1,31 @@
 import "./Tooltip.scss";
 
-import React, { useEffect } from "react";
-
-const getTooltipDiv = () => {
-  const existingDiv = document.querySelector<HTMLDivElement>(
-    ".excalidraw-tooltip",
-  );
-  if (existingDiv) {
-    return existingDiv;
-  }
-  const div = document.createElement("div");
-  document.body.appendChild(div);
-  div.classList.add("excalidraw-tooltip");
-  return div;
-};
-
-const updateTooltip = (
-  item: HTMLDivElement,
-  tooltip: HTMLDivElement,
-  label: string,
-  long: boolean,
-) => {
-  tooltip.classList.add("excalidraw-tooltip--visible");
-  tooltip.style.minWidth = long ? "50ch" : "10ch";
-  tooltip.style.maxWidth = long ? "50ch" : "15ch";
-
-  tooltip.textContent = label;
-
-  const {
-    x: itemX,
-    bottom: itemBottom,
-    top: itemTop,
-    width: itemWidth,
-  } = item.getBoundingClientRect();
-
-  const {
-    width: labelWidth,
-    height: labelHeight,
-  } = tooltip.getBoundingClientRect();
-
-  const viewportWidth = window.innerWidth;
-  const viewportHeight = window.innerHeight;
-
-  const margin = 5;
-
-  const left = itemX + itemWidth / 2 - labelWidth / 2;
-  const offsetLeft =
-    left + labelWidth >= viewportWidth ? left + labelWidth - viewportWidth : 0;
-
-  const top = itemBottom + margin;
-  const offsetTop =
-    top + labelHeight >= viewportHeight
-      ? itemBottom - itemTop + labelHeight + margin * 2
-      : 0;
-
-  Object.assign(tooltip.style, {
-    top: `${top - offsetTop}px`,
-    left: `${left - offsetLeft}px`,
-  });
-};
+import React from "react";
 
 type TooltipProps = {
   children: React.ReactNode;
   label: string;
+  position?: "above" | "below";
   long?: boolean;
 };
 
-export const Tooltip = ({ children, label, long = false }: TooltipProps) => {
-  useEffect(() => {
-    return () =>
-      getTooltipDiv().classList.remove("excalidraw-tooltip--visible");
-  }, []);
-
-  return (
-    <div
-      onPointerEnter={(event) =>
-        updateTooltip(
-          event.currentTarget as HTMLDivElement,
-          getTooltipDiv(),
-          label,
-          long,
-        )
-      }
-      onPointerLeave={() =>
-        getTooltipDiv().classList.remove("excalidraw-tooltip--visible")
+export const Tooltip = ({
+  children,
+  label,
+  position = "below",
+  long = false,
+}: TooltipProps) => (
+  <div className="Tooltip">
+    <span
+      className={
+        position === "above"
+          ? "Tooltip__label Tooltip__label--above"
+          : "Tooltip__label Tooltip__label--below"
       }
+      style={{ width: long ? "50ch" : "10ch" }}
     >
-      {children}
-    </div>
-  );
-};
+      {label}
+    </span>
+    {children}
+  </div>
+);

src/components/UserList.scss

@@ -2,8 +2,7 @@
   .UserList {
     pointer-events: none;
     /*github corner*/
-    padding: var(--space-factor) var(--space-factor) var(--space-factor)
-      var(--space-factor);
+    padding: var(--space-factor) 40px var(--space-factor) var(--space-factor);
     display: flex;
     flex-wrap: wrap;
     justify-content: flex-end;

src/components/icons.tsx

@@ -24,10 +24,7 @@ type Opts = {
   mirror?: true;
 } & React.SVGProps<SVGSVGElement>;
 
-export const createIcon = (
-  d: string | React.ReactNode,
-  opts: number | Opts = 512,
-) => {
+const createIcon = (d: string | React.ReactNode, opts: number | Opts = 512) => {
   const { width = 512, height = width, mirror, style } =
     typeof opts === "number" ? ({ width: opts } as Opts) : opts;
   return (
@@ -44,14 +41,6 @@ export const createIcon = (
   );
 };
 
-export const checkIcon = createIcon(
-  <polyline fill="none" stroke="currentColor" points="20 6 9 17 4 12" />,
-  {
-    width: 24,
-    height: 24,
-  },
-);
-
 export const link = createIcon(
   "M326.612 185.391c59.747 59.809 58.927 155.698.36 214.59-.11.12-.24.25-.36.37l-67.2 67.2c-59.27 59.27-155.699 59.262-214.96 0-59.27-59.26-59.27-155.7 0-214.96l37.106-37.106c9.84-9.84 26.786-3.3 27.294 10.606.648 17.722 3.826 35.527 9.69 52.721 1.986 5.822.567 12.262-3.783 16.612l-13.087 13.087c-28.026 28.026-28.905 73.66-1.155 101.96 28.024 28.579 74.086 28.749 102.325.51l67.2-67.19c28.191-28.191 28.073-73.757 0-101.83-3.701-3.694-7.429-6.564-10.341-8.569a16.037 16.037 0 0 1-6.947-12.606c-.396-10.567 3.348-21.456 11.698-29.806l21.054-21.055c5.521-5.521 14.182-6.199 20.584-1.731a152.482 152.482 0 0 1 20.522 17.197zM467.547 44.449c-59.261-59.262-155.69-59.27-214.96 0l-67.2 67.2c-.12.12-.25.25-.36.37-58.566 58.892-59.387 154.781.36 214.59a152.454 152.454 0 0 0 20.521 17.196c6.402 4.468 15.064 3.789 20.584-1.731l21.054-21.055c8.35-8.35 12.094-19.239 11.698-29.806a16.037 16.037 0 0 0-6.947-12.606c-2.912-2.005-6.64-4.875-10.341-8.569-28.073-28.073-28.191-73.639 0-101.83l67.2-67.19c28.239-28.239 74.3-28.069 102.325.51 27.75 28.3 26.872 73.934-1.155 101.96l-13.087 13.087c-4.35 4.35-5.769 10.79-3.783 16.612 5.864 17.194 9.042 34.999 9.69 52.721.509 13.906 17.454 20.446 27.294 10.606l37.106-37.106c59.271-59.259 59.271-155.699.001-214.959z",
   { mirror: true },
@@ -91,19 +80,6 @@ export const exportFile = createIcon(
   { width: 576, height: 512, mirror: true },
 );
 
-export const exportImage = createIcon(
-  <>
-    <path d="M571 308l-95.7-96.4c-10.1-10.1-27.4-3-27.4 11.3V288h-64v64h64v65.2c0 14.3 17.3 21.4 27.4 11.3L571 332c6.6-6.6 6.6-17.4 0-24zm-187 44v-64 64z" />
-    <path d="M384 121.941V128H256V0h6.059c6.362 0 12.471 2.53 16.97 7.029l97.941 97.941a24.01 24.01 0 017.03 16.971zM248 160c-13.2 0-24-10.8-24-24V0H24C10.745 0 0 10.745 0 24v464c0 13.255 10.745 24 24 24h336c13.255 0 24-10.745 24-24V160H248zm-135.455 16c26.51 0 48 21.49 48 48s-21.49 48-48 48-48-21.49-48-48 21.491-48 48-48zm208 240h-256l.485-48.485L104.545 328c4.686-4.686 11.799-4.201 16.485.485L160.545 368 264.06 264.485c4.686-4.686 12.284-4.686 16.971 0L320.545 304v112z" />
-  </>,
-  { width: 576, height: 512, mirror: true },
-);
-
-export const exportToFileIcon = createIcon(
-  "M216 0h80c13.3 0 24 10.7 24 24v168h87.7c17.8 0 26.7 21.5 14.1 34.1L269.7 378.3c-7.5 7.5-19.8 7.5-27.3 0L90.1 226.1c-12.6-12.6-3.7-34.1 14.1-34.1H192V24c0-13.3 10.7-24 24-24zm296 376v112c0 13.3-10.7 24-24 24H24c-13.3 0-24-10.7-24-24V376c0-13.3 10.7-24 24-24h146.7l49 49c20.1 20.1 52.5 20.1 72.6 0l49-49H488c13.3 0 24 10.7 24 24zm-124 88c0-11-9-20-20-20s-20 9-20 20 9 20 20 20 20-9 20-20zm64 0c0-11-9-20-20-20s-20 9-20 20 9 20 20 20 20-9 20-20z",
-  { width: 512, height: 512 },
-);
-
 export const zoomIn = createIcon(
   "M416 208H272V64c0-17.67-14.33-32-32-32h-32c-17.67 0-32 14.33-32 32v144H32c-17.67 0-32 14.33-32 32v32c0 17.67 14.33 32 32 32h144v144c0 17.67 14.33 32 32 32h32c17.67 0 32-14.33 32-32V304h144c17.67 0 32-14.33 32-32v-32c0-17.67-14.33-32-32-32z",
   { width: 448, height: 512 },
@@ -246,12 +222,14 @@ export const SendToBackIcon = React.memo(
           d="M18 7.333C18 6.597 17.403 6 16.667 6H7.333C6.597 6 6 6.597 6 7.333v9.334C6 17.403 6.597 18 7.333 18h9.334c.736 0 1.333-.597 1.333-1.333V7.333z"
           fill={activeElementColor(theme)}
           stroke={activeElementColor(theme)}
+          strokeLinejoin="round"
           strokeWidth="2"
         />
         <path
           d="M11 3a1 1 0 00-1-1H3a1 1 0 00-1 1v7a1 1 0 001 1h8V3zM22 14a1 1 0 00-1-1h-7a1 1 0 00-1 1v7a1 1 0 001 1h8v-8z"
           fill={iconFillColor(theme)}
           stroke={iconFillColor(theme)}
+          strokeLinejoin="round"
           strokeWidth="2"
         />
       </>,
@@ -357,6 +335,7 @@ export const DistributeHorizontallyIcon = React.memo(
   ({ theme }: { theme: "light" | "dark" }) =>
     createIcon(
       <>
+        <path d="M5 5V19Z" fill="black" />
         <path
           d="M19 5V19M5 5V19"
           stroke={iconFillColor(theme)}
@@ -374,6 +353,14 @@ export const DistributeHorizontallyIcon = React.memo(
     ),
 );
 
+<svg
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  xmlns="http://www.w3.org/2000/svg"
+></svg>;
+
 export const DistributeVerticallyIcon = React.memo(
   ({ theme }: { theme: "light" | "dark" }) =>
     createIcon(
@@ -477,11 +464,6 @@ export const shield = createIcon(
   { width: 24 },
 );
 
-export const file = createIcon(
-  "M369.9 97.9L286 14C277 5 264.8-.1 252.1-.1H48C21.5 0 0 21.5 0 48v416c0 26.5 21.5 48 48 48h288c26.5 0 48-21.5 48-48V131.9c0-12.7-5.1-25-14.1-34zM332.1 128H256V51.9l76.1 76.1zM48 464V48h160v104c0 13.3 10.7 24 24 24h104v288H48zm32-48h224V288l-23.5-23.5c-4.7-4.7-12.3-4.7-17 0L176 352l-39.5-39.5c-4.7-4.7-12.3-4.7-17 0L80 352v64zm48-240c-26.5 0-48 21.5-48 48s21.5 48 48 48 48-21.5 48-48-21.5-48-48-48z",
-  { width: 384, height: 512 },
-);
-
 export const GroupIcon = React.memo(({ theme }: { theme: "light" | "dark" }) =>
   createIcon(
     <>
@@ -497,16 +479,42 @@ export const GroupIcon = React.memo(({ theme }: { theme: "light" | "dark" }) =>
         stroke={iconFillColor(theme)}
         strokeWidth="2"
       />
-      <g
+      <rect
+        x="2.5"
+        y="2.5"
+        width="30"
+        height="30"
         fill={handlerColor(theme)}
         stroke={iconFillColor(theme)}
         strokeWidth="6"
-      >
-        <rect x="2.5" y="2.5" width="30" height="30" />
-        <rect x="2.5" y="149.5" width="30" height="30" />
-        <rect x="147.5" y="149.5" width="30" height="30" />
-        <rect x="147.5" y="2.5" width="30" height="30" />
-      </g>
+      />
+      <rect
+        x="2.5"
+        y="149.5"
+        width="30"
+        height="30"
+        fill={handlerColor(theme)}
+        stroke={iconFillColor(theme)}
+        strokeWidth="6"
+      />
+      <rect
+        x="147.5"
+        y="149.5"
+        width="30"
+        height="30"
+        fill={handlerColor(theme)}
+        stroke={iconFillColor(theme)}
+        strokeWidth="6"
+      />
+      <rect
+        x="147.5"
+        y="2.5"
+        width="30"
+        height="30"
+        fill={handlerColor(theme)}
+        stroke={iconFillColor(theme)}
+        strokeWidth="6"
+      />
     </>,
     { width: 182, height: 182, mirror: true },
   ),
@@ -528,18 +536,60 @@ export const UngroupIcon = React.memo(
           stroke={iconFillColor(theme)}
           strokeWidth="2"
         />
-        <g
+        <rect
+          x="2.5"
+          y="2.5"
+          width="30"
+          height="30"
           fill={handlerColor(theme)}
           stroke={iconFillColor(theme)}
           strokeWidth="6"
-        >
-          <rect x="2.5" y="2.5" width="30" height="30" />
-          <rect x="78.5" y="149.5" width="30" height="30" />
-          <rect x="147.5" y="149.5" width="30" height="30" />
-          <rect x="147.5" y="78.5" width="30" height="30" />
-          <rect x="105.5" y="2.5" width="30" height="30" />
-          <rect x="2.5" y="102.5" width="30" height="30" />
-        </g>
+        />
+        <rect
+          x="78.5"
+          y="149.5"
+          width="30"
+          height="30"
+          fill={handlerColor(theme)}
+          stroke={iconFillColor(theme)}
+          strokeWidth="6"
+        />
+        <rect
+          x="147.5"
+          y="149.5"
+          width="30"
+          height="30"
+          fill={handlerColor(theme)}
+          stroke={iconFillColor(theme)}
+          strokeWidth="6"
+        />
+        <rect
+          x="147.5"
+          y="78.5"
+          width="30"
+          height="30"
+          fill={handlerColor(theme)}
+          stroke={iconFillColor(theme)}
+          strokeWidth="6"
+        />
+        <rect
+          x="105.5"
+          y="2.5"
+          width="30"
+          height="30"
+          fill={handlerColor(theme)}
+          stroke={iconFillColor(theme)}
+          strokeWidth="6"
+        />
+        <rect
+          x="2.5"
+          y="102.5"
+          width="30"
+          height="30"
+          fill={handlerColor(theme)}
+          stroke={iconFillColor(theme)}
+          strokeWidth="6"
+        />
       </>,
       { width: 182, height: 182, mirror: true },
     ),
@@ -581,10 +631,9 @@ export const StrokeWidthIcon = React.memo(
   ({ theme, strokeWidth }: { theme: "light" | "dark"; strokeWidth: number }) =>
     createIcon(
       <path
-        d="M6 10H32"
+        d="M6 10H34"
         stroke={iconFillColor(theme)}
         strokeWidth={strokeWidth}
-        strokeLinecap="round"
         fill="none"
       />,
       { width: 40, height: 20 },
@@ -599,7 +648,6 @@ export const StrokeStyleSolidIcon = React.memo(
         stroke={iconFillColor(theme)}
         strokeWidth={2}
         fill="none"
-        strokeLinecap="round"
       />,
       {
         width: 40,
@@ -617,7 +665,6 @@ export const StrokeStyleDashedIcon = React.memo(
         strokeWidth={2.5}
         strokeDasharray={"10, 8"}
         fill="none"
-        strokeLinecap="round"
       />,
       { width: 40, height: 20 },
     ),
@@ -627,12 +674,11 @@ export const StrokeStyleDottedIcon = React.memo(
   ({ theme }: { theme: "light" | "dark" }) =>
     createIcon(
       <path
-        d="M6 10H36"
+        d="M6 10H34"
         stroke={iconFillColor(theme)}
         strokeWidth={2.5}
-        strokeDasharray={"2, 4.5"}
+        strokeDasharray={"4, 4"}
         fill="none"
-        strokeLinecap="round"
       />,
       { width: 40, height: 20 },
     ),
@@ -645,7 +691,6 @@ export const SloppinessArchitectIcon = React.memo(
         d="M3.00098 16.1691C6.28774 13.9744 19.6399 2.8905 22.7215 3.00082C25.8041 3.11113 19.1158 15.5488 21.4962 16.8309C23.8757 18.1131 34.4155 11.7148 37.0001 10.6919"
         stroke={iconFillColor(theme)}
         strokeWidth={2}
-        strokeLinecap="round"
         fill="none"
       />,
       { width: 40, height: 20, mirror: true },
@@ -659,7 +704,6 @@ export const SloppinessArtistIcon = React.memo(
         d="M3 17C6.68158 14.8752 16.1296 9.09849 22.0648 6.54922C28 3.99995 22.2896 13.3209 25 14C27.7104 14.6791 36.3757 9.6471 36.3757 9.6471M6.40706 15C13 11.1918 20.0468 1.51045 23.0234 3.0052C26 4.49995 20.457 12.8659 22.7285 16.4329C25 20 36.3757 13 36.3757 13"
         stroke={iconFillColor(theme)}
         strokeWidth={2}
-        strokeLinecap="round"
         fill="none"
       />,
       { width: 40, height: 20, mirror: true },
@@ -673,7 +717,6 @@ export const SloppinessCartoonistIcon = React.memo(
         d="M3 15.6468C6.93692 13.5378 22.5544 2.81528 26.6206 3.00242C30.6877 3.18956 25.6708 15.3346 27.4009 16.7705C29.1309 18.2055 35.4001 12.4762 37 11.6177M3.97143 10.4917C6.61158 9.24563 16.3706 2.61886 19.8104 3.01724C23.2522 3.41472 22.0773 12.2013 24.6181 12.8783C27.1598 13.5536 33.3179 8.04068 35.0571 7.07244"
         stroke={iconFillColor(theme)}
         strokeWidth={2}
-        strokeLinecap="round"
         fill="none"
       />,
       { width: 40, height: 20, mirror: true },
@@ -687,7 +730,6 @@ export const EdgeSharpIcon = React.memo(
         d="M10 17L10 5L35 5"
         stroke={iconFillColor(theme)}
         strokeWidth={2}
-        strokeLinecap="round"
         fill="none"
       />,
       { width: 40, height: 20, mirror: true },
@@ -701,7 +743,6 @@ export const EdgeRoundIcon = React.memo(
         d="M10 17V15C10 8 13 5 21 5L33.5 5"
         stroke={iconFillColor(theme)}
         strokeWidth={2}
-        strokeLinecap="round"
         fill="none"
       />,
       { width: 40, height: 20, mirror: true },
@@ -861,7 +902,6 @@ export const TextAlignLeftIcon = React.memo(
       <path
         d="M12.83 352h262.34A12.82 12.82 0 00288 339.17v-38.34A12.82 12.82 0 00275.17 288H12.83A12.82 12.82 0 000 300.83v38.34A12.82 12.82 0 0012.83 352zm0-256h262.34A12.82 12.82 0 00288 83.17V44.83A12.82 12.82 0 00275.17 32H12.83A12.82 12.82 0 000 44.83v38.34A12.82 12.82 0 0012.83 96zM432 160H16a16 16 0 00-16 16v32a16 16 0 0016 16h416a16 16 0 0016-16v-32a16 16 0 00-16-16zm0 256H16a16 16 0 00-16 16v32a16 16 0 0016 16h416a16 16 0 0016-16v-32a16 16 0 00-16-16z"
         fill={iconFillColor(theme)}
-        strokeLinecap="round"
       />,
       { width: 448, height: 512 },
     ),
@@ -884,7 +924,6 @@ export const TextAlignRightIcon = React.memo(
       <path
         d="M16 224h416a16 16 0 0016-16v-32a16 16 0 00-16-16H16a16 16 0 00-16 16v32a16 16 0 0016 16zm416 192H16a16 16 0 00-16 16v32a16 16 0 0016 16h416a16 16 0 0016-16v-32a16 16 0 00-16-16zm3.17-384H172.83A12.82 12.82 0 00160 44.83v38.34A12.82 12.82 0 00172.83 96h262.34A12.82 12.82 0 00448 83.17V44.83A12.82 12.82 0 00435.17 32zm0 256H172.83A12.82 12.82 0 00160 300.83v38.34A12.82 12.82 0 00172.83 352h262.34A12.82 12.82 0 00448 339.17v-38.34A12.82 12.82 0 00435.17 288z"
         fill={iconFillColor(theme)}
-        strokeLinecap="round"
       />,
       { width: 448, height: 512 },
     ),

src/constants.ts

@@ -1,6 +1,6 @@
+import { FontFamily } from "./element/types";
 import cssVariables from "./css/variables.module.scss";
 import { AppProps } from "./types";
-import { FontFamilyValues } from "./element/types";
 
 export const APP_NAME = "Excalidraw";
 
@@ -14,7 +14,6 @@ export const CURSOR_TYPE = {
   TEXT: "text",
   CROSSHAIR: "crosshair",
   GRABBING: "grabbing",
-  GRAB: "grab",
   POINTER: "pointer",
   MOVE: "move",
   AUTO: "",
@@ -64,15 +63,15 @@ export const CLASSES = {
 
 // 1-based in case we ever do `if(element.fontFamily)`
 export const FONT_FAMILY = {
-  Virgil: 1,
-  Helvetica: 2,
-  Cascadia: 3,
-};
+  1: "Virgil",
+  2: "Helvetica",
+  3: "Cascadia",
+} as const;
 
 export const WINDOWS_EMOJI_FALLBACK_FONT = "Segoe UI Emoji";
 
 export const DEFAULT_FONT_SIZE = 20;
-export const DEFAULT_FONT_FAMILY: FontFamilyValues = FONT_FAMILY.Virgil;
+export const DEFAULT_FONT_FAMILY: FontFamily = 1;
 export const DEFAULT_TEXT_ALIGN = "left";
 export const DEFAULT_VERTICAL_ALIGN = "top";
 export const DEFAULT_VERSION = "{version}";
@@ -92,8 +91,6 @@ export const EXPORT_DATA_TYPES = {
   excalidrawLibrary: "excalidrawlib",
 } as const;
 
-export const EXPORT_SOURCE = window.location.origin;
-
 export const STORAGE_KEYS = {
   LOCAL_STORAGE_LIBRARY: "excalidraw-library",
 } as const;
@@ -104,7 +101,9 @@ export const TOUCH_CTX_MENU_TIMEOUT = 500;
 export const TITLE_TIMEOUT = 10000;
 export const TOAST_TIMEOUT = 5000;
 export const VERSION_TIMEOUT = 30000;
+export const AUTO_SAVE_TIMEOUT = 500;
 export const SCROLL_TIMEOUT = 100;
+
 export const ZOOM_STEP = 0.1;
 
 // Report a user inactive after IDLE_THRESHOLD milliseconds
@@ -132,19 +131,10 @@ export const DEFAULT_UI_OPTIONS: AppProps["UIOptions"] = {
   canvasActions: {
     changeViewBackgroundColor: true,
     clearCanvas: true,
-    export: { saveFileToDisk: true },
+    export: true,
     loadScene: true,
-    saveToActiveFile: true,
+    saveAsScene: true,
+    saveScene: true,
     theme: true,
-    saveAsImage: true,
   },
 };
-
-export const MQ_MAX_WIDTH_PORTRAIT = 730;
-export const MQ_MAX_WIDTH_LANDSCAPE = 1000;
-export const MQ_MAX_HEIGHT_LANDSCAPE = 500;
-
-export const MAX_DECIMALS_FOR_SVG_EXPORT = 2;
-
-export const EXPORT_SCALES = [1, 2, 3];
-export const DEFAULT_EXPORT_PADDING = 10; // px

src/css/app.scss

@@ -5,7 +5,6 @@
   overflow: hidden;
   clip: rect(1px, 1px, 1px, 1px);
   white-space: nowrap; /* added line */
-  user-select: none;
 }
 
 .LoadingMessage {

src/css/styles.scss

@@ -19,10 +19,6 @@
   height: 100%;
   width: 100%;
 
-  &:focus {
-    outline: none;
-  }
-
   // serves 2 purposes:
   // 1. prevent selecting text outside the component when double-clicking or
   //    dragging inside it (e.g. on canvas)
@@ -51,12 +47,11 @@
     image-rendering: -moz-crisp-edges; // FF
 
     z-index: var(--zIndex-canvas);
-
-    // Remove the main canvas from document flow to avoid resizeObserver
-    // feedback loop (see https://github.com/excalidraw/excalidraw/pull/3379)
   }
 
-  &__canvas {
+  #canvas {
+    // Remove the main canvas from document flow to avoid resizeObserver
+    // feedback loop (see https://github.com/excalidraw/excalidraw/pull/3379)
     position: absolute;
   }
 
@@ -333,8 +328,8 @@
   .App-menu_bottom {
     position: absolute;
     bottom: 0;
-    grid-template-columns: min-content auto min-content;
-    grid-gap: 15px;
+    grid-template-columns: 1fr auto 1fr;
+    grid-gap: 4px;
     align-items: flex-start;
     cursor: default;
     pointer-events: none !important;
@@ -359,6 +354,10 @@
     }
   }
 
+  .layer-ui__wrapper:not(.disable-pointerEvents) .App-menu_bottom > * {
+    pointer-events: all;
+  }
+
   .App-menu_bottom > *:first-child {
     justify-self: flex-start;
   }
@@ -416,11 +415,13 @@
     }
 
     &.dropdown-select--floating {
+      position: absolute;
       margin: 0.5em;
     }
   }
 
   .dropdown-select__language.dropdown-select--floating {
+    position: absolute;
     bottom: 10px;
 
     :root[dir="ltr"] & {
@@ -456,12 +457,13 @@
   }
 
   .help-icon {
+    position: absolute;
     cursor: pointer;
     fill: $oc-gray-6;
+    bottom: 14px;
     width: 1.5rem;
     padding: 0;
     margin: 0;
-    margin-top: 5px;
     background: none;
     color: var(--icon-fill-color);
 
@@ -470,15 +472,15 @@
     }
 
     :root[dir="ltr"] & {
-      margin-right: 14px;
+      right: 14px;
     }
 
     :root[dir="rtl"] & {
-      margin-left: 14px;
+      left: 14px;
     }
   }
 
-  @include isMobile {
+  @media #{$is-mobile-query} {
     aside {
       display: none;
     }
@@ -494,6 +496,20 @@
     }
   }
 
+  .github-corner {
+    position: absolute;
+    top: 0;
+    z-index: 2;
+
+    :root[dir="ltr"] & {
+      right: 0;
+    }
+
+    :root[dir="rtl"] & {
+      left: 0;
+    }
+  }
+
   .zen-mode-visibility {
     visibility: visible;
     opacity: 1;

src/css/theme.scss

@@ -14,12 +14,11 @@
   --focus-highlight-color: #{$oc-blue-2};
   --icon-fill-color: #{$oc-black};
   --icon-green-fill-color: #{$oc-green-9};
-  --default-bg-color: #{$oc-white};
   --input-bg-color: #{$oc-white};
   --input-border-color: #{$oc-gray-3};
   --input-hover-bg-color: #{$oc-gray-1};
   --input-label-color: #{$oc-gray-7};
-  --island-bg-color: rgba(255, 255, 255, 0.96);
+  --island-bg-color: rgba(255, 255, 255, 0.9);
   --keybinding-color: #{$oc-gray-5};
   --link-color: #{$oc-blue-7};
   --overlay-bg-color: #{transparentize($oc-white, 0.12)};
@@ -57,12 +56,11 @@
     --focus-highlight-color: #{$oc-blue-6};
     --icon-fill-color: #{$oc-gray-4};
     --icon-green-fill-color: #{$oc-green-4};
-    --default-bg-color: #121212;
     --input-bg-color: #121212;
     --input-border-color: #2e2e2e;
     --input-hover-bg-color: #181818;
     --input-label-color: #{$oc-gray-2};
-    --island-bg-color: rgba(30, 30, 30, 0.98);
+    --island-bg-color: #1e1e1e;
     --keybinding-color: #{$oc-gray-6};
     --overlay-bg-color: #{transparentize($oc-gray-8, 0.88)};
     --popup-bg-color: #2c2c2c;

src/css/variables.module.scss

@@ -1,13 +1,10 @@
 @import "open-color/open-color.scss";
 
-@mixin isMobile() {
-  @at-root .excalidraw--mobile#{&} {
-    @content;
-  }
-}
-
+// keep up to date with is-mobile.tsx
+$is-mobile-query: "(max-width: 600px), (max-height: 500px) and (max-width: 1000px)";
 $theme-filter: "invert(93%) hue-rotate(180deg)";
 
 :export {
+  isMobileQuery: unquote($is-mobile-query);
   themeFilter: unquote($theme-filter);
 }

src/data/blob.ts

@@ -1,14 +1,13 @@
 import { cleanAppStateForExport } from "../appState";
 import { EXPORT_DATA_TYPES } from "../constants";
 import { clearElementsForExport } from "../element";
-import { ExcalidrawElement } from "../element/types";
 import { CanvasError } from "../errors";
 import { t } from "../i18n";
 import { calculateScrollCenter } from "../scene";
 import { AppState } from "../types";
 import { isValidExcalidrawData } from "./json";
 import { restore } from "./restore";
-import { ImportedLibraryData } from "./types";
+import { LibraryData } from "./types";
 
 const parseFileContents = async (blob: Blob | File) => {
   let contents: string;
@@ -84,7 +83,6 @@ export const loadFromBlob = async (
   blob: Blob,
   /** @see restore.localAppState */
   localAppState: AppState | null,
-  localElements: readonly ExcalidrawElement[] | null,
 ) => {
   const contents = await parseFileContents(blob);
   try {
@@ -105,7 +103,6 @@ export const loadFromBlob = async (
         },
       },
       localAppState,
-      localElements,
     );
 
     return result;
@@ -117,7 +114,7 @@ export const loadFromBlob = async (
 
 export const loadLibraryFromBlob = async (blob: Blob) => {
   const contents = await parseFileContents(blob);
-  const data: ImportedLibraryData = JSON.parse(contents);
+  const data: LibraryData = JSON.parse(contents);
   if (data.type !== EXPORT_DATA_TYPES.excalidrawLibrary) {
     throw new Error(t("alerts.couldNotLoadInvalidFile"));
   }

src/data/index.ts

@@ -1,9 +1,8 @@
 import { fileSave } from "browser-fs-access";
 import {
-  copyBlobToClipboardAsPng,
+  copyCanvasToClipboardAsPng,
   copyTextToSystemClipboard,
 } from "../clipboard";
-import { DEFAULT_EXPORT_PADDING } from "../constants";
 import { NonDeletedExcalidrawElement } from "../element/types";
 import { t } from "../i18n";
 import { exportToCanvas, exportToSvg } from "../scene/export";
@@ -19,29 +18,42 @@ export const exportCanvas = async (
   type: ExportType,
   elements: readonly NonDeletedExcalidrawElement[],
   appState: AppState,
+  canvas: HTMLCanvasElement,
   {
     exportBackground,
-    exportPadding = DEFAULT_EXPORT_PADDING,
+    exportPadding = 10,
     viewBackgroundColor,
     name,
+    scale = 1,
+    shouldAddWatermark,
   }: {
     exportBackground: boolean;
     exportPadding?: number;
     viewBackgroundColor: string;
     name: string;
+    scale?: number;
+    shouldAddWatermark: boolean;
   },
 ) => {
   if (elements.length === 0) {
     throw new Error(t("alerts.cannotExportEmptyCanvas"));
   }
   if (type === "svg" || type === "clipboard-svg") {
-    const tempSvg = await exportToSvg(elements, {
+    const tempSvg = exportToSvg(elements, {
       exportBackground,
       exportWithDarkMode: appState.exportWithDarkMode,
       viewBackgroundColor,
       exportPadding,
-      exportScale: appState.exportScale,
-      exportEmbedScene: appState.exportEmbedScene && type === "svg",
+      scale,
+      shouldAddWatermark,
+      metadata:
+        appState.exportEmbedScene && type === "svg"
+          ? await (
+              await import(/* webpackChunkName: "image" */ "./image")
+            ).encodeSvgMetadata({
+              text: serializeAsJSON(elements, appState),
+            })
+          : undefined,
     });
     if (type === "svg") {
       await fileSave(new Blob([tempSvg.outerHTML], { type: "image/svg+xml" }), {
@@ -50,7 +62,7 @@ export const exportCanvas = async (
       });
       return;
     } else if (type === "clipboard-svg") {
-      await copyTextToSystemClipboard(tempSvg.outerHTML);
+      copyTextToSystemClipboard(tempSvg.outerHTML);
       return;
     }
   }
@@ -59,14 +71,15 @@ export const exportCanvas = async (
     exportBackground,
     viewBackgroundColor,
     exportPadding,
+    scale,
+    shouldAddWatermark,
   });
   tempCanvas.style.display = "none";
   document.body.appendChild(tempCanvas);
-  let blob = await canvasToBlob(tempCanvas);
-  tempCanvas.remove();
 
   if (type === "png") {
     const fileName = `${name}.png`;
+    let blob = await canvasToBlob(tempCanvas);
     if (appState.exportEmbedScene) {
       blob = await (
         await import(/* webpackChunkName: "image" */ "./image")
@@ -82,7 +95,7 @@ export const exportCanvas = async (
     });
   } else if (type === "clipboard") {
     try {
-      await copyBlobToClipboardAsPng(blob);
+      await copyCanvasToClipboardAsPng(tempCanvas);
     } catch (error) {
       if (error.name === "CANVAS_POSSIBLY_TOO_BIG") {
         throw error;
@@ -90,4 +103,9 @@ export const exportCanvas = async (
       throw new Error(t("alerts.couldNotCopyToClipboard"));
     }
   }
+
+  // clean up the DOM
+  if (tempCanvas !== canvas) {
+    tempCanvas.remove();
+  }
 };

src/data/json.ts

@@ -1,36 +1,33 @@
 import { fileOpen, fileSave } from "browser-fs-access";
 import { cleanAppStateForExport } from "../appState";
-import { EXPORT_DATA_TYPES, EXPORT_SOURCE, MIME_TYPES } from "../constants";
+import { EXPORT_DATA_TYPES, MIME_TYPES } from "../constants";
 import { clearElementsForExport } from "../element";
 import { ExcalidrawElement } from "../element/types";
 import { AppState } from "../types";
 import { loadFromBlob } from "./blob";
-
-import {
-  ExportedDataState,
-  ImportedDataState,
-  ExportedLibraryData,
-} from "./types";
-import Library from "./library";
+import { Library } from "./library";
+import { ImportedDataState } from "./types";
 
 export const serializeAsJSON = (
   elements: readonly ExcalidrawElement[],
-  appState: Partial<AppState>,
-): string => {
-  const data: ExportedDataState = {
-    type: EXPORT_DATA_TYPES.excalidraw,
-    version: 2,
-    source: EXPORT_SOURCE,
-    elements: clearElementsForExport(elements),
-    appState: cleanAppStateForExport(appState),
-  };
-
-  return JSON.stringify(data, null, 2);
-};
+  appState: AppState,
+): string =>
+  JSON.stringify(
+    {
+      type: EXPORT_DATA_TYPES.excalidraw,
+      version: 2,
+      source: window.location.origin,
+      elements: clearElementsForExport(elements),
+      appState: cleanAppStateForExport(appState),
+    },
+    null,
+    2,
+  );
 
 export const saveAsJSON = async (
   elements: readonly ExcalidrawElement[],
   appState: AppState,
+  onlyIfFileHandleValid = false,
 ) => {
   const serialized = serializeAsJSON(elements, appState);
   const blob = new Blob([serialized], {
@@ -45,14 +42,12 @@ export const saveAsJSON = async (
       extensions: [".excalidraw"],
     },
     appState.fileHandle,
+    onlyIfFileHandleValid,
   );
   return { fileHandle };
 };
 
-export const loadFromJSON = async (
-  localAppState: AppState,
-  localElements: readonly ExcalidrawElement[] | null,
-) => {
+export const loadFromJSON = async (localAppState: AppState) => {
   const blob = await fileOpen({
     description: "Excalidraw files",
     // ToDo: Be over-permissive until https://bugs.webkit.org/show_bug.cgi?id=34442
@@ -67,7 +62,7 @@ export const loadFromJSON = async (
     ],
     */
   });
-  return loadFromBlob(blob, localAppState, localElements);
+  return loadFromBlob(blob, localAppState);
 };
 
 export const isValidExcalidrawData = (data?: {
@@ -92,15 +87,17 @@ export const isValidLibrary = (json: any) => {
   );
 };
 
-export const saveLibraryAsJSON = async (library: Library) => {
-  const libraryItems = await library.loadLibrary();
-  const data: ExportedLibraryData = {
-    type: EXPORT_DATA_TYPES.excalidrawLibrary,
-    version: 1,
-    source: EXPORT_SOURCE,
-    library: libraryItems,
-  };
-  const serialized = JSON.stringify(data, null, 2);
+export const saveLibraryAsJSON = async () => {
+  const library = await Library.loadLibrary();
+  const serialized = JSON.stringify(
+    {
+      type: EXPORT_DATA_TYPES.excalidrawLibrary,
+      version: 1,
+      library,
+    },
+    null,
+    2,
+  );
   const fileName = "library.excalidrawlib";
   const blob = new Blob([serialized], {
     type: MIME_TYPES.excalidrawlib,
@@ -112,7 +109,7 @@ export const saveLibraryAsJSON = async (library: Library) => {
   });
 };
 
-export const importLibraryFromJSON = async (library: Library) => {
+export const importLibraryFromJSON = async () => {
   const blob = await fileOpen({
     description: "Excalidraw library files",
     // ToDo: Be over-permissive until https://bugs.webkit.org/show_bug.cgi?id=34442
@@ -121,5 +118,5 @@ export const importLibraryFromJSON = async (library: Library) => {
     extensions: [".json", ".excalidrawlib"],
     */
   });
-  await library.importLibrary(blob);
+  await Library.importLibrary(blob);
 };

src/data/library.ts

@@ -1,29 +1,22 @@
 import { loadLibraryFromBlob } from "./blob";
 import { LibraryItems, LibraryItem } from "../types";
 import { restoreElements } from "./restore";
+import { STORAGE_KEYS } from "../constants";
 import { getNonDeletedElements } from "../element";
-import type App from "../components/App";
+import { NonDeleted, ExcalidrawElement } from "../element/types";
+import { nanoid } from "nanoid";
 
-class Library {
-  private libraryCache: LibraryItems | null = null;
-  private app: App;
+export class Library {
+  private static libraryCache: LibraryItems | null = null;
+  public static csrfToken = nanoid();
 
-  constructor(app: App) {
-    this.app = app;
-  }
-
-  resetLibrary = async () => {
-    await this.app.props.onLibraryChange?.([]);
-    this.libraryCache = [];
-  };
-
-  restoreLibraryItem = (libraryItem: LibraryItem): LibraryItem | null => {
-    const elements = getNonDeletedElements(restoreElements(libraryItem, null));
-    return elements.length ? elements : null;
+  static resetLibrary = () => {
+    Library.libraryCache = null;
+    localStorage.removeItem(STORAGE_KEYS.LOCAL_STORAGE_LIBRARY);
   };
 
   /** imports library (currently merges, removing duplicates) */
-  async importLibrary(blob: Blob) {
+  static async importLibrary(blob: Blob) {
     const libraryFile = await loadLibraryFromBlob(blob);
     if (!libraryFile || !libraryFile.library) {
       return;
@@ -53,41 +46,37 @@ class Library {
       });
     };
 
-    const existingLibraryItems = await this.loadLibrary();
+    const existingLibraryItems = await Library.loadLibrary();
 
     const filtered = libraryFile.library!.reduce((acc, libraryItem) => {
-      const restoredItem = this.restoreLibraryItem(libraryItem);
-      if (restoredItem && isUniqueitem(existingLibraryItems, restoredItem)) {
-        acc.push(restoredItem);
+      const restored = getNonDeletedElements(restoreElements(libraryItem));
+      if (isUniqueitem(existingLibraryItems, restored)) {
+        acc.push(restored);
       }
       return acc;
-    }, [] as Mutable<LibraryItems>);
+    }, [] as (readonly NonDeleted<ExcalidrawElement>[])[]);
 
-    await this.saveLibrary([...existingLibraryItems, ...filtered]);
+    Library.saveLibrary([...existingLibraryItems, ...filtered]);
   }
 
-  loadLibrary = (): Promise<LibraryItems> => {
+  static loadLibrary = (): Promise<LibraryItems> => {
     return new Promise(async (resolve) => {
-      if (this.libraryCache) {
-        return resolve(JSON.parse(JSON.stringify(this.libraryCache)));
+      if (Library.libraryCache) {
+        return resolve(JSON.parse(JSON.stringify(Library.libraryCache)));
       }
 
       try {
-        const libraryItems = this.app.libraryItemsFromStorage;
-        if (!libraryItems) {
+        const data = localStorage.getItem(STORAGE_KEYS.LOCAL_STORAGE_LIBRARY);
+        if (!data) {
           return resolve([]);
         }
 
-        const items = libraryItems.reduce((acc, item) => {
-          const restoredItem = this.restoreLibraryItem(item);
-          if (restoredItem) {
-            acc.push(item);
-          }
-          return acc;
-        }, [] as Mutable<LibraryItems>);
+        const items = (JSON.parse(data) as LibraryItems).map((elements) =>
+          restoreElements(elements),
+        ) as Mutable<LibraryItems>;
 
         // clone to ensure we don't mutate the cached library elements in the app
-        this.libraryCache = JSON.parse(JSON.stringify(items));
+        Library.libraryCache = JSON.parse(JSON.stringify(items));
 
         resolve(items);
       } catch (error) {
@@ -97,19 +86,17 @@ class Library {
     });
   };
 
-  saveLibrary = async (items: LibraryItems) => {
-    const prevLibraryItems = this.libraryCache;
+  static saveLibrary = (items: LibraryItems) => {
+    const prevLibraryItems = Library.libraryCache;
     try {
       const serializedItems = JSON.stringify(items);
-      // cache optimistically so that the app has access to the latest
+      // cache optimistically so that consumers have access to the latest
       // immediately
-      this.libraryCache = JSON.parse(serializedItems);
-      await this.app.props.onLibraryChange?.(items);
+      Library.libraryCache = JSON.parse(serializedItems);
+      localStorage.setItem(STORAGE_KEYS.LOCAL_STORAGE_LIBRARY, serializedItems);
     } catch (error) {
-      this.libraryCache = prevLibraryItems;
-      throw error;
+      Library.libraryCache = prevLibraryItems;
+      console.error(error);
     }
   };
 }
-
-export default Library;

src/data/restore.ts

@@ -1,72 +1,36 @@
 import {
   ExcalidrawElement,
+  FontFamily,
   ExcalidrawSelectionElement,
-  FontFamilyValues,
 } from "../element/types";
 import { AppState, NormalizedZoomValue } from "../types";
-import { ImportedDataState } from "./types";
-import {
-  getElementMap,
-  getNormalizedDimensions,
-  isInvisiblySmallElement,
-} from "../element";
+import { DataState, ImportedDataState } from "./types";
+import { isInvisiblySmallElement, getNormalizedDimensions } from "../element";
 import { isLinearElementType } from "../element/typeChecks";
 import { randomId } from "../random";
 import {
+  FONT_FAMILY,
   DEFAULT_FONT_FAMILY,
   DEFAULT_TEXT_ALIGN,
   DEFAULT_VERTICAL_ALIGN,
-  FONT_FAMILY,
 } from "../constants";
 import { getDefaultAppState } from "../appState";
-import { LinearElementEditor } from "../element/linearElementEditor";
-import { bumpVersion } from "../element/mutateElement";
 
-type RestoredAppState = Omit<
-  AppState,
-  "offsetTop" | "offsetLeft" | "width" | "height"
->;
-
-export const AllowedExcalidrawElementTypes: Record<
-  ExcalidrawElement["type"],
-  true
-> = {
-  selection: true,
-  text: true,
-  rectangle: true,
-  diamond: true,
-  ellipse: true,
-  line: true,
-  arrow: true,
-  freedraw: true,
-};
-
-export type RestoredDataState = {
-  elements: ExcalidrawElement[];
-  appState: RestoredAppState;
-};
-
-const getFontFamilyByName = (fontFamilyName: string): FontFamilyValues => {
-  if (Object.keys(FONT_FAMILY).includes(fontFamilyName)) {
-    return FONT_FAMILY[
-      fontFamilyName as keyof typeof FONT_FAMILY
-    ] as FontFamilyValues;
+const getFontFamilyByName = (fontFamilyName: string): FontFamily => {
+  for (const [id, fontFamilyString] of Object.entries(FONT_FAMILY)) {
+    if (fontFamilyString.includes(fontFamilyName)) {
+      return parseInt(id) as FontFamily;
+    }
   }
   return DEFAULT_FONT_FAMILY;
 };
 
-const restoreElementWithProperties = <
-  T extends ExcalidrawElement,
-  K extends keyof Omit<
-    Required<T>,
-    Exclude<keyof ExcalidrawElement, "type" | "x" | "y">
-  >
->(
+const restoreElementWithProperties = <T extends ExcalidrawElement>(
   element: Required<T>,
-  extra: Pick<T, K>,
+  extra: Omit<Required<T>, keyof ExcalidrawElement>,
 ): T => {
   const base: Pick<T, keyof ExcalidrawElement> = {
-    type: (extra as Partial<T>).type || element.type,
+    type: element.type,
     // all elements must have version > 0 so getSceneVersion() will pick up
     // newly added elements
     version: element.version || 1,
@@ -79,8 +43,8 @@ const restoreElementWithProperties = <
     roughness: element.roughness ?? 1,
     opacity: element.opacity == null ? 100 : element.opacity,
     angle: element.angle || 0,
-    x: (extra as Partial<T>).x ?? element.x ?? 0,
-    y: (extra as Partial<T>).y ?? element.y ?? 0,
+    x: element.x || 0,
+    y: element.y || 0,
     strokeColor: element.strokeColor,
     backgroundColor: element.backgroundColor,
     width: element.width || 0,
@@ -123,51 +87,28 @@ const restoreElement = (
         textAlign: element.textAlign || DEFAULT_TEXT_ALIGN,
         verticalAlign: element.verticalAlign || DEFAULT_VERTICAL_ALIGN,
       });
-    case "freedraw": {
-      return restoreElementWithProperties(element, {
-        points: element.points,
-        lastCommittedPoint: null,
-        simulatePressure: element.simulatePressure,
-        pressures: element.pressures,
-      });
-    }
-    case "line":
-    // @ts-ignore LEGACY type
-    // eslint-disable-next-line no-fallthrough
     case "draw":
+    case "line":
     case "arrow": {
       const {
         startArrowhead = null,
         endArrowhead = element.type === "arrow" ? "arrow" : null,
       } = element;
 
-      let x = element.x;
-      let y = element.y;
-      let points = // migrate old arrow model to new one
-        !Array.isArray(element.points) || element.points.length < 2
-          ? [
-              [0, 0],
-              [element.width, element.height],
-            ]
-          : element.points;
-
-      if (points[0][0] !== 0 || points[0][1] !== 0) {
-        ({ points, x, y } = LinearElementEditor.getNormalizedPoints(element));
-      }
-
       return restoreElementWithProperties(element, {
-        type:
-          (element.type as ExcalidrawElement["type"] | "draw") === "draw"
-            ? "line"
-            : element.type,
         startBinding: element.startBinding,
         endBinding: element.endBinding,
+        points:
+          // migrate old arrow model to new one
+          !Array.isArray(element.points) || element.points.length < 2
+            ? [
+                [0, 0],
+                [element.width, element.height],
+              ]
+            : element.points,
         lastCommittedPoint: null,
         startArrowhead,
         endArrowhead,
-        points,
-        x,
-        y,
       });
     }
     // generic elements
@@ -186,20 +127,13 @@ const restoreElement = (
 
 export const restoreElements = (
   elements: ImportedDataState["elements"],
-  /** NOTE doesn't serve for reconciliation */
-  localElements: readonly ExcalidrawElement[] | null | undefined,
 ): ExcalidrawElement[] => {
-  const localElementsMap = localElements ? getElementMap(localElements) : null;
   return (elements || []).reduce((elements, element) => {
     // filtering out selection, which is legacy, no longer kept in elements,
     // and causing issues if retained
     if (element.type !== "selection" && !isInvisiblySmallElement(element)) {
-      let migratedElement: ExcalidrawElement = restoreElement(element);
+      const migratedElement = restoreElement(element);
       if (migratedElement) {
-        const localElement = localElementsMap?.[element.id];
-        if (localElement && localElement.version > migratedElement.version) {
-          migratedElement = bumpVersion(migratedElement, localElement.version);
-        }
         elements.push(migratedElement);
       }
     }
@@ -209,32 +143,29 @@ export const restoreElements = (
 
 export const restoreAppState = (
   appState: ImportedDataState["appState"],
-  localAppState: Partial<AppState> | null | undefined,
-): RestoredAppState => {
+  localAppState: Partial<AppState> | null,
+): DataState["appState"] => {
   appState = appState || {};
 
   const defaultAppState = getDefaultAppState();
   const nextAppState = {} as typeof defaultAppState;
 
-  for (const [key, defaultValue] of Object.entries(defaultAppState) as [
+  for (const [key, val] of Object.entries(defaultAppState) as [
     keyof typeof defaultAppState,
     any,
   ][]) {
-    const suppliedValue = appState[key];
+    const restoredValue = appState[key];
     const localValue = localAppState ? localAppState[key] : undefined;
     (nextAppState as any)[key] =
-      suppliedValue !== undefined
-        ? suppliedValue
+      restoredValue !== undefined
+        ? restoredValue
         : localValue !== undefined
         ? localValue
-        : defaultValue;
+        : val;
   }
 
   return {
     ...nextAppState,
-    elementType: AllowedExcalidrawElementTypes[nextAppState.elementType]
-      ? nextAppState.elementType
-      : "selection",
     // Migrates from previous version where appState.zoom was a number
     zoom:
       typeof appState.zoom === "number"
@@ -255,10 +186,9 @@ export const restore = (
    * Supply `null` if you can't get access to it.
    */
   localAppState: Partial<AppState> | null | undefined,
-  localElements: readonly ExcalidrawElement[] | null | undefined,
-): RestoredDataState => {
+): DataState => {
   return {
-    elements: restoreElements(data?.elements, localElements),
+    elements: restoreElements(data?.elements),
     appState: restoreAppState(data?.appState, localAppState || null),
   };
 };

src/data/types.ts

@@ -1,30 +1,26 @@
 import { ExcalidrawElement } from "../element/types";
 import { AppState, LibraryItems } from "../types";
-import type { cleanAppStateForExport } from "../appState";
 
-export interface ExportedDataState {
-  type: string;
-  version: number;
-  source: string;
+export interface DataState {
+  type?: string;
+  version?: string;
+  source?: string;
   elements: readonly ExcalidrawElement[];
-  appState: ReturnType<typeof cleanAppStateForExport>;
+  appState: Omit<AppState, "offsetTop" | "offsetLeft" | "width" | "height">;
 }
 
 export interface ImportedDataState {
+  type?: string;
+  version?: string;
+  source?: string;
+  elements?: DataState["elements"] | null;
+  appState?: Partial<DataState["appState"]> | null;
+  scrollToContent?: boolean;
+}
+
+export interface LibraryData {
   type?: string;
   version?: number;
   source?: string;
-  elements?: readonly ExcalidrawElement[] | null;
-  appState?: Readonly<Partial<AppState>> | null;
-  scrollToContent?: boolean;
-  libraryItems?: LibraryItems;
+  library?: LibraryItems;
 }
-
-export interface ExportedLibraryData {
-  type: string;
-  version: number;
-  source: string;
-  library: LibraryItems;
-}
-
-export interface ImportedLibraryData extends Partial<ExportedLibraryData> {}

src/element/bounds.ts

@@ -1,9 +1,4 @@
-import {
-  ExcalidrawElement,
-  ExcalidrawLinearElement,
-  Arrowhead,
-  ExcalidrawFreeDrawElement,
-} from "./types";
+import { ExcalidrawElement, ExcalidrawLinearElement, Arrowhead } from "./types";
 import { distance2d, rotate } from "../math";
 import rough from "roughjs/bin/rough";
 import { Drawable, Op } from "roughjs/bin/core";
@@ -12,7 +7,7 @@ import {
   getShapeForElement,
   generateRoughOptions,
 } from "../renderer/renderElement";
-import { isFreeDrawElement, isLinearElement } from "./typeChecks";
+import { isLinearElement } from "./typeChecks";
 import { rescalePoints } from "../points";
 
 // x and y position of top left corner, x and y position of bottom right corner
@@ -23,9 +18,7 @@ export type Bounds = readonly [number, number, number, number];
 export const getElementAbsoluteCoords = (
   element: ExcalidrawElement,
 ): Bounds => {
-  if (isFreeDrawElement(element)) {
-    return getFreeDrawElementAbsoluteCoords(element);
-  } else if (isLinearElement(element)) {
+  if (isLinearElement(element)) {
     return getLinearElementAbsoluteCoords(element);
   }
   return [
@@ -127,42 +120,9 @@ const getMinMaxXYFromCurvePathOps = (
   return [minX, minY, maxX, maxY];
 };
 
-const getBoundsFromPoints = (
-  points: ExcalidrawFreeDrawElement["points"],
-): [number, number, number, number] => {
-  let minX = Infinity;
-  let minY = Infinity;
-  let maxX = -Infinity;
-  let maxY = -Infinity;
-
-  for (const [x, y] of points) {
-    minX = Math.min(minX, x);
-    minY = Math.min(minY, y);
-    maxX = Math.max(maxX, x);
-    maxY = Math.max(maxY, y);
-  }
-
-  return [minX, minY, maxX, maxY];
-};
-
-const getFreeDrawElementAbsoluteCoords = (
-  element: ExcalidrawFreeDrawElement,
-): [number, number, number, number] => {
-  const [minX, minY, maxX, maxY] = getBoundsFromPoints(element.points);
-
-  return [
-    minX + element.x,
-    minY + element.y,
-    maxX + element.x,
-    maxY + element.y,
-  ];
-};
-
 const getLinearElementAbsoluteCoords = (
   element: ExcalidrawLinearElement,
 ): [number, number, number, number] => {
-  let coords: [number, number, number, number];
-
   if (element.points.length < 2 || !getShapeForElement(element)) {
     // XXX this is just a poor estimate and not very useful
     const { minX, minY, maxX, maxY } = element.points.reduce(
@@ -177,21 +137,7 @@ const getLinearElementAbsoluteCoords = (
       },
       { minX: Infinity, minY: Infinity, maxX: -Infinity, maxY: -Infinity },
     );
-    coords = [
-      minX + element.x,
-      minY + element.y,
-      maxX + element.x,
-      maxY + element.y,
-    ];
-  } else {
-    const shape = getShapeForElement(element) as Drawable[];
-
-    // first element is always the curve
-    const ops = getCurvePathOps(shape[0]);
-
-    const [minX, minY, maxX, maxY] = getMinMaxXYFromCurvePathOps(ops);
-
-    coords = [
+    return [
       minX + element.x,
       minY + element.y,
       maxX + element.x,
@@ -199,7 +145,19 @@ const getLinearElementAbsoluteCoords = (
     ];
   }
 
-  return coords;
+  const shape = getShapeForElement(element) as Drawable[];
+
+  // first element is always the curve
+  const ops = getCurvePathOps(shape[0]);
+
+  const [minX, minY, maxX, maxY] = getMinMaxXYFromCurvePathOps(ops);
+
+  return [
+    minX + element.x,
+    minY + element.y,
+    maxX + element.x,
+    maxY + element.y,
+  ];
 };
 
 export const getArrowheadPoints = (
@@ -260,34 +218,20 @@ export const getArrowheadPoints = (
     dot: 15,
   }[arrowhead]; // pixels (will differ for each arrowhead)
 
-  let length = 0;
-
-  if (arrowhead === "arrow") {
-    // Length for -> arrows is based on the length of the last section
-    const [cx, cy] = element.points[element.points.length - 1];
-    const [px, py] =
-      element.points.length > 1
-        ? element.points[element.points.length - 2]
-        : [0, 0];
-
-    length = Math.hypot(cx - px, cy - py);
-  } else {
-    // Length for other arrowhead types is based on the total length of the line
-    for (let i = 0; i < element.points.length; i++) {
-      const [px, py] = element.points[i - 1] || [0, 0];
-      const [cx, cy] = element.points[i];
-      length += Math.hypot(cx - px, cy - py);
-    }
-  }
+  const length = element.points.reduce((total, [cx, cy], idx, points) => {
+    const [px, py] = idx > 0 ? points[idx - 1] : [0, 0];
+    return total + Math.hypot(cx - px, cy - py);
+  }, 0);
 
   // Scale down the arrowhead until we hit a certain size so that it doesn't look weird.
-  // This value is selected by minimizing a minimum size with the last segment of the arrowhead
+  // This value is selected by minimizing a minimum size with the whole length of the
+  // arrowhead instead of last segment of the arrowhead.
   const minSize = Math.min(size, length / 2);
   const xs = x2 - nx * minSize;
   const ys = y2 - ny * minSize;
 
   if (arrowhead === "dot") {
-    const r = Math.hypot(ys - y2, xs - x2) + element.strokeWidth;
+    const r = Math.hypot(ys - y2, xs - x2);
     return [x2, y2, r];
   }
 
@@ -333,31 +277,16 @@ const getLinearElementRotatedBounds = (
   return getMinMaxXYFromCurvePathOps(ops, transformXY);
 };
 
-// We could cache this stuff
 export const getElementBounds = (
   element: ExcalidrawElement,
 ): [number, number, number, number] => {
-  let bounds: [number, number, number, number];
-
   const [x1, y1, x2, y2] = getElementAbsoluteCoords(element);
   const cx = (x1 + x2) / 2;
   const cy = (y1 + y2) / 2;
-  if (isFreeDrawElement(element)) {
-    const [minX, minY, maxX, maxY] = getBoundsFromPoints(
-      element.points.map(([x, y]) =>
-        rotate(x, y, cx - element.x, cy - element.y, element.angle),
-      ),
-    );
-
-    return [
-      minX + element.x,
-      minY + element.y,
-      maxX + element.x,
-      maxY + element.y,
-    ];
-  } else if (isLinearElement(element)) {
-    bounds = getLinearElementRotatedBounds(element, cx, cy);
-  } else if (element.type === "diamond") {
+  if (isLinearElement(element)) {
+    return getLinearElementRotatedBounds(element, cx, cy);
+  }
+  if (element.type === "diamond") {
     const [x11, y11] = rotate(cx, y1, cx, cy, element.angle);
     const [x12, y12] = rotate(cx, y2, cx, cy, element.angle);
     const [x22, y22] = rotate(x1, cy, cx, cy, element.angle);
@@ -366,28 +295,26 @@ export const getElementBounds = (
     const minY = Math.min(y11, y12, y22, y21);
     const maxX = Math.max(x11, x12, x22, x21);
     const maxY = Math.max(y11, y12, y22, y21);
-    bounds = [minX, minY, maxX, maxY];
-  } else if (element.type === "ellipse") {
+    return [minX, minY, maxX, maxY];
+  }
+  if (element.type === "ellipse") {
     const w = (x2 - x1) / 2;
     const h = (y2 - y1) / 2;
     const cos = Math.cos(element.angle);
     const sin = Math.sin(element.angle);
     const ww = Math.hypot(w * cos, h * sin);
     const hh = Math.hypot(h * cos, w * sin);
-    bounds = [cx - ww, cy - hh, cx + ww, cy + hh];
-  } else {
-    const [x11, y11] = rotate(x1, y1, cx, cy, element.angle);
-    const [x12, y12] = rotate(x1, y2, cx, cy, element.angle);
-    const [x22, y22] = rotate(x2, y2, cx, cy, element.angle);
-    const [x21, y21] = rotate(x2, y1, cx, cy, element.angle);
-    const minX = Math.min(x11, x12, x22, x21);
-    const minY = Math.min(y11, y12, y22, y21);
-    const maxX = Math.max(x11, x12, x22, x21);
-    const maxY = Math.max(y11, y12, y22, y21);
-    bounds = [minX, minY, maxX, maxY];
+    return [cx - ww, cy - hh, cx + ww, cy + hh];
   }
-
-  return bounds;
+  const [x11, y11] = rotate(x1, y1, cx, cy, element.angle);
+  const [x12, y12] = rotate(x1, y2, cx, cy, element.angle);
+  const [x22, y22] = rotate(x2, y2, cx, cy, element.angle);
+  const [x21, y21] = rotate(x2, y1, cx, cy, element.angle);
+  const minX = Math.min(x11, x12, x22, x21);
+  const minY = Math.min(y11, y12, y22, y21);
+  const maxX = Math.max(x11, x12, x22, x21);
+  const maxY = Math.max(y11, y12, y22, y21);
+  return [minX, minY, maxX, maxY];
 };
 
 export const getCommonBounds = (
@@ -418,7 +345,7 @@ export const getResizedElementAbsoluteCoords = (
   nextWidth: number,
   nextHeight: number,
 ): [number, number, number, number] => {
-  if (!(isLinearElement(element) || isFreeDrawElement(element))) {
+  if (!isLinearElement(element)) {
     return [
       element.x,
       element.y,
@@ -433,29 +360,16 @@ export const getResizedElementAbsoluteCoords = (
     rescalePoints(1, nextHeight, element.points),
   );
 
-  let bounds: [number, number, number, number];
-
-  if (isFreeDrawElement(element)) {
-    // Free Draw
-    bounds = getBoundsFromPoints(points);
-  } else {
-    // Line
-    const gen = rough.generator();
-    const curve =
-      element.strokeSharpness === "sharp"
-        ? gen.linearPath(
-            points as [number, number][],
-            generateRoughOptions(element),
-          )
-        : gen.curve(
-            points as [number, number][],
-            generateRoughOptions(element),
-          );
-    const ops = getCurvePathOps(curve);
-    bounds = getMinMaxXYFromCurvePathOps(ops);
-  }
-
-  const [minX, minY, maxX, maxY] = bounds;
+  const gen = rough.generator();
+  const curve =
+    element.strokeSharpness === "sharp"
+      ? gen.linearPath(
+          points as [number, number][],
+          generateRoughOptions(element),
+        )
+      : gen.curve(points as [number, number][], generateRoughOptions(element));
+  const ops = getCurvePathOps(curve);
+  const [minX, minY, maxX, maxY] = getMinMaxXYFromCurvePathOps(ops);
   return [
     minX + element.x,
     minY + element.y,

src/element/collision.ts

@@ -4,13 +4,7 @@ import * as GADirection from "../gadirections";
 import * as GALine from "../galines";
 import * as GATransform from "../gatransforms";
 
-import {
-  distance2d,
-  rotatePoint,
-  isPathALoop,
-  isPointInPolygon,
-  rotate,
-} from "../math";
+import { isPathALoop, isPointInPolygon, rotate } from "../math";
 import { pointsOnBezierCurves } from "points-on-curve";
 
 import {
@@ -22,7 +16,6 @@ import {
   ExcalidrawTextElement,
   ExcalidrawEllipseElement,
   NonDeleted,
-  ExcalidrawFreeDrawElement,
 } from "./types";
 
 import { getElementAbsoluteCoords, getCurvePathOps, Bounds } from "./bounds";
@@ -37,17 +30,10 @@ const isElementDraggableFromInside = (
   if (element.type === "arrow") {
     return false;
   }
-
-  if (element.type === "freedraw") {
-    return true;
-  }
-
   const isDraggableFromInside = element.backgroundColor !== "transparent";
-
-  if (element.type === "line") {
+  if (element.type === "line" || element.type === "draw") {
     return isDraggableFromInside && isPathALoop(element.points);
   }
-
   return isDraggableFromInside;
 };
 
@@ -95,7 +81,6 @@ const isHittingElementNotConsideringBoundingBox = (
       : isElementDraggableFromInside(element)
       ? isInsideCheck
       : isNearCheck;
-
   return hitTestPointAgainstElement({ element, point, threshold, check });
 };
 
@@ -166,20 +151,9 @@ const hitTestPointAgainstElement = (args: HitTestArgs): boolean => {
     case "ellipse":
       const distance = distanceToBindableElement(args.element, args.point);
       return args.check(distance, args.threshold);
-    case "freedraw": {
-      if (
-        !args.check(
-          distanceToRectangle(args.element, args.point),
-          args.threshold,
-        )
-      ) {
-        return false;
-      }
-
-      return hitTestFreeDrawElement(args.element, args.point, args.threshold);
-    }
     case "arrow":
     case "line":
+    case "draw":
       return hitTestLinear(args);
     case "selection":
       console.warn(
@@ -221,10 +195,7 @@ const isOutsideCheck = (distance: number, threshold: number): boolean => {
 };
 
 const distanceToRectangle = (
-  element:
-    | ExcalidrawRectangleElement
-    | ExcalidrawTextElement
-    | ExcalidrawFreeDrawElement,
+  element: ExcalidrawRectangleElement | ExcalidrawTextElement,
   point: Point,
 ): number => {
   const [, pointRel, hwidth, hheight] = pointRelativeToElement(element, point);
@@ -296,71 +267,6 @@ const ellipseParamsForTest = (
   return [pointRel, tangent];
 };
 
-const hitTestFreeDrawElement = (
-  element: ExcalidrawFreeDrawElement,
-  point: Point,
-  threshold: number,
-): boolean => {
-  // Check point-distance-to-line-segment for every segment in the
-  // element's points (its input points, not its outline points).
-  // This is... okay? It's plenty fast, but the GA library may
-  // have a faster option.
-
-  let x: number;
-  let y: number;
-
-  if (element.angle === 0) {
-    x = point[0] - element.x;
-    y = point[1] - element.y;
-  } else {
-    // Counter-rotate the point around center before testing
-    const [minX, minY, maxX, maxY] = getElementAbsoluteCoords(element);
-    const rotatedPoint = rotatePoint(
-      point,
-      [minX + (maxX - minX) / 2, minY + (maxY - minY) / 2],
-      -element.angle,
-    );
-    x = rotatedPoint[0] - element.x;
-    y = rotatedPoint[1] - element.y;
-  }
-
-  let [A, B] = element.points;
-  let P: readonly [number, number];
-
-  // For freedraw dots
-  if (element.points.length === 2) {
-    return (
-      distance2d(A[0], A[1], x, y) < threshold ||
-      distance2d(B[0], B[1], x, y) < threshold
-    );
-  }
-
-  // For freedraw lines
-  for (let i = 1; i < element.points.length - 1; i++) {
-    const delta = [B[0] - A[0], B[1] - A[1]];
-    const length = Math.hypot(delta[1], delta[0]);
-
-    const U = [delta[0] / length, delta[1] / length];
-    const C = [x - A[0], y - A[1]];
-    const d = (C[0] * U[0] + C[1] * U[1]) / Math.hypot(U[1], U[0]);
-    P = [A[0] + U[0] * d, A[1] + U[1] * d];
-
-    const da = distance2d(P[0], P[1], A[0], A[1]);
-    const db = distance2d(P[0], P[1], B[0], B[1]);
-
-    P = db < da && da > length ? B : da < db && db > length ? A : P;
-
-    if (Math.hypot(y - P[1], x - P[0]) < threshold) {
-      return true;
-    }
-
-    A = B;
-    B = element.points[i + 1];
-  }
-
-  return false;
-};
-
 const hitTestLinear = (args: HitTestArgs): boolean => {
   const { element, threshold } = args;
   if (!getShapeForElement(element)) {

src/element/dragElements.ts

@@ -5,7 +5,7 @@ import { mutateElement } from "./mutateElement";
 import { getPerfectElementSize } from "./sizeHelpers";
 import Scene from "../scene/Scene";
 import { NonDeletedExcalidrawElement } from "./types";
-import { PointerDownState } from "../types";
+import { PointerDownState } from "../components/App";
 
 export const dragSelectedElements = (
   pointerDownState: PointerDownState,

src/element/index.ts

@@ -58,6 +58,13 @@ export {
 } from "./sizeHelpers";
 export { showSelectedShapeActions } from "./showSelectedShapeActions";
 
+export const getSyncableElements = (
+  elements: readonly ExcalidrawElement[], // There are places in Excalidraw where synthetic invisibly small elements are added and removed.
+) =>
+  // It's probably best to keep those local otherwise there might be a race condition that
+  // gets the app into an invalid state. I've never seen it happen but I'm worried about it :)
+  elements.filter((el) => el.isDeleted || !isInvisiblySmallElement(el));
+
 export const getElementMap = (elements: readonly ExcalidrawElement[]) =>
   elements.reduce(
     (acc: { [key: string]: ExcalidrawElement }, element: ExcalidrawElement) => {
@@ -70,11 +77,6 @@ export const getElementMap = (elements: readonly ExcalidrawElement[]) =>
 export const getSceneVersion = (elements: readonly ExcalidrawElement[]) =>
   elements.reduce((acc, el) => acc + el.version, 0);
 
-export const getVisibleElements = (elements: readonly ExcalidrawElement[]) =>
-  elements.filter(
-    (el) => !el.isDeleted && !isInvisiblySmallElement(el),
-  ) as readonly NonDeletedExcalidrawElement[];
-
 export const getNonDeletedElements = (elements: readonly ExcalidrawElement[]) =>
   elements.filter(
     (element) => !element.isDeleted,

src/element/linearElementEditor.ts

@@ -10,7 +10,7 @@ import { getElementAbsoluteCoords } from ".";
 import { getElementPointsCoords } from "./bounds";
 import { Point, AppState } from "../types";
 import { mutateElement } from "./mutateElement";
-import History from "../history";
+import { SceneHistory } from "../history";
 
 import Scene from "../scene/Scene";
 import {
@@ -167,7 +167,7 @@ export class LinearElementEditor {
     event: React.PointerEvent<HTMLCanvasElement>,
     appState: AppState,
     setState: React.Component<any, AppState>["setState"],
-    history: History,
+    history: SceneHistory,
     scenePointer: { x: number; y: number },
   ): {
     didAddPoint: boolean;
@@ -415,31 +415,26 @@ export class LinearElementEditor {
     return [rotatedX - element.x, rotatedY - element.y];
   }
 
+  // element-mutating methods
+  // ---------------------------------------------------------------------------
+
   /**
    * Normalizes line points so that the start point is at [0,0]. This is
-   * expected in various parts of the codebase. Also returns new x/y to account
-   * for the potential normalization.
+   *  expected in various parts of the codebase.
    */
-  static getNormalizedPoints(element: ExcalidrawLinearElement) {
+  static normalizePoints(element: NonDeleted<ExcalidrawLinearElement>) {
     const { points } = element;
 
     const offsetX = points[0][0];
     const offsetY = points[0][1];
 
-    return {
+    mutateElement(element, {
       points: points.map((point, _idx) => {
         return [point[0] - offsetX, point[1] - offsetY] as const;
       }),
       x: element.x + offsetX,
       y: element.y + offsetY,
-    };
-  }
-
-  // element-mutating methods
-  // ---------------------------------------------------------------------------
-
-  static normalizePoints(element: NonDeleted<ExcalidrawLinearElement>) {
-    mutateElement(element, LinearElementEditor.getNormalizedPoints(element));
+    });
   }
 
   static movePointByOffset(

src/element/mutateElement.ts

@@ -114,17 +114,3 @@ export const newElementWith = <TElement extends ExcalidrawElement>(
     versionNonce: randomInteger(),
   };
 };
-
-/**
- * Mutates element and updates `version` & `versionNonce`.
- *
- * NOTE: does not trigger re-render.
- */
-export const bumpVersion = (
-  element: Mutable<ExcalidrawElement>,
-  version?: ExcalidrawElement["version"],
-) => {
-  element.version = (version ?? element.version) + 1;
-  element.versionNonce = randomInteger();
-  return element;
-};

src/element/newElement.test.ts

@@ -1,7 +1,6 @@
 import { duplicateElement } from "./newElement";
 import { mutateElement } from "./mutateElement";
 import { API } from "../tests/helpers/api";
-import { FONT_FAMILY } from "../constants";
 
 const isPrimitive = (val: any) => {
   const type = typeof val;
@@ -80,7 +79,7 @@ it("clones text element", () => {
     opacity: 100,
     text: "hello",
     fontSize: 20,
-    fontFamily: FONT_FAMILY.Virgil,
+    fontFamily: 1,
     textAlign: "left",
     verticalAlign: "top",
   });

src/element/newElement.ts

@@ -5,11 +5,10 @@ import {
   ExcalidrawGenericElement,
   NonDeleted,
   TextAlign,
+  FontFamily,
   GroupId,
   VerticalAlign,
   Arrowhead,
-  ExcalidrawFreeDrawElement,
-  FontFamilyValues,
 } from "../element/types";
 import { measureText, getFontString } from "../utils";
 import { randomInteger, randomId } from "../random";
@@ -109,7 +108,7 @@ export const newTextElement = (
   opts: {
     text: string;
     fontSize: number;
-    fontFamily: FontFamilyValues;
+    fontFamily: FontFamily;
     textAlign: TextAlign;
     verticalAlign: VerticalAlign;
   } & ElementConstructorOpts,
@@ -213,22 +212,6 @@ export const updateTextElement = (
   });
 };
 
-export const newFreeDrawElement = (
-  opts: {
-    type: "freedraw";
-    points?: ExcalidrawFreeDrawElement["points"];
-    simulatePressure: boolean;
-  } & ElementConstructorOpts,
-): NonDeleted<ExcalidrawFreeDrawElement> => {
-  return {
-    ..._newElementBase<ExcalidrawFreeDrawElement>(opts.type, opts),
-    points: opts.points || [],
-    pressures: [],
-    simulatePressure: opts.simulatePressure,
-    lastCommittedPoint: null,
-  };
-};
-
 export const newLinearElement = (
   opts: {
     type: ExcalidrawLinearElement["type"];
@@ -307,19 +290,7 @@ export const duplicateElement = <TElement extends Mutable<ExcalidrawElement>>(
   overrides?: Partial<TElement>,
 ): TElement => {
   let copy: TElement = deepCopyElement(element);
-  if (process.env.NODE_ENV === "test") {
-    copy.id = `${copy.id}_copy`;
-    // `window.h` may not be defined in some unit tests
-    if (
-      window.h?.app
-        ?.getSceneElementsIncludingDeleted()
-        .find((el) => el.id === copy.id)
-    ) {
-      copy.id += "_copy";
-    }
-  } else {
-    copy.id = randomId();
-  }
+  copy.id = process.env.NODE_ENV === "test" ? `${copy.id}_copy` : randomId();
   copy.seed = randomInteger();
   copy.groupIds = getNewGroupIdsForDuplication(
     copy.groupIds,