debug

.eslintignore

@@ -5,4 +5,3 @@ package-lock.json
 firebase/
 dist/
 public/workbox
-src/packages/excalidraw/types

.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

@@ -70,8 +70,6 @@ The first set of digits is the room. This is visible from the server that’s go
 
 The second set of digits is the encryption key. The Excalidraw server doesn’t know about it. This is what all the participants use to encrypt/decrypt the messages.
 
-> Note: Please ensure that the encryption key is 22 characters long.
-
 ## Shape libraries
 
 Find a growing list of libraries containing assets for your drawings at [libraries.excalidraw.com](https://libraries.excalidraw.com).
@@ -95,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

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,28 +19,23 @@
     ]
   },
   "dependencies": {
-    "@dwelle/browser-fs-access": "0.21.3",
     "@sentry/browser": "6.2.5",
     "@sentry/integrations": "6.2.5",
     "@testing-library/jest-dom": "5.11.10",
     "@testing-library/react": "11.2.6",
-    "@tldraw/vec": "0.0.106",
     "@types/jest": "26.0.22",
-    "@types/pica": "5.1.3",
     "@types/react": "17.0.3",
     "@types/react-dom": "17.0.3",
     "@types/socket.io-client": "1.4.36",
+    "browser-fs-access": "0.16.4",
     "clsx": "1.1.1",
-    "fake-indexeddb": "3.1.3",
     "firebase": "8.3.3",
     "i18next-browser-languagedetector": "6.1.0",
-    "idb-keyval": "5.1.3",
-    "image-blob-reduce": "3.0.1",
     "lodash.throttle": "4.1.1",
     "nanoid": "3.1.22",
     "open-color": "1.8.0",
     "pako": "1.0.11",
-    "perfect-freehand": "1.0.15",
+    "perfect-freehand": "0.4.7",
     "png-chunk-text": "1.0.0",
     "png-chunks-encode": "1.0.0",
     "png-chunks-extract": "1.0.0",
@@ -81,7 +76,7 @@
   },
   "jest": {
     "transformIgnorePatterns": [
-      "node_modules/(?!(roughjs|points-on-curve|path-data-parser|points-on-path|@dwelle/browser-fs-access)/)"
+      "node_modules/(?!(roughjs|points-on-curve|path-data-parser|points-on-path|browser-fs-access)/)"
     ],
     "resetMocks": false
   },

public/index.html

@@ -13,18 +13,6 @@
 
     <meta name="theme-color" content="#000" />
 
-    <!-- Declarative Link Capturing (https://web.dev/declarative-link-capturing/) -->
-    <meta
-      http-equiv="origin-trial"
-      content="Ak3VyzTheARtX2CnxBZ3ZKxImB0mNyvDakmMxeAChgxrWFMZ3IGN64VP+uj36VxM5OegsbLmrP258b1xvqp7+Q8AAABbeyJvcmlnaW4iOiJodHRwczovL2V4Y2FsaWRyYXcuY29tOjQ0MyIsImZlYXR1cmUiOiJXZWJBcHBMaW5rQ2FwdHVyaW5nIiwiZXhwaXJ5IjoxNjM0MDgzMTk5fQ=="
-    />
-
-    <!-- File Handling (https://web.dev/file-handling/) -->
-    <meta
-      http-equiv="origin-trial"
-      content="AkMQsAnFmKfRfPKQHNCv2WmZREqgwkqhyt2M7aOwQiCStB+hPYnGnv+mNbkPDAsGXrwsj/waFi76wPzTDUaEeQ0AAABUeyJvcmlnaW4iOiJodHRwczovL2V4Y2FsaWRyYXcuY29tOjQ0MyIsImZlYXR1cmUiOiJGaWxlSGFuZGxpbmciLCJleHBpcnkiOjE2MzQwODMxOTl9"
-    />
-
     <!-- General tags -->
     <meta
       name="description"
@@ -129,7 +117,6 @@
 
         width: 100%;
         height: 100%;
-        overflow: hidden;
       }
 
       .visually-hidden {

public/manifest.json

@@ -26,7 +26,7 @@
       }
     }
   ],
-  "capture_links": "new-client",
+  "capture_links": "new_client",
   "share_target": {
     "action": "/web-share-target",
     "method": "POST",

scripts/autorelease.js

@@ -31,11 +31,9 @@ exec(`git diff --name-only HEAD^ HEAD`, async (error, stdout, stderr) => {
   const filesToIgnoreRegex = /src\/excalidraw-app|packages\/utils/;
 
   const excalidrawPackageFiles = changedFiles.filter((file) => {
-    return (
-      (file.indexOf("src") >= 0 || file.indexOf("package.json")) >= 0 &&
-      !filesToIgnoreRegex.test(file)
-    );
+    return file.indexOf("src") >= 0 && !filesToIgnoreRegex.test(file);
   });
+
   if (!excalidrawPackageFiles.length) {
     process.exit(0);
   }
@@ -48,5 +46,6 @@ exec(`git diff --name-only HEAD^ HEAD`, async (error, stdout, stderr) => {
   // update readme
   const data = fs.readFileSync(`${excalidrawDir}/README_NEXT.md`, "utf8");
   fs.writeFileSync(`${excalidrawDir}/README.md`, data, "utf8");
+
   publish();
 });

scripts/locales-coverage-description.js

@@ -38,8 +38,6 @@ const crowdinMap = {
   "zh-CN": "en-zhcn",
   "zh-TW": "en-zhtw",
   "lv-LV": "en-lv",
-  "cs-CZ": "en-cs",
-  "kk-KZ": "en-kk",
 };
 
 const flags = {
@@ -78,8 +76,6 @@ const flags = {
   "zh-CN": "🇨🇳",
   "zh-TW": "🇹🇼",
   "lv-LV": "🇱🇻",
-  "cs-CZ": "🇨🇿",
-  "kk-KZ": "🇰🇿",
 };
 
 const languages = {
@@ -118,8 +114,6 @@ const languages = {
   "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/actionAlign.tsx

@@ -1,3 +1,4 @@
+import React from "react";
 import { alignElements, Alignment } from "../align";
 import {
   AlignBottomIcon,

src/actions/actionCanvas.tsx

@@ -1,11 +1,15 @@
+import React from "react";
+import { getDefaultAppState } from "../appState";
 import { ColorPicker } from "../components/ColorPicker";
-import { zoomIn, zoomOut } from "../components/icons";
+import { resetZoom, trash, zoomIn, zoomOut } from "../components/icons";
 import { ToolButton } from "../components/ToolButton";
 import { DarkModeToggle } from "../components/DarkModeToggle";
-import { THEME, ZOOM_STEP } from "../constants";
+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 { CODES, KEYS } from "../keys";
 import { getNormalizedZoom, getSelectedElements } from "../scene";
 import { centerScrollOn } from "../scene/scroll";
@@ -13,17 +17,13 @@ import { getNewZoom } from "../scene/zoom";
 import { AppState, NormalizedZoomValue } from "../types";
 import { getShortcutKey } from "../utils";
 import { register } from "./register";
-import { Tooltip } from "../components/Tooltip";
-import { newElementWith } from "../element/mutateElement";
-import { getDefaultAppState } from "../appState";
-import ClearCanvas from "../components/ClearCanvas";
 
 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 +33,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>
@@ -47,15 +43,13 @@ export const actionChangeViewBackgroundColor = register({
 
 export const actionClearCanvas = register({
   name: "clearCanvas",
-  perform: (elements, appState, _, app) => {
-    app.imageCache.clear();
+  perform: (elements, appState: AppState) => {
     return {
       elements: elements.map((element) =>
         newElementWith(element, { isDeleted: true }),
       ),
       appState: {
         ...getDefaultAppState(),
-        files: {},
         theme: appState.theme,
         elementLocked: appState.elementLocked,
         exportBackground: appState.exportBackground,
@@ -67,8 +61,21 @@ export const actionClearCanvas = register({
       commitToHistory: true,
     };
   },
-
-  PanelComponent: ({ updateData }) => <ClearCanvas onConfirm={updateData} />,
+  PanelComponent: ({ updateData }) => (
+    <ToolButton
+      type="button"
+      icon={trash}
+      title={t("buttons.clearReset")}
+      aria-label={t("buttons.clearReset")}
+      showAriaLabel={useIsMobile()}
+      onClick={() => {
+        if (window.confirm(t("alerts.clearReset"))) {
+          updateData(null);
+        }
+      }}
+      data-testid="clear-canvas-button"
+    />
+  ),
 });
 
 export const actionZoomIn = register({
@@ -97,7 +104,6 @@ export const actionZoomIn = register({
       onClick={() => {
         updateData(null);
       }}
-      size="small"
     />
   ),
   keyTest: (event) =>
@@ -132,7 +138,6 @@ export const actionZoomOut = register({
       onClick={() => {
         updateData(null);
       }}
-      size="small"
     />
   ),
   keyTest: (event) =>
@@ -159,21 +164,16 @@ export const actionResetZoom = register({
       commitToHistory: false,
     };
   },
-  PanelComponent: ({ updateData, appState }) => (
-    <Tooltip label={t("buttons.resetZoom")}>
+  PanelComponent: ({ updateData }) => (
     <ToolButton
       type="button"
-        className="reset-zoom-button"
+      icon={resetZoom}
       title={t("buttons.resetZoom")}
       aria-label={t("buttons.resetZoom")}
       onClick={() => {
         updateData(null);
       }}
-        size="small"
-      >
-        {(appState.zoom.value * 100).toFixed(0)}%
-      </ToolButton>
-    </Tooltip>
+    />
   ),
   keyTest: (event) =>
     (event.code === CODES.ZERO || event.code === CODES.NUM_ZERO) &&
@@ -267,8 +267,7 @@ export const actionToggleTheme = register({
     return {
       appState: {
         ...appState,
-        theme:
-          value || (appState.theme === THEME.LIGHT ? THEME.DARK : THEME.LIGHT),
+        theme: value || (appState.theme === "light" ? "dark" : "light"),
       },
       commitToHistory: false,
     };

src/actions/actionClipboard.tsx

@@ -9,8 +9,8 @@ import { t } from "../i18n";
 
 export const actionCopy = register({
   name: "copy",
-  perform: (elements, appState, _, app) => {
-    copyToClipboard(getNonDeletedElements(elements), appState, app.files);
+  perform: (elements, appState) => {
+    copyToClipboard(getNonDeletedElements(elements), appState);
 
     return {
       commitToHistory: false,
@@ -50,7 +50,6 @@ export const actionCopyAsSvg = register({
           ? selectedElements
           : getNonDeletedElements(elements),
         appState,
-        app.files,
         appState,
       );
       return {
@@ -89,7 +88,6 @@ export const actionCopyAsPng = register({
           ? selectedElements
           : getNonDeletedElements(elements),
         appState,
-        app.files,
         appState,
       );
       return {

src/actions/actionDeleteSelected.tsx

@@ -1,6 +1,7 @@
 import { isSomeElementSelected } from "../scene";
 import { KEYS } from "../keys";
 import { ToolButton } from "../components/ToolButton";
+import React from "react";
 import { trash } from "../components/icons";
 import { t } from "../i18n";
 import { register } from "./register";

src/actions/actionDistribute.tsx

@@ -1,3 +1,4 @@
+import React from "react";
 import {
   DistributeHorizontallyIcon,
   DistributeVerticallyIcon,

src/actions/actionDuplicateSelection.tsx

@@ -1,3 +1,4 @@
+import React from "react";
 import { KEYS } from "../keys";
 import { register } from "./register";
 import { ExcalidrawElement } from "../element/types";

src/actions/actionExport.tsx

@@ -1,25 +1,18 @@
+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";
 import { Tooltip } from "../components/Tooltip";
-import { DarkModeToggle } from "../components/DarkModeToggle";
+import { DarkModeToggle, Appearence } from "../components/DarkModeToggle";
 import { loadFromJSON, saveAsJSON } from "../data";
-import { resaveAsImageWithScene } from "../data/resave";
 import { t } from "../i18n";
 import { useIsMobile } from "../components/App";
 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, THEME } from "../constants";
-import { getSelectedElements, isSomeElementSelected } from "../scene";
-import { getNonDeletedElements } from "../element";
-import { ActiveFile } from "../components/ActiveFile";
-import { isImageFileHandle } from "../data/blob";
-import { nativeFileSystemSupported } from "../data/filesystem";
-import { Theme } from "../element/types";
 
 export const actionChangeProjectName = register({
   name: "changeProjectName",
@@ -39,54 +32,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="small"
-              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) => {
@@ -120,29 +65,25 @@ export const actionChangeExportEmbedScene = register({
     >
       {t("labels.exportEmbedScene")}
       <Tooltip label={t("labels.exportEmbedScene_details")} long={true}>
-        <div className="excalidraw-tooltip-icon">{questionCircle}</div>
+        <div className="Tooltip-icon">{questionCircle}</div>
       </Tooltip>
     </CheckboxItem>
   ),
 });
 
-export const actionSaveToActiveFile = register({
-  name: "saveToActiveFile",
-  perform: async (elements, appState, value, app) => {
+export const actionSaveScene = register({
+  name: "saveScene",
+  perform: async (elements, appState, value) => {
     const fileHandleExists = !!appState.fileHandle;
-
     try {
-      const { fileHandle } = isImageFileHandle(appState.fileHandle)
-        ? await resaveAsImageWithScene(elements, appState, app.files)
-        : await saveAsJSON(elements, appState, app.files);
-
+      const { fileHandle } = await saveAsJSON(elements, appState);
       return {
         commitToHistory: false,
         appState: {
           ...appState,
           fileHandle,
           toastMessage: fileHandleExists
-            ? fileHandle?.name
+            ? fileHandle.name
               ? t("toast.fileSavedToFilename").replace(
                   "{filename}",
                   `"${fileHandle.name}"`,
@@ -160,26 +101,26 @@ 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="icon"
+      icon={save}
+      title={t("buttons.save")}
+      aria-label={t("buttons.save")}
+      onClick={() => updateData(null)}
+      data-testid="save-button"
     />
   ),
 });
 
-export const actionSaveFileToDisk = register({
-  name: "saveFileToDisk",
-  perform: async (elements, appState, value, app) => {
+export const actionSaveAsScene = register({
+  name: "saveAsScene",
+  perform: async (elements, appState, value) => {
     try {
-      const { fileHandle } = await saveAsJSON(
-        elements,
-        {
+      const { fileHandle } = await saveAsJSON(elements, {
         ...appState,
         fileHandle: null,
-        },
-        app.files,
-      );
+      });
       return { commitToHistory: false, appState: { ...appState, fileHandle } };
     } catch (error) {
       if (error?.name !== "AbortError") {
@@ -197,7 +138,7 @@ export const actionSaveFileToDisk = register({
       title={t("buttons.saveAs")}
       aria-label={t("buttons.saveAs")}
       showAriaLabel={useIsMobile()}
-      hidden={!nativeFileSystemSupported}
+      hidden={!fsSupported}
       onClick={() => updateData(null)}
       data-testid="save-as-button"
     />
@@ -206,17 +147,15 @@ export const actionSaveFileToDisk = register({
 
 export const actionLoadScene = register({
   name: "loadScene",
-  perform: async (elements, appState, _, app) => {
+  perform: async (elements, appState) => {
     try {
       const {
         elements: loadedElements,
         appState: loadedAppState,
-        files,
-      } = await loadFromJSON(appState, elements);
+      } = await loadFromJSON(appState);
       return {
         elements: loadedElements,
         appState: loadedAppState,
-        files,
         commitToHistory: true,
       };
     } catch (error) {
@@ -226,7 +165,6 @@ export const actionLoadScene = register({
       return {
         elements,
         appState: { ...appState, errorMessage: error.message },
-        files: app.files,
         commitToHistory: false,
       };
     }
@@ -263,9 +201,9 @@ export const actionExportWithDarkMode = register({
       }}
     >
       <DarkModeToggle
-        value={appState.exportWithDarkMode ? THEME.DARK : THEME.LIGHT}
-        onChange={(theme: Theme) => {
-          updateData(theme === THEME.DARK);
+        value={appState.exportWithDarkMode ? "dark" : "light"}
+        onChange={(theme: Appearence) => {
+          updateData(theme === "dark");
         }}
         title={t("labels.toggleExportColorScheme")}
       />

src/actions/actionFinalize.tsx

@@ -1,6 +1,7 @@
 import { KEYS } from "../keys";
 import { isInvisiblySmallElement } from "../element";
 import { resetCursor } from "../utils";
+import React from "react";
 import { ToolButton } from "../components/ToolButton";
 import { done } from "../components/icons";
 import { t } from "../i18n";
@@ -49,11 +50,6 @@ export const actionFinalize = register({
     }
 
     let newElements = elements;
-
-    if (appState.pendingImageElement) {
-      mutateElement(appState.pendingImageElement, { isDeleted: true }, false);
-    }
-
     if (window.document.activeElement instanceof HTMLElement) {
       focusContainer();
     }
@@ -157,7 +153,6 @@ export const actionFinalize = register({
                 [multiPointElement.id]: true,
               }
             : appState.selectedElementIds,
-        pendingImageElement: null,
       },
       commitToHistory: appState.elementType === "freedraw",
     };

src/actions/actionFlip.ts

@@ -93,13 +93,13 @@ const flipElements = (
   appState: AppState,
   flipDirection: "horizontal" | "vertical",
 ): ExcalidrawElement[] => {
-  elements.forEach((element) => {
-    flipElement(element, appState);
+  for (let i = 0; i < elements.length; i++) {
+    flipElement(elements[i], appState);
     // If vertical flip, rotate an extra 180
     if (flipDirection === "vertical") {
-      rotateElement(element, Math.PI);
+      rotateElement(elements[i], Math.PI);
+    }
   }
-  });
   return elements;
 };
 

src/actions/actionGroup.tsx

@@ -1,3 +1,4 @@
+import React from "react";
 import { CODES, KEYS } from "../keys";
 import { t } from "../i18n";
 import { getShortcutKey } from "../utils";

src/actions/actionHistory.tsx

@@ -1,4 +1,5 @@
 import { Action, ActionResult } from "./types";
+import React from "react";
 import { undo, redo } from "../components/icons";
 import { ToolButton } from "../components/ToolButton";
 import { t } from "../i18n";
@@ -68,13 +69,12 @@ export const createUndoAction: ActionCreator = (history) => ({
     event[KEYS.CTRL_OR_CMD] &&
     event.key.toLowerCase() === KEYS.Z &&
     !event.shiftKey,
-  PanelComponent: ({ updateData, data }) => (
+  PanelComponent: ({ updateData }) => (
     <ToolButton
       type="button"
       icon={undo}
       aria-label={t("buttons.undo")}
       onClick={updateData}
-      size={data?.size || "medium"}
     />
   ),
   commitToHistory: () => false,
@@ -89,13 +89,12 @@ export const createRedoAction: ActionCreator = (history) => ({
       event.shiftKey &&
       event.key.toLowerCase() === KEYS.Z) ||
     (isWindows && event.ctrlKey && !event.shiftKey && event.key === KEYS.Y),
-  PanelComponent: ({ updateData, data }) => (
+  PanelComponent: ({ updateData }) => (
     <ToolButton
       type="button"
       icon={redo}
       aria-label={t("buttons.redo")}
       onClick={updateData}
-      size={data?.size || "medium"}
     />
   ),
   commitToHistory: () => false,

src/actions/actionMenu.tsx

@@ -1,3 +1,4 @@
+import React from "react";
 import { menu, palette } from "../components/icons";
 import { ToolButton } from "../components/ToolButton";
 import { t } from "../i18n";

src/actions/actionNavigate.tsx

@@ -1,3 +1,4 @@
+import React from "react";
 import { getClientColors, getClientInitials } from "../clients";
 import { Avatar } from "../components/Avatar";
 import { centerScrollOn } from "../scene/scroll";
@@ -29,8 +30,8 @@ export const actionGoToCollaborator = register({
       commitToHistory: false,
     };
   },
-  PanelComponent: ({ appState, updateData, data }) => {
-    const clientId: string | undefined = data?.id;
+  PanelComponent: ({ appState, updateData, id }) => {
+    const clientId = id;
     if (!clientId) {
       return null;
     }

src/actions/actionProperties.tsx

@@ -1,3 +1,4 @@
+import React from "react";
 import { AppState } from "../../src/types";
 import { ButtonIconSelect } from "../components/ButtonIconSelect";
 import { ColorPicker } from "../components/ColorPicker";
@@ -12,13 +13,6 @@ import {
   FillCrossHatchIcon,
   FillHachureIcon,
   FillSolidIcon,
-  FontFamilyCodeIcon,
-  FontFamilyHandDrawnIcon,
-  FontFamilyNormalIcon,
-  FontSizeExtraLargeIcon,
-  FontSizeLargeIcon,
-  FontSizeMediumIcon,
-  FontSizeSmallIcon,
   SloppinessArchitectIcon,
   SloppinessArtistIcon,
   SloppinessCartoonistIcon,
@@ -26,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,
@@ -47,7 +44,7 @@ import {
   ExcalidrawElement,
   ExcalidrawLinearElement,
   ExcalidrawTextElement,
-  FontFamilyValues,
+  FontFamily,
   TextAlign,
 } from "../element/types";
 import { getLanguage, t } from "../i18n";
@@ -59,7 +56,6 @@ import {
   getTargetElements,
   isSomeElementSelected,
 } from "../scene";
-import { hasStrokeColor } from "../scene/comparisons";
 import { register } from "./register";
 
 const changeProperty = (
@@ -103,20 +99,13 @@ export const actionChangeStrokeColor = register({
   name: "changeStrokeColor",
   perform: (elements, appState, value) => {
     return {
-      ...(value.currentItemStrokeColor && {
-        elements: changeProperty(elements, appState, (el) => {
-          return hasStrokeColor(el.type)
-            ? newElementWith(el, {
-                strokeColor: value.currentItemStrokeColor,
-              })
-            : el;
+      elements: changeProperty(elements, appState, (el) =>
+        newElementWith(el, {
+          strokeColor: value,
         }),
-      }),
-      appState: {
-        ...appState,
-        ...value,
-      },
-      commitToHistory: !!value.currentItemStrokeColor,
+      ),
+      appState: { ...appState, currentItemStrokeColor: value },
+      commitToHistory: true,
     };
   },
   PanelComponent: ({ elements, appState, updateData }) => (
@@ -131,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}
       />
     </>
   ),
@@ -145,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,
+          backgroundColor: value,
         }),
       ),
-      }),
-      appState: {
-        ...appState,
-        ...value,
-      },
-      commitToHistory: !!value.currentItemBackgroundColor,
+      appState: { ...appState, currentItemBackgroundColor: value },
+      commitToHistory: true,
     };
   },
   PanelComponent: ({ elements, appState, updateData }) => (
@@ -171,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}
       />
     </>
   ),
@@ -505,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} />,
       },
@@ -530,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/actionToggleViewMode.tsx

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

src/actions/index.ts

@@ -34,8 +34,8 @@ export { actionFinalize } from "./actionFinalize";
 export {
   actionChangeProjectName,
   actionChangeExportBackground,
-  actionSaveToActiveFile,
-  actionSaveFileToDisk,
+  actionSaveScene,
+  actionSaveAsScene,
   actionLoadScene,
 } from "./actionExport";
 

src/actions/manager.tsx

@@ -5,11 +5,20 @@ import {
   UpdaterFn,
   ActionName,
   ActionResult,
-  PanelComponentProps,
 } from "./types";
 import { ExcalidrawElement } from "../element/types";
-import { AppClassProperties, AppState } from "../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;
+};
 
 export class ActionManager implements ActionsManagerInterface {
   actions = {} as ActionsManagerInterface["actions"];
@@ -18,13 +27,13 @@ export class ActionManager implements ActionsManagerInterface {
 
   getAppState: () => Readonly<AppState>;
   getElementsIncludingDeleted: () => readonly ExcalidrawElement[];
-  app: AppClassProperties;
+  app: App;
 
   constructor(
     updater: UpdaterFn,
     getAppState: () => AppState,
     getElementsIncludingDeleted: () => readonly ExcalidrawElement[],
-    app: AppClassProperties,
+    app: App,
   ) {
     this.updater = (actionResult) => {
       if (actionResult && "then" in actionResult) {
@@ -98,10 +107,11 @@ export class ActionManager implements ActionsManagerInterface {
     );
   }
 
-  /**
-   * @param data additional data sent to the PanelComponent
-   */
-  renderAction = (name: ActionName, data?: PanelComponentProps["data"]) => {
+  // Id is an attribute that we can use to pass in data like keys.
+  // This is needed for dynamically generated action components
+  // like the user list. We can use this key to extract more
+  // data from app state. This is an alternative to generic prop hell!
+  renderAction = (name: ActionName, id?: string) => {
     const canvasActions = this.app.props.UIOptions.canvasActions;
 
     if (
@@ -129,8 +139,8 @@ export class ActionManager implements ActionsManagerInterface {
           elements={this.getElementsIncludingDeleted()}
           appState={this.getAppState()}
           updateData={updateData}
+          id={id}
           appProps={this.app.props}
-          data={data}
         />
       );
     }

src/actions/types.ts

@@ -1,12 +1,7 @@
 import React from "react";
 import { ExcalidrawElement } from "../element/types";
-import {
-  AppClassProperties,
-  AppState,
-  ExcalidrawProps,
-  BinaryFiles,
-} from "../types";
-import { ToolButtonSize } from "../components/ToolButton";
+import { AppState, ExcalidrawProps } from "../types";
+import Library from "../data/library";
 
 /** if false, the action should be prevented */
 export type ActionResult =
@@ -16,18 +11,22 @@ export type ActionResult =
         AppState,
         "offsetTop" | "offsetLeft" | "width" | "height"
       > | null;
-      files?: BinaryFiles | null;
       commitToHistory: boolean;
       syncHistory?: boolean;
-      replaceFiles?: boolean;
     }
   | false;
 
+type AppAPI = {
+  canvas: HTMLCanvasElement | null;
+  focusContainer(): void;
+  library: Library;
+};
+
 type ActionFn = (
   elements: readonly ExcalidrawElement[],
   appState: Readonly<AppState>,
   formData: any,
-  app: AppClassProperties,
+  app: AppAPI,
 ) => ActionResult | Promise<ActionResult>;
 
 export type UpdaterFn = (res: ActionResult) => void;
@@ -67,9 +66,8 @@ export type ActionName =
   | "changeProjectName"
   | "changeExportBackground"
   | "changeExportEmbedScene"
-  | "changeExportScale"
-  | "saveToActiveFile"
-  | "saveFileToDisk"
+  | "saveScene"
+  | "saveAsScene"
   | "loadScene"
   | "duplicateSelection"
   | "deleteSelectedElements"
@@ -103,17 +101,15 @@ export type ActionName =
   | "exportWithDarkMode"
   | "toggleTheme";
 
-export type PanelComponentProps = {
+export interface Action {
+  name: ActionName;
+  PanelComponent?: React.FC<{
     elements: readonly ExcalidrawElement[];
     appState: AppState;
     updateData: (formData?: any) => void;
     appProps: ExcalidrawProps;
-  data?: Partial<{ id: string; size: ToolButtonSize }>;
-};
-
-export interface Action {
-  name: ActionName;
-  PanelComponent?: React.FC<PanelComponentProps>;
+    id?: string;
+  }>;
   perform: ActionFn;
   keyPriority?: number;
   keyTest?: (

src/appState.ts

@@ -3,23 +3,17 @@ import {
   DEFAULT_FONT_FAMILY,
   DEFAULT_FONT_SIZE,
   DEFAULT_TEXT_ALIGN,
-  EXPORT_SCALES,
-  THEME,
 } 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 {
-    theme: THEME.LIGHT,
+    theme: "light",
     collaborators: new Map(),
     currentChartType: "bar",
     currentItemBackgroundColor: "transparent",
@@ -45,7 +39,6 @@ export const getDefaultAppState = (): Omit<
     elementType: "selection",
     errorMessage: null,
     exportBackground: true,
-    exportScale: defaultExportScale,
     exportEmbedScene: false,
     exportWithDarkMode: false,
     fileHandle: null,
@@ -59,7 +52,6 @@ export const getDefaultAppState = (): Omit<
     multiElement: null,
     name: `${t("labels.untitled")}-${getDateTime()}`,
     openMenu: null,
-    openPopup: null,
     pasteDialog: { shown: false, data: null },
     previousSelectedElementIds: {},
     resizingElement: null,
@@ -79,7 +71,6 @@ export const getDefaultAppState = (): Omit<
     zenModeEnabled: false,
     zoom: { value: 1 as NormalizedZoomValue, translation: { x: 0, y: 0 } },
     viewModeEnabled: false,
-    pendingImageElement: null,
   };
 };
 
@@ -93,87 +84,76 @@ const APP_STATE_STORAGE_CONF = (<
     browser: boolean;
     /** whether to keep when exporting to file/database */
     export: boolean;
-    /** server (shareLink/collab/...) */
-    server: boolean;
   },
   T extends Record<keyof AppState, Values>
 >(
   config: { [K in keyof T]: K extends keyof AppState ? T[K] : never },
 ) => config)({
-  theme: { browser: true, export: false, server: false },
-  collaborators: { browser: false, export: false, server: false },
-  currentChartType: { browser: true, export: false, server: false },
-  currentItemBackgroundColor: { browser: true, export: false, server: false },
-  currentItemEndArrowhead: { browser: true, export: false, server: false },
-  currentItemFillStyle: { browser: true, export: false, server: false },
-  currentItemFontFamily: { browser: true, export: false, server: false },
-  currentItemFontSize: { browser: true, export: false, server: false },
-  currentItemLinearStrokeSharpness: {
-    browser: true,
-    export: false,
-    server: false,
-  },
-  currentItemOpacity: { browser: true, export: false, server: false },
-  currentItemRoughness: { browser: true, export: false, server: false },
-  currentItemStartArrowhead: { browser: true, export: false, server: false },
-  currentItemStrokeColor: { browser: true, export: false, server: false },
-  currentItemStrokeSharpness: { browser: true, export: false, server: false },
-  currentItemStrokeStyle: { browser: true, export: false, server: false },
-  currentItemStrokeWidth: { browser: true, export: false, server: false },
-  currentItemTextAlign: { browser: true, export: false, server: false },
-  cursorButton: { browser: true, export: false, server: false },
-  draggingElement: { browser: false, export: false, server: false },
-  editingElement: { browser: false, export: false, server: false },
-  editingGroupId: { browser: true, export: false, server: false },
-  editingLinearElement: { browser: false, export: false, server: false },
-  elementLocked: { browser: true, export: false, server: false },
-  elementType: { browser: true, export: false, server: false },
-  errorMessage: { browser: false, export: false, server: false },
-  exportBackground: { browser: true, export: false, server: false },
-  exportEmbedScene: { browser: true, export: false, server: false },
-  exportScale: { browser: true, export: false, server: false },
-  exportWithDarkMode: { browser: true, export: false, server: false },
-  fileHandle: { browser: false, export: false, server: false },
-  gridSize: { browser: true, export: true, server: true },
-  height: { browser: false, export: false, server: false },
-  isBindingEnabled: { browser: false, export: false, server: false },
-  isLibraryOpen: { browser: false, export: false, server: false },
-  isLoading: { browser: false, export: false, server: false },
-  isResizing: { browser: false, export: false, server: false },
-  isRotating: { browser: false, export: false, server: false },
-  lastPointerDownWith: { browser: true, export: false, server: false },
-  multiElement: { browser: false, export: false, server: false },
-  name: { browser: true, export: false, server: false },
-  offsetLeft: { browser: false, export: false, server: false },
-  offsetTop: { browser: false, export: false, server: false },
-  openMenu: { browser: true, export: false, server: false },
-  openPopup: { browser: false, export: false, server: false },
-  pasteDialog: { browser: false, export: false, server: false },
-  previousSelectedElementIds: { browser: true, export: false, server: false },
-  resizingElement: { browser: false, export: false, server: false },
-  scrolledOutside: { browser: true, export: false, server: false },
-  scrollX: { browser: true, export: false, server: false },
-  scrollY: { browser: true, export: false, server: false },
-  selectedElementIds: { browser: true, export: false, server: false },
-  selectedGroupIds: { browser: true, export: false, server: false },
-  selectionElement: { browser: false, export: false, server: false },
-  shouldCacheIgnoreZoom: { browser: true, export: false, server: false },
-  showHelpDialog: { browser: false, export: false, server: false },
-  showStats: { browser: true, export: false, server: false },
-  startBoundElement: { browser: false, export: false, server: false },
-  suggestedBindings: { browser: false, export: false, server: false },
-  toastMessage: { browser: false, export: false, server: false },
-  viewBackgroundColor: { browser: true, export: true, server: true },
-  width: { browser: false, export: false, server: false },
-  zenModeEnabled: { browser: true, export: false, server: false },
-  zoom: { browser: true, export: false, server: false },
-  viewModeEnabled: { browser: false, export: false, server: false },
-  pendingImageElement: { browser: false, export: false, server: false },
+  theme: { browser: true, export: false },
+  collaborators: { browser: false, export: false },
+  currentChartType: { browser: true, export: false },
+  currentItemBackgroundColor: { browser: true, export: false },
+  currentItemEndArrowhead: { browser: true, export: false },
+  currentItemFillStyle: { browser: true, export: false },
+  currentItemFontFamily: { browser: true, export: false },
+  currentItemFontSize: { browser: true, export: false },
+  currentItemLinearStrokeSharpness: { browser: true, export: false },
+  currentItemOpacity: { browser: true, export: false },
+  currentItemRoughness: { browser: true, export: false },
+  currentItemStartArrowhead: { browser: true, export: false },
+  currentItemStrokeColor: { browser: true, export: false },
+  currentItemStrokeSharpness: { browser: true, export: false },
+  currentItemStrokeStyle: { browser: true, export: false },
+  currentItemStrokeWidth: { browser: true, export: false },
+  currentItemTextAlign: { browser: true, export: false },
+  cursorButton: { browser: true, export: false },
+  draggingElement: { browser: false, export: false },
+  editingElement: { browser: false, export: false },
+  editingGroupId: { browser: true, export: false },
+  editingLinearElement: { browser: false, export: false },
+  elementLocked: { browser: true, export: false },
+  elementType: { browser: true, export: false },
+  errorMessage: { browser: false, export: false },
+  exportBackground: { browser: true, export: false },
+  exportEmbedScene: { browser: true, export: false },
+  exportWithDarkMode: { browser: true, export: false },
+  fileHandle: { browser: false, export: false },
+  gridSize: { browser: true, export: true },
+  height: { browser: false, export: false },
+  isBindingEnabled: { browser: false, export: false },
+  isLibraryOpen: { browser: false, export: false },
+  isLoading: { browser: false, export: false },
+  isResizing: { browser: false, export: false },
+  isRotating: { browser: false, export: false },
+  lastPointerDownWith: { browser: true, export: false },
+  multiElement: { browser: false, export: false },
+  name: { browser: true, export: false },
+  offsetLeft: { browser: false, export: false },
+  offsetTop: { browser: false, export: false },
+  openMenu: { browser: true, export: false },
+  pasteDialog: { browser: false, export: false },
+  previousSelectedElementIds: { browser: true, export: false },
+  resizingElement: { browser: false, export: false },
+  scrolledOutside: { browser: true, export: false },
+  scrollX: { browser: true, export: false },
+  scrollY: { browser: true, export: false },
+  selectedElementIds: { browser: true, export: false },
+  selectedGroupIds: { browser: true, export: false },
+  selectionElement: { browser: false, export: false },
+  shouldCacheIgnoreZoom: { browser: true, export: false },
+  showHelpDialog: { browser: false, export: false },
+  showStats: { browser: true, export: false },
+  startBoundElement: { browser: false, export: false },
+  suggestedBindings: { browser: false, export: false },
+  toastMessage: { browser: false, export: false },
+  viewBackgroundColor: { browser: true, export: true },
+  width: { browser: false, export: false },
+  zenModeEnabled: { browser: true, export: false },
+  zoom: { browser: true, export: false },
+  viewModeEnabled: { browser: false, export: false },
 });
 
-const _clearAppStateForStorage = <
-  ExportType extends "export" | "browser" | "server"
->(
+const _clearAppStateForStorage = <ExportType extends "export" | "browser">(
   appState: Partial<AppState>,
   exportType: ExportType,
 ) => {
@@ -186,10 +166,8 @@ const _clearAppStateForStorage = <
   for (const key of Object.keys(appState) as (keyof typeof appState)[]) {
     const propConfig = APP_STATE_STORAGE_CONF[key];
     if (propConfig?.[exportType]) {
-      const nextValue = appState[key];
-
-      // https://github.com/microsoft/TypeScript/issues/31445
-      (stateForExport as any)[key] = nextValue;
+      // @ts-ignore see https://github.com/microsoft/TypeScript/issues/31445
+      stateForExport[key] = appState[key];
     }
   }
   return stateForExport;
@@ -202,7 +180,3 @@ export const clearAppStateForLocalStorage = (appState: Partial<AppState>) => {
 export const cleanAppStateForExport = (appState: Partial<AppState>) => {
   return _clearAppStateForStorage(appState, "export");
 };
-
-export const clearAppStateForDatabase = (appState: Partial<AppState>) => {
-  return _clearAppStateForStorage(appState, "server");
-};

src/clipboard.ts

@@ -3,22 +3,19 @@ import {
   NonDeletedExcalidrawElement,
 } from "./element/types";
 import { getSelectedElements } from "./scene";
-import { AppState, BinaryFiles } from "./types";
+import { AppState } from "./types";
 import { SVG_EXPORT_TAG } from "./scene/export";
 import { tryParseSpreadsheet, Spreadsheet, VALID_SPREADSHEET } from "./charts";
-import { EXPORT_DATA_TYPES, MIME_TYPES } from "./constants";
-import { isInitializedImageElement } from "./element/typeChecks";
+import { EXPORT_DATA_TYPES } from "./constants";
 
 type ElementsClipboard = {
   type: typeof EXPORT_DATA_TYPES.excalidrawClipboard;
   elements: ExcalidrawElement[];
-  files: BinaryFiles | undefined;
 };
 
 export interface ClipboardData {
   spreadsheet?: Spreadsheet;
   elements?: readonly ExcalidrawElement[];
-  files?: BinaryFiles;
   text?: string;
   errorMessage?: string;
 }
@@ -40,7 +37,7 @@ export const probablySupportsClipboardBlob =
 
 const clipboardContainsElements = (
   contents: any,
-): contents is { elements: ExcalidrawElement[]; files?: BinaryFiles } => {
+): contents is { elements: ExcalidrawElement[] } => {
   if (
     [
       EXPORT_DATA_TYPES.excalidraw,
@@ -56,18 +53,10 @@ const clipboardContainsElements = (
 export const copyToClipboard = async (
   elements: readonly NonDeletedExcalidrawElement[],
   appState: AppState,
-  files: BinaryFiles,
 ) => {
-  const selectedElements = getSelectedElements(elements, appState);
   const contents: ElementsClipboard = {
     type: EXPORT_DATA_TYPES.excalidrawClipboard,
-    elements: selectedElements,
-    files: selectedElements.reduce((acc, element) => {
-      if (isInitializedImageElement(element) && files[element.fileId]) {
-        acc[element.fileId] = files[element.fileId];
-      }
-      return acc;
-    }, {} as BinaryFiles),
+    elements: getSelectedElements(elements, appState),
   };
   const json = JSON.stringify(contents);
   CLIPBOARD = json;
@@ -149,10 +138,7 @@ export const parseClipboard = async (
   try {
     const systemClipboardData = JSON.parse(systemClipboard);
     if (clipboardContainsElements(systemClipboardData)) {
-      return {
-        elements: systemClipboardData.elements,
-        files: systemClipboardData.files,
-      };
+      return { elements: systemClipboardData.elements };
     }
     return appClipboardData;
   } catch {
@@ -167,7 +153,7 @@ export const parseClipboard = async (
 
 export const copyBlobToClipboardAsPng = async (blob: Blob) => {
   await navigator.clipboard.write([
-    new window.ClipboardItem({ [MIME_TYPES.png]: blob }),
+    new window.ClipboardItem({ "image/png": blob }),
   ]);
 };
 

src/components/Actions.tsx

@@ -1,7 +1,7 @@
 import React from "react";
 import { ActionManager } from "../actions/manager";
 import { getNonDeletedElements } from "../element";
-import { ExcalidrawElement, PointerType } from "../element/types";
+import { ExcalidrawElement } from "../element/types";
 import { t } from "../i18n";
 import { useIsMobile } from "../components/App";
 import {
@@ -18,7 +18,6 @@ import { AppState, Zoom } from "../types";
 import { capitalizeString, isTransparent, setCursorForShape } from "../utils";
 import Stack from "./Stack";
 import { ToolButton } from "./ToolButton";
-import { hasStrokeColor } from "../scene/comparisons";
 
 export const SelectedShapeActions = ({
   appState,
@@ -49,22 +48,9 @@ export const SelectedShapeActions = ({
     hasBackground(elementType) ||
     targetElements.some((element) => hasBackground(element.type));
 
-  let commonSelectedType: string | null = targetElements[0]?.type || null;
-
-  for (const element of targetElements) {
-    if (element.type !== commonSelectedType) {
-      commonSelectedType = null;
-      break;
-    }
-  }
-
   return (
     <div className="panelColumn">
-      {((hasStrokeColor(elementType) &&
-        elementType !== "image" &&
-        commonSelectedType !== "image") ||
-        targetElements.some((element) => hasStrokeColor(element.type))) &&
-        renderAction("changeStrokeColor")}
+      {renderAction("changeStrokeColor")}
       {showChangeBackgroundIcons && renderAction("changeBackgroundColor")}
       {showFillIcons && renderAction("changeFillStyle")}
 
@@ -165,24 +151,31 @@ 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,
-  onImageAction,
+  isLibraryOpen,
 }: {
   canvas: HTMLCanvasElement | null;
   elementType: ExcalidrawElement["type"];
   setAppState: React.Component<any, AppState>["setState"];
-  onImageAction: (data: { pointerType: PointerType | null }) => void;
+  isLibraryOpen: boolean;
 }) => (
   <>
     {SHAPES.map(({ value, icon, key }, index) => {
       const label = t(`toolBar.${value}`);
-      const letter = key && (typeof key === "string" ? key : key[0]);
-      const shortcut = letter
-        ? `${capitalizeString(letter)} ${t("helpDialog.or")} ${index + 1}`
-        : `${index + 1}`;
+      const letter = typeof key === "string" ? key : key[0];
+      const shortcut = `${capitalizeString(letter)} ${t("helpDialog.or")} ${
+        index + 1
+      }`;
       return (
         <ToolButton
           className="Shape"
@@ -196,20 +189,31 @@ export const ShapesSwitcher = ({
           aria-label={capitalizeString(label)}
           aria-keyshortcuts={shortcut}
           data-testid={value}
-          onChange={({ pointerType }) => {
+          onChange={() => {
             setAppState({
               elementType: value,
               multiElement: null,
               selectedElementIds: {},
             });
             setCursorForShape(canvas, value);
-            if (value === "image") {
-              onImageAction({ pointerType });
-            }
+            setAppState({});
           }}
         />
       );
     })}
+    <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 });
+      }}
+    />
   </>
 );
 
@@ -222,9 +226,12 @@ export const ZoomActions = ({
 }) => (
   <Stack.Col gap={1}>
     <Stack.Row gap={1} align="center">
-      {renderAction("zoomOut")}
       {renderAction("zoomIn")}
+      {renderAction("zoomOut")}
       {renderAction("resetZoom")}
+      <div style={{ marginInlineStart: 4 }}>
+        {(zoom.value * 100).toFixed(0)}%
+      </div>
     </Stack.Row>
   </Stack.Col>
 );

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,28 +0,0 @@
-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

@@ -16,5 +16,10 @@ export const BackgroundPickerAndDarkModeToggle = ({
   <div style={{ display: "flex" }}>
     {actionManager.renderAction("changeViewBackgroundColor")}
     {showThemeBtn && actionManager.renderAction("toggleTheme")}
+    {appState.fileHandle && (
+      <div style={{ marginInlineStart: "0.25rem" }}>
+        {actionManager.renderAction("saveScene")}
+      </div>
+    )}
   </div>
 );

src/components/ButtonIconSelect.tsx

@@ -1,3 +1,4 @@
+import React from "react";
 import clsx from "clsx";
 
 // TODO: It might be "clever" to add option.icon to the existing component <ButtonSelect />

src/components/ButtonSelect.tsx

@@ -1,3 +1,4 @@
+import React from "react";
 import clsx from "clsx";
 
 export const ButtonSelect = <T extends Object>({

src/components/Card.scss

@@ -48,10 +48,6 @@
       .ToolIcon__label {
         color: $oc-white;
       }
-
-      .Spinner {
-        --spinner-color: #fff;
-      }
     }
   }
 }

src/components/CheckboxItem.scss

@@ -81,7 +81,7 @@
       align-items: center;
     }
 
-    .excalidraw-tooltip-icon {
+    .Tooltip-icon {
       width: 1em;
       height: 1em;
     }

src/components/CheckboxItem.tsx

@@ -1,4 +1,3 @@
-import React from "react";
 import clsx from "clsx";
 import { checkIcon } from "./icons";
 

src/components/ClearCanvas.scss

@@ -1,42 +0,0 @@
-@import "../css/variables.module";
-
-.excalidraw {
-  .clear-canvas {
-    &-buttons {
-      display: flex;
-      padding: 0.2rem 0;
-      justify-content: flex-end;
-
-      .ToolIcon__icon {
-        min-width: 2.5rem;
-        width: auto;
-        font-size: 1rem;
-      }
-
-      .ToolIcon_type_button {
-        margin-left: 1.5rem;
-        padding: 0 0.5rem;
-      }
-    }
-
-    &__content {
-      font-size: 1rem;
-    }
-
-    &--confirm.ToolIcon_type_button {
-      background-color: $oc-red-6;
-
-      &:hover {
-        background-color: $oc-red-8;
-      }
-
-      .ToolIcon__icon {
-        color: $oc-white;
-      }
-    }
-
-    &--cancel.ToolIcon_type_button {
-      background-color: $oc-gray-2;
-    }
-  }
-}

src/components/ClearCanvas.tsx

@@ -1,67 +0,0 @@
-import { useState } from "react";
-import { t } from "../i18n";
-import { useIsMobile } from "./App";
-import { Dialog } from "./Dialog";
-import { trash } from "./icons";
-import { ToolButton } from "./ToolButton";
-
-import "./ClearCanvas.scss";
-
-const ClearCanvas = ({ onConfirm }: { onConfirm: () => void }) => {
-  const [showDialog, setShowDialog] = useState(false);
-  const toggleDialog = () => {
-    setShowDialog(!showDialog);
-  };
-
-  return (
-    <>
-      <ToolButton
-        type="button"
-        icon={trash}
-        title={t("buttons.clearReset")}
-        aria-label={t("buttons.clearReset")}
-        showAriaLabel={useIsMobile()}
-        onClick={toggleDialog}
-        data-testid="clear-canvas-button"
-      />
-
-      {showDialog && (
-        <Dialog
-          onCloseRequest={toggleDialog}
-          title={t("clearCanvasDialog.title")}
-          className="clear-canvas"
-          small={true}
-        >
-          <>
-            <p className="clear-canvas__content"> {t("alerts.clearReset")}</p>
-            <div className="clear-canvas-buttons">
-              <ToolButton
-                type="button"
-                title={t("buttons.clear")}
-                aria-label={t("buttons.clear")}
-                label={t("buttons.clear")}
-                onClick={() => {
-                  onConfirm();
-                  toggleDialog();
-                }}
-                data-testid="confirm-clear-canvas-button"
-                className="clear-canvas--confirm"
-              />
-              <ToolButton
-                type="button"
-                title={t("buttons.cancel")}
-                aria-label={t("buttons.cancel")}
-                label={t("buttons.cancel")}
-                onClick={toggleDialog}
-                data-testid="cancel-clear-canvas-button"
-                className="clear-canvas--cancel"
-              />
-            </div>
-          </>
-        </Dialog>
-      )}
-    </>
-  );
-};
-
-export default ClearCanvas;

src/components/CollabButton.tsx

@@ -1,3 +1,4 @@
+import React from "react";
 import clsx from "clsx";
 import { ToolButton } from "./ToolButton";
 import { t } from "../i18n";

src/components/ColorPicker.tsx

@@ -1,6 +1,5 @@
 import React from "react";
 import { Popover } from "./Popover";
-import { isTransparent } from "../utils";
 
 import "./ColorPicker.scss";
 import { isArrowKey, KEYS } from "../keys";
@@ -15,7 +14,7 @@ const isValidColor = (color: string) => {
 };
 
 const getColor = (color: string): string | null => {
-  if (isTransparent(color)) {
+  if (color === "transparent") {
     return color;
   }
 
@@ -138,19 +137,15 @@ const Picker = ({
         }}
         tabIndex={0}
       >
-        {colors.map((_color, i) => {
-          const _colorWithoutHash = _color.replace("#", "");
-          return (
+        {colors.map((_color, i) => (
           <button
             className="color-picker-swatch"
             onClick={(event) => {
               (event.currentTarget as HTMLButtonElement).focus();
               onChange(_color);
             }}
-              title={`${t(`colors.${_colorWithoutHash}`)}${
-                !isTransparent(_color) ? ` (${_color})` : ""
-              } — ${keyBindings[i].toUpperCase()}`}
-              aria-label={t(`colors.${_colorWithoutHash}`)}
+            title={`${_color} — ${keyBindings[i].toUpperCase()}`}
+            aria-label={_color}
             aria-keyshortcuts={keyBindings[i]}
             style={{ color: _color }}
             key={_color}
@@ -166,13 +161,12 @@ const Picker = ({
               onChange(_color);
             }}
           >
-              {isTransparent(_color) ? (
+            {_color === "transparent" ? (
               <div className="color-picker-transparent"></div>
             ) : undefined}
             <span className="color-picker-keybinding">{keyBindings[i]}</span>
           </button>
-          );
-        })}
+        ))}
         {showInput && (
           <ColorInput
             color={color}
@@ -244,16 +238,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.tsx

@@ -1,3 +1,4 @@
+import React from "react";
 import { render, unmountComponentAtNode } from "react-dom";
 import clsx from "clsx";
 import { Popover } from "./Popover";

src/components/DarkModeToggle.tsx

@@ -1,15 +1,16 @@
 import "./ToolIcon.scss";
 
+import React from "react";
 import { t } from "../i18n";
 import { ToolButton } from "./ToolButton";
-import { THEME } from "../constants";
-import { Theme } from "../element/types";
+
+export type Appearence = "light" | "dark";
 
 // We chose to use only explicit toggle and not a third option for system value,
 // but this could be added in the future.
 export const DarkModeToggle = (props: {
-  value: Theme;
-  onChange: (value: Theme) => void;
+  value: Appearence;
+  onChange: (value: Appearence) => void;
   title?: string;
 }) => {
   const title =
@@ -19,12 +20,10 @@ export const DarkModeToggle = (props: {
   return (
     <ToolButton
       type="icon"
-      icon={props.value === THEME.LIGHT ? ICONS.MOON : ICONS.SUN}
+      icon={props.value === "light" ? ICONS.MOON : ICONS.SUN}
       title={title}
       aria-label={title}
-      onClick={() =>
-        props.onChange(props.value === THEME.DARK ? THEME.LIGHT : THEME.DARK)
-      }
+      onClick={() => props.onChange(props.value === "dark" ? "light" : "dark")}
       data-testid="toggle-dark-mode"
     />
   );

src/components/Dialog.tsx

@@ -2,7 +2,7 @@ import clsx from "clsx";
 import React, { useEffect, useState } from "react";
 import { useCallbackRefState } from "../hooks/useCallbackRefState";
 import { t } from "../i18n";
-import { useExcalidrawContainer, useIsMobile } from "../components/App";
+import { useIsMobile } from "../components/App";
 import { KEYS } from "../keys";
 import "./Dialog.scss";
 import { back, close } from "./icons";
@@ -21,7 +21,6 @@ export const Dialog = (props: {
 }) => {
   const [islandNode, setIslandNode] = useCallbackRefState<HTMLDivElement>();
   const [lastActiveElement] = useState(document.activeElement);
-  const { id } = useExcalidrawContainer();
 
   useEffect(() => {
     if (!islandNode) {
@@ -83,7 +82,7 @@ export const Dialog = (props: {
       theme={props.theme}
     >
       <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"

src/components/ErrorDialog.tsx

@@ -12,7 +12,7 @@ export const ErrorDialog = ({
   onClose?: () => void;
 }) => {
   const [modalIsShown, setModalIsShown] = useState(!!message);
-  const { container: excalidrawContainer } = useExcalidrawContainer();
+  const excalidrawContainer = useExcalidrawContainer();
 
   const handleClose = React.useCallback(() => {
     setModalIsShown(false);

src/components/ExportDialog.scss

@@ -97,8 +97,7 @@
 
     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);
+    box-shadow: 0 3px 5px -1px rgb(0 0 0 / 28%), 0 6px 10px 0 rgb(0 0 0 / 14%);
 
     font-family: Cascadia;
     font-size: 1.8em;

src/components/HelpDialog.tsx

@@ -157,15 +157,6 @@ export const HelpDialog = ({ onClose }: { onClose?: () => void }) => {
                   shortcuts={["Shift+P", "7"]}
                 />
                 <Shortcut label={t("toolBar.text")} shortcuts={["T", "8"]} />
-                <Shortcut label={t("toolBar.image")} shortcuts={["9"]} />
-                <Shortcut label={t("toolBar.library")} shortcuts={["0"]} />
-                <Shortcut
-                  label={t("helpDialog.editSelectedShape")}
-                  shortcuts={[
-                    getShortcutKey("Enter"),
-                    t("helpDialog.doubleClick"),
-                  ]}
-                />
                 <Shortcut
                   label={t("helpDialog.textNewLine")}
                   shortcuts={[
@@ -374,14 +365,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/HelpIcon.tsx

@@ -1,3 +1,4 @@
+import React from "react";
 import { questionCircle } from "../components/icons";
 
 type HelpIconProps = {

src/components/HintViewer.tsx

@@ -1,14 +1,11 @@
+import React from "react";
 import { t } from "../i18n";
 import { NonDeletedExcalidrawElement } from "../element/types";
 import { getSelectedElements } from "../scene";
 
 import "./HintViewer.scss";
 import { AppState } from "../types";
-import {
-  isImageElement,
-  isLinearElement,
-  isTextElement,
-} from "../element/typeChecks";
+import { isLinearElement } from "../element/typeChecks";
 import { getShortcutKey } from "../utils";
 
 interface Hint {
@@ -34,10 +31,6 @@ const getHints = ({ appState, elements }: Hint) => {
     return t("hints.text");
   }
 
-  if (appState.elementType === "image" && appState.pendingImageElement) {
-    return t("hints.placeImage");
-  }
-
   const selectedElements = getSelectedElements(elements, appState);
   if (
     isResizing &&
@@ -48,9 +41,7 @@ const getHints = ({ appState, elements }: Hint) => {
     if (isLinearElement(targetElement) && targetElement.points.length === 2) {
       return t("hints.lockAngle");
     }
-    return isImageElement(targetElement)
-      ? t("hints.resizeImage")
-      : t("hints.resize");
+    return t("hints.resize");
   }
 
   if (isRotating && lastPointerDownWith === "mouse") {
@@ -66,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/ImageExportDialog.tsx

@@ -8,17 +8,20 @@ import { CanvasError } from "../errors";
 import { t } from "../i18n";
 import { useIsMobile } from "./App";
 import { getSelectedElements, isSomeElementSelected } from "../scene";
-import { exportToCanvas } from "../scene/export";
-import { AppState, BinaryFiles } from "../types";
+import { exportToCanvas, getExportSize } from "../scene/export";
+import { AppState } from "../types";
 import { Dialog } from "./Dialog";
 import { clipboard, exportImage } 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";
-import { nativeFileSystemSupported } from "../data/filesystem";
+
+const scales = [1, 2, 3];
+const defaultScale = scales.includes(devicePixelRatio) ? devicePixelRatio : 1;
 
 const supportsContextFilters =
   "filter" in document.createElement("canvas").getContext("2d")!;
@@ -79,8 +82,7 @@ const ExportButton: React.FC<{
 const ImageExportModal = ({
   elements,
   appState,
-  files,
-  exportPadding = DEFAULT_EXPORT_PADDING,
+  exportPadding = 10,
   actionManager,
   onExportToPng,
   onExportToSvg,
@@ -88,7 +90,6 @@ const ImageExportModal = ({
 }: {
   appState: AppState;
   elements: readonly NonDeletedExcalidrawElement[];
-  files: BinaryFiles;
   exportPadding?: number;
   actionManager: ActionsManagerInterface;
   onExportToPng: ExportCB;
@@ -97,6 +98,7 @@ const ImageExportModal = ({
   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;
@@ -114,29 +116,35 @@ const ImageExportModal = ({
     if (!previewNode) {
       return;
     }
-    exportToCanvas(exportedElements, appState, files, {
+    try {
+      const canvas = exportToCanvas(exportedElements, appState, {
         exportBackground,
         viewBackgroundColor,
         exportPadding,
-    })
-      .then((canvas) => {
+        scale,
+      });
+
       // if converting to blob fails, there's some problem that will
       // likely prevent preview and export (e.g. canvas too big)
-        return canvasToBlob(canvas).then(() => {
+      canvasToBlob(canvas)
+        .then(() => {
           renderPreview(canvas, previewNode);
-        });
         })
         .catch((error) => {
           console.error(error);
           renderPreview(new CanvasError(), previewNode);
         });
+    } catch (error) {
+      console.error(error);
+      renderPreview(new CanvasError(), previewNode);
+    }
   }, [
     appState,
-    files,
     exportedElements,
     exportBackground,
     exportPadding,
     viewBackgroundColor,
+    scale,
   ]);
 
   return (
@@ -167,8 +175,33 @@ const ImageExportModal = ({
         </div>
       </div>
       <div style={{ display: "flex", alignItems: "center", marginTop: ".6em" }}>
-        <Stack.Row gap={2}>
-          {actionManager.renderAction("changeExportScale")}
+        <Stack.Row gap={2} justifyContent={"center"}>
+          {scales.map((_scale) => {
+            const [width, height] = getExportSize(
+              exportedElements,
+              exportPadding,
+              _scale,
+            );
+
+            const scaleButtonTitle = `${t(
+              "buttons.scale",
+            )} ${_scale}x (${width}x${height})`;
+
+            return (
+              <ToolButton
+                key={_scale}
+                size="s"
+                type="radio"
+                icon={`${_scale}x`}
+                name="export-canvas-scale"
+                title={scaleButtonTitle}
+                aria-label={scaleButtonTitle}
+                id="export-canvas-scale"
+                checked={_scale === scale}
+                onChange={() => setScale(_scale)}
+              />
+            );
+          })}
         </Stack.Row>
         <p style={{ marginLeft: "1em", userSelect: "none" }}>Scale</p>
       </div>
@@ -180,15 +213,14 @@ const ImageExportModal = ({
           margin: ".6em 0",
         }}
       >
-        {!nativeFileSystemSupported &&
-          actionManager.renderAction("changeProjectName")}
+        {!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)}
+          onClick={() => onExportToPng(exportedElements, scale)}
         >
           PNG
         </ExportButton>
@@ -196,14 +228,14 @@ const ImageExportModal = ({
           color="red"
           title={t("buttons.exportToSvg")}
           aria-label={t("buttons.exportToSvg")}
-          onClick={() => onExportToSvg(exportedElements)}
+          onClick={() => onExportToSvg(exportedElements, scale)}
         >
           SVG
         </ExportButton>
         {probablySupportsClipboardBlob && (
           <ExportButton
             title={t("buttons.copyPngToClipboard")}
-            onClick={() => onExportToClipboard(exportedElements)}
+            onClick={() => onExportToClipboard(exportedElements, scale)}
             color="gray"
             shade={7}
           >
@@ -218,8 +250,7 @@ const ImageExportModal = ({
 export const ImageExportDialog = ({
   elements,
   appState,
-  files,
-  exportPadding = DEFAULT_EXPORT_PADDING,
+  exportPadding = 10,
   actionManager,
   onExportToPng,
   onExportToSvg,
@@ -227,7 +258,6 @@ export const ImageExportDialog = ({
 }: {
   appState: AppState;
   elements: readonly NonDeletedExcalidrawElement[];
-  files: BinaryFiles;
   exportPadding?: number;
   actionManager: ActionsManagerInterface;
   onExportToPng: ExportCB;
@@ -258,7 +288,6 @@ export const ImageExportDialog = ({
           <ImageExportModal
             elements={elements}
             appState={appState}
-            files={files}
             exportPadding={exportPadding}
             actionManager={actionManager}
             onExportToPng={onExportToPng}

src/components/InitializeApp.tsx

@@ -1,25 +1,30 @@
-import React, { useEffect, useState } from "react";
+import React from "react";
 
 import { LoadingMessage } from "./LoadingMessage";
 import { defaultLang, Language, languages, setLanguage } from "../i18n";
 
 interface Props {
   langCode: Language["code"];
-  children: React.ReactElement;
+}
+interface State {
+  isLoading: boolean;
+}
+export class InitializeApp extends React.Component<Props, State> {
+  public state: { isLoading: boolean } = {
+    isLoading: true,
+  };
+
+  async componentDidMount() {
+    const currentLang =
+      languages.find((lang) => lang.code === this.props.langCode) ||
+      defaultLang;
+    await setLanguage(currentLang);
+    this.setState({
+      isLoading: false,
+    });
   }
 
-export const InitializeApp = (props: Props) => {
-  const [loading, setLoading] = useState(true);
-
-  useEffect(() => {
-    const updateLang = async () => {
-      await setLanguage(currentLang);
-    };
-    const currentLang =
-      languages.find((lang) => lang.code === props.langCode) || defaultLang;
-    updateLang();
-    setLoading(false);
-  }, [props.langCode]);
-
-  return loading ? <LoadingMessage /> : props.children;
-};
+  public render() {
+    return this.state.isLoading ? <LoadingMessage /> : this.props.children;
+  }
+}

src/components/JSONExportDialog.tsx

@@ -3,15 +3,15 @@ import { ActionsManagerInterface } from "../actions/types";
 import { NonDeletedExcalidrawElement } from "../element/types";
 import { t } from "../i18n";
 import { useIsMobile } from "./App";
-import { AppState, ExportOpts, BinaryFiles } from "../types";
+import { AppState } from "../types";
 import { Dialog } from "./Dialog";
 import { exportFile, exportToFileIcon, link } from "./icons";
 import { ToolButton } from "./ToolButton";
-import { actionSaveFileToDisk } from "../actions/actionExport";
+import { actionSaveAsScene } from "../actions/actionExport";
 import { Card } from "./Card";
 
 import "./ExportDialog.scss";
-import { nativeFileSystemSupported } from "../data/filesystem";
+import { supported as fsSupported } from "browser-fs-access";
 
 export type ExportCB = (
   elements: readonly NonDeletedExcalidrawElement[],
@@ -21,31 +21,24 @@ export type ExportCB = (
 const JSONExportModal = ({
   elements,
   appState,
-  files,
   actionManager,
-  exportOpts,
-  canvas,
+  onExportToBackend,
 }: {
   appState: AppState;
-  files: BinaryFiles;
   elements: readonly NonDeletedExcalidrawElement[];
   actionManager: ActionsManagerInterface;
+  onExportToBackend?: ExportCB;
   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")}
-              {!nativeFileSystemSupported &&
-                actionManager.renderAction("changeProjectName")}
+            {!fsSupported && actionManager.renderAction("changeProjectName")}
           </div>
           <ToolButton
             className="Card-button"
@@ -54,11 +47,10 @@ const JSONExportModal = ({
             aria-label={t("exportDialog.disk_button")}
             showAriaLabel={true}
             onClick={() => {
-                actionManager.executeAction(actionSaveFileToDisk);
+              actionManager.executeAction(actionSaveAsScene);
             }}
           />
         </Card>
-        )}
         {onExportToBackend && (
           <Card color="pink">
             <div className="Card-icon">{link}</div>
@@ -70,14 +62,10 @@ const JSONExportModal = ({
               title={t("exportDialog.link_button")}
               aria-label={t("exportDialog.link_button")}
               showAriaLabel={true}
-              onClick={() =>
-                onExportToBackend(elements, appState, files, canvas)
-              }
+              onClick={() => onExportToBackend(elements)}
             />
           </Card>
         )}
-        {exportOpts.renderCustomUI &&
-          exportOpts.renderCustomUI(elements, appState, files, canvas)}
       </div>
     </div>
   );
@@ -86,17 +74,13 @@ const JSONExportModal = ({
 export const JSONExportDialog = ({
   elements,
   appState,
-  files,
   actionManager,
-  exportOpts,
-  canvas,
+  onExportToBackend,
 }: {
-  elements: readonly NonDeletedExcalidrawElement[];
   appState: AppState;
-  files: BinaryFiles;
+  elements: readonly NonDeletedExcalidrawElement[];
   actionManager: ActionsManagerInterface;
-  exportOpts: ExportOpts;
-  canvas: HTMLCanvasElement | null;
+  onExportToBackend?: ExportCB;
 }) => {
   const [modalIsShown, setModalIsShown] = useState(false);
 
@@ -122,11 +106,9 @@ export const JSONExportDialog = ({
           <JSONExportModal
             elements={elements}
             appState={appState}
-            files={files}
             actionManager={actionManager}
+            onExportToBackend={onExportToBackend}
             onCloseRequest={handleClose}
-            exportOpts={exportOpts}
-            canvas={canvas}
           />
         </Dialog>
       )}

src/components/LayerUI.scss

@@ -73,10 +73,10 @@
       }
 
       :root[dir="ltr"] &.layer-ui__wrapper__footer-left--transition-left {
-        transform: translate(-76px, 0);
+        transform: translate(-92px, 0);
       }
       :root[dir="rtl"] &.layer-ui__wrapper__footer-left--transition-left {
-        transform: translate(76px, 0);
+        transform: translate(92px, 0);
       }
 
       &.layer-ui__wrapper__footer-left--transition-bottom {
@@ -116,19 +116,8 @@
       }
     }
     .layer-ui__wrapper__footer-left,
-    .layer-ui__wrapper__footer-right,
-    .disable-zen-mode--visible {
+    .layer-ui__wrapper__footer-right {
       pointer-events: all;
     }
-
-    .layer-ui__wrapper__footer-left {
-      margin-bottom: 0.2em;
-    }
-
-    .layer-ui__wrapper__footer-right {
-      margin-top: auto;
-      margin-bottom: auto;
-      margin-inline-end: 1em;
-    }
   }
 }

src/components/LayerUI.tsx

@@ -20,7 +20,6 @@ import {
   AppProps,
   AppState,
   ExcalidrawProps,
-  BinaryFiles,
   LibraryItem,
   LibraryItems,
 } from "../types";
@@ -37,7 +36,7 @@ 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";
@@ -48,13 +47,10 @@ import { Tooltip } from "./Tooltip";
 import { UserList } from "./UserList";
 import Library from "../data/library";
 import { JSONExportDialog } from "./JSONExportDialog";
-import { LibraryButton } from "./LibraryButton";
-import { isImageFileHandle } from "../data/blob";
 
 interface LayerUIProps {
   actionManager: ActionManager;
   appState: AppState;
-  files: BinaryFiles;
   canvas: HTMLCanvasElement | null;
   setAppState: React.Component<any, AppState>["setState"];
   elements: readonly NonDeletedExcalidrawElement[];
@@ -67,10 +63,12 @@ interface LayerUIProps {
   toggleZenMode: () => void;
   langCode: Language["code"];
   isCollaborating: boolean;
-  renderTopRightUI?: (
-    isMobile: boolean,
+  onExportToBackend?: (
+    exportedElements: readonly NonDeletedExcalidrawElement[],
     appState: AppState,
-  ) => JSX.Element | null;
+    canvas: HTMLCanvasElement | null,
+  ) => void;
+  renderTopRightUI?: (isMobile: boolean, appState: AppState) => JSX.Element;
   renderCustomFooter?: (isMobile: boolean, appState: AppState) => JSX.Element;
   viewModeEnabled: boolean;
   libraryReturnUrl: ExcalidrawProps["libraryReturnUrl"];
@@ -78,7 +76,6 @@ interface LayerUIProps {
   focusContainer: () => void;
   library: Library;
   id: string;
-  onImageAction: (data: { insertOnCanvasDirectly: boolean }) => void;
 }
 
 const useOnClickOutside = (
@@ -115,13 +112,11 @@ const LibraryMenuItems = ({
   onAddToLibrary,
   onInsertShape,
   pendingElements,
-  theme,
   setAppState,
   setLibraryItems,
   libraryReturnUrl,
   focusContainer,
   library,
-  files,
   id,
 }: {
   libraryItems: LibraryItems;
@@ -129,8 +124,6 @@ const LibraryMenuItems = ({
   onRemoveFromLibrary: (index: number) => void;
   onInsertShape: (elements: LibraryItem) => void;
   onAddToLibrary: (elements: LibraryItem) => void;
-  theme: AppState["theme"];
-  files: BinaryFiles;
   setAppState: React.Component<any, AppState>["setState"];
   setLibraryItems: (library: LibraryItems) => void;
   libraryReturnUrl: ExcalidrawProps["libraryReturnUrl"];
@@ -204,7 +197,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=${id}`}
         target="_excalidraw_libraries"
       >
         {t("labels.libraries")}
@@ -226,7 +219,6 @@ const LibraryMenuItems = ({
         <Stack.Col key={x}>
           <LibraryUnit
             elements={libraryItems[y + x]}
-            files={files}
             pendingElements={
               shouldAddPendingElements ? pendingElements : undefined
             }
@@ -259,9 +251,7 @@ const LibraryMenu = ({
   onInsertShape,
   pendingElements,
   onAddToLibrary,
-  theme,
   setAppState,
-  files,
   libraryReturnUrl,
   focusContainer,
   library,
@@ -271,8 +261,6 @@ const LibraryMenu = ({
   onClickOutside: (event: MouseEvent) => void;
   onInsertShape: (elements: LibraryItem) => void;
   onAddToLibrary: () => void;
-  theme: AppState["theme"];
-  files: BinaryFiles;
   setAppState: React.Component<any, AppState>["setState"];
   libraryReturnUrl: ExcalidrawProps["libraryReturnUrl"];
   focusContainer: () => void;
@@ -294,12 +282,12 @@ const LibraryMenu = ({
     "preloading" | "loading" | "ready"
   >("preloading");
 
-  const loadingTimerRef = useRef<number | null>(null);
+  const loadingTimerRef = useRef<NodeJS.Timeout | null>(null);
 
   useEffect(() => {
     Promise.race([
       new Promise((resolve) => {
-        loadingTimerRef.current = window.setTimeout(() => {
+        loadingTimerRef.current = setTimeout(() => {
           resolve("loading");
         }, 100);
       }),
@@ -332,12 +320,6 @@ const LibraryMenu = ({
 
   const addToLibrary = useCallback(
     async (elements: LibraryItem) => {
-      if (elements.some((element) => element.type === "image")) {
-        return setAppState({
-          errorMessage: "Support for adding images to the library coming soon!",
-        });
-      }
-
       const items = await library.loadLibrary();
       const nextItems = [...items, elements];
       onAddToLibrary();
@@ -368,8 +350,6 @@ const LibraryMenu = ({
           libraryReturnUrl={libraryReturnUrl}
           focusContainer={focusContainer}
           library={library}
-          theme={theme}
-          files={files}
           id={id}
         />
       )}
@@ -380,7 +360,6 @@ const LibraryMenu = ({
 const LayerUI = ({
   actionManager,
   appState,
-  files,
   setAppState,
   canvas,
   elements,
@@ -392,6 +371,7 @@ const LayerUI = ({
   showThemeBtn,
   toggleZenMode,
   isCollaborating,
+  onExportToBackend,
   renderTopRightUI,
   renderCustomFooter,
   viewModeEnabled,
@@ -400,7 +380,6 @@ const LayerUI = ({
   focusContainer,
   library,
   id,
-  onImageAction,
 }: LayerUIProps) => {
   const isMobile = useIsMobile();
 
@@ -413,53 +392,45 @@ const LayerUI = ({
       <JSONExportDialog
         elements={elements}
         appState={appState}
-        files={files}
         actionManager={actionManager}
-        exportOpts={UIOptions.canvasActions.export}
-        canvas={canvas}
+        onExportToBackend={
+          onExportToBackend
+            ? (elements) => {
+                onExportToBackend &&
+                  onExportToBackend(elements, appState, canvas);
+              }
+            : undefined
+        }
       />
     );
   };
 
   const renderImageExportDialog = () => {
-    if (!UIOptions.canvasActions.saveAsImage) {
+    if (!UIOptions.canvasActions.export) {
       return null;
     }
 
     const createExporter = (type: ExportType): ExportCB => async (
       exportedElements,
+      scale,
     ) => {
-      const fileHandle = await exportCanvas(
-        type,
-        exportedElements,
-        appState,
-        files,
-        {
+      await exportCanvas(type, exportedElements, appState, {
         exportBackground: appState.exportBackground,
         name: appState.name,
         viewBackgroundColor: appState.viewBackgroundColor,
-        },
-      )
+        scale,
+      })
         .catch(muteFSAbortError)
         .catch((error) => {
           console.error(error);
           setAppState({ errorMessage: error.message });
         });
-
-      if (
-        appState.exportEmbedScene &&
-        fileHandle &&
-        isImageFileHandle(fileHandle)
-      ) {
-        setAppState({ fileHandle });
-      }
     };
 
     return (
       <ImageExportDialog
         elements={elements}
         appState={appState}
-        files={files}
         actionManager={actionManager}
         onExportToPng={createExporter("png")}
         onExportToSvg={createExporter("svg")}
@@ -493,7 +464,6 @@ const LayerUI = ({
       </Section>
     );
   };
-
   const renderCanvasActions = () => (
     <Section
       heading="canvasActions"
@@ -526,9 +496,6 @@ const LayerUI = ({
             setAppState={setAppState}
             showThemeBtn={showThemeBtn}
           />
-          {appState.fileHandle && (
-            <>{actionManager.renderAction("saveToActiveFile")}</>
-          )}
         </Stack.Col>
       </Island>
     </Section>
@@ -547,8 +514,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
@@ -585,8 +551,6 @@ const LayerUI = ({
       libraryReturnUrl={libraryReturnUrl}
       focusContainer={focusContainer}
       library={library}
-      theme={appState.theme}
-      files={files}
       id={id}
     />
   ) : null;
@@ -614,12 +578,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 })}
@@ -631,17 +589,15 @@ const LayerUI = ({
                           canvas={canvas}
                           elementType={appState.elementType}
                           setAppState={setAppState}
-                          onImageAction={({ pointerType }) => {
-                            onImageAction({
-                              insertOnCanvasDirectly: pointerType !== "mouse",
-                            });
-                          }}
+                          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}
@@ -667,9 +623,7 @@ const LayerUI = ({
                       label={client.username || "Unknown user"}
                       key={clientId}
                     >
-                      {actionManager.renderAction("goToCollaborator", {
-                        id: clientId,
-                      })}
+                      {actionManager.renderAction("goToCollaborator", clientId)}
                     </Tooltip>
                   ))}
             </UserList>
@@ -702,16 +656,6 @@ const LayerUI = ({
                   zoom={appState.zoom}
                 />
               </Island>
-              {!viewModeEnabled && (
-                <div
-                  className={clsx("undo-redo-buttons zen-mode-transition", {
-                    "layer-ui__wrapper__footer-left--transition-bottom": zenModeEnabled,
-                  })}
-                >
-                  {actionManager.renderAction("undo", { size: "small" })}
-                  {actionManager.renderAction("redo", { size: "small" })}
-                </div>
-              )}
             </Section>
           </Stack.Col>
         </div>
@@ -796,8 +740,6 @@ const LayerUI = ({
         renderCustomFooter={renderCustomFooter}
         viewModeEnabled={viewModeEnabled}
         showThemeBtn={showThemeBtn}
-        onImageAction={onImageAction}
-        renderTopRightUI={renderTopRightUI}
       />
     </>
   ) : (

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_medium`,
-        {
-          "zen-mode-visibility--hidden": appState.zenModeEnabled,
-        },
-      )}
-      title={`${capitalizeString(t("toolBar.library"))} — 0`}
-      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="0"
-      />
-      <div className="ToolIcon__icon">{LIBRARY_ICON}</div>
-    </label>
-  );
-};

src/components/LibraryUnit.tsx

@@ -1,12 +1,12 @@
 import clsx from "clsx";
 import oc from "open-color";
-import { useEffect, useRef, useState } from "react";
+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 { exportToSvg } from "../scene/export";
-import { BinaryFiles, LibraryItem } from "../types";
+import { LibraryItem } from "../types";
 import "./LibraryUnit.scss";
 
 // fa-plus
@@ -21,44 +21,38 @@ const PLUS_ICON = (
 
 export const LibraryUnit = ({
   elements,
-  files,
   pendingElements,
   onRemoveFromLibrary,
   onClick,
 }: {
   elements?: LibraryItem;
-  files: BinaryFiles;
   pendingElements?: LibraryItem;
   onRemoveFromLibrary: () => void;
   onClick: () => void;
 }) => {
   const ref = useRef<HTMLDivElement | null>(null);
   useEffect(() => {
-    const node = ref.current;
-    if (!node) {
-      return;
-    }
-
-    (async () => {
     const elementsToRender = elements || pendingElements;
     if (!elementsToRender) {
       return;
     }
-      const svg = await exportToSvg(
-        elementsToRender,
-        {
+    const svg = exportToSvg(elementsToRender, {
       exportBackground: false,
       viewBackgroundColor: oc.white,
-        },
-        files,
-      );
-      node.innerHTML = svg.outerHTML;
-    })();
+    });
+    for (const child of ref.current!.children) {
+      if (child.tagName !== "svg") {
+        continue;
+      }
+      ref.current!.removeChild(child);
+    }
+    ref.current!.appendChild(svg);
 
+    const current = ref.current!;
     return () => {
-      node.innerHTML = "";
+      current.removeChild(svg);
     };
-  }, [elements, pendingElements, files]);
+  }, [elements, pendingElements]);
 
   const [isHovered, setIsHovered] = useState(false);
   const isMobile = useIsMobile();

src/components/LoadingMessage.tsx

@@ -1,3 +1,4 @@
+import React from "react";
 import { t } from "../i18n";
 
 export const LoadingMessage = () => {

src/components/LockIcon.tsx

@@ -2,17 +2,20 @@ import "./ToolIcon.scss";
 
 import React from "react";
 import clsx from "clsx";
-import { ToolButtonSize } from "./ToolButton";
+
+type LockIconSize = "s" | "m";
 
 type LockIconProps = {
   title?: string;
   name?: string;
+  id?: string;
   checked: boolean;
   onChange?(): void;
+  size?: LockIconSize;
   zenModeEnabled?: boolean;
 };
 
-const DEFAULT_SIZE: ToolButtonSize = "medium";
+const DEFAULT_SIZE: LockIconSize = "m";
 
 const ICONS = {
   CHECKED: (
@@ -38,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,
         },
@@ -54,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,10 +13,9 @@ 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;
@@ -33,11 +32,6 @@ type MobileMenuProps = {
   renderCustomFooter?: (isMobile: boolean, appState: AppState) => JSX.Element;
   viewModeEnabled: boolean;
   showThemeBtn: boolean;
-  onImageAction: (data: { insertOnCanvasDirectly: boolean }) => void;
-  renderTopRightUI?: (
-    isMobile: boolean,
-    appState: AppState,
-  ) => JSX.Element | null;
 };
 
 export const MobileMenu = ({
@@ -55,8 +49,6 @@ export const MobileMenu = ({
   renderCustomFooter,
   viewModeEnabled,
   showThemeBtn,
-  onImageAction,
-  renderTopRightUI,
 }: MobileMenuProps) => {
   const renderToolbar = () => {
     return (
@@ -72,21 +64,15 @@ export const MobileMenu = ({
                       canvas={canvas}
                       elementType={appState.elementType}
                       setAppState={setAppState}
-                      onImageAction={({ pointerType }) => {
-                        onImageAction({
-                          insertOnCanvasDirectly: pointerType !== "mouse",
-                        });
-                      }}
+                      isLibraryOpen={appState.isLibraryOpen}
                     />
                   </Stack.Row>
                 </Island>
-                {renderTopRightUI && renderTopRightUI(true, appState)}
-                <LockButton
+                <LockIcon
                   checked={appState.elementLocked}
                   onChange={onLockToggle}
                   title={t("toolBar.lock")}
                 />
-                <LibraryButton appState={appState} setAppState={setAppState} />
               </Stack.Row>
               {libraryMenu}
             </Stack.Col>
@@ -181,9 +167,10 @@ export const MobileMenu = ({
                           )
                           .map(([clientId, client]) => (
                             <React.Fragment key={clientId}>
-                              {actionManager.renderAction("goToCollaborator", {
-                                id: clientId,
-                              })}
+                              {actionManager.renderAction(
+                                "goToCollaborator",
+                                clientId,
+                              )}
                             </React.Fragment>
                           ))}
                       </UserList>

src/components/Modal.tsx

@@ -6,7 +6,6 @@ import clsx from "clsx";
 import { KEYS } from "../keys";
 import { useExcalidrawContainer, useIsMobile } from "./App";
 import { AppState } from "../types";
-import { THEME } from "../constants";
 
 export const Modal = (props: {
   className?: string;
@@ -16,7 +15,7 @@ export const Modal = (props: {
   labelledBy: string;
   theme?: AppState["theme"];
 }) => {
-  const { theme = THEME.LIGHT } = props;
+  const { theme = "light" } = props;
   const modalRoot = useBodyRoot(theme);
 
   if (!modalRoot) {
@@ -59,7 +58,7 @@ const useBodyRoot = (theme: AppState["theme"]) => {
   const isMobileRef = useRef(isMobile);
   isMobileRef.current = isMobile;
 
-  const { container: excalidrawContainer } = useExcalidrawContainer();
+  const excalidrawContainer = useExcalidrawContainer();
 
   useLayoutEffect(() => {
     if (div) {

src/components/PasteChartDialog.tsx

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

src/components/ProjectName.tsx

@@ -1,10 +1,9 @@
 import "./TextInput.scss";
 
-import React, { useState } from "react";
+import React, { Component } from "react";
 import { focusNearestParent } from "../utils";
 
 import "./ProjectName.scss";
-import { useExcalidrawContainer } from "./App";
 
 type Props = {
   value: string;
@@ -13,19 +12,22 @@ type Props = {
   isNameEditable: boolean;
 };
 
-export const ProjectName = (props: Props) => {
-  const { id } = useExcalidrawContainer();
-  const [fileName, setFileName] = useState<string>(props.value);
-
-  const handleBlur = (event: any) => {
+type State = {
+  fileName: string;
+};
+export class ProjectName extends Component<Props, State> {
+  state = {
+    fileName: this.props.value,
+  };
+  private handleBlur = (event: any) => {
     focusNearestParent(event.target);
     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 +37,29 @@ export const ProjectName = (props: Props) => {
     }
   };
 
+  public render() {
     return (
       <div className="ProjectName">
         <label className="ProjectName-label" htmlFor="filename">
-        {`${props.label}${props.isNameEditable ? "" : ":"}`}
+          {`${this.props.label}${this.props.isNameEditable ? "" : ":"}`}
         </label>
-      {props.isNameEditable ? (
+        {this.props.isNameEditable ? (
           <input
             className="TextInput"
-          onBlur={handleBlur}
-          onKeyDown={handleKeyDown}
-          id={`${id}-filename`}
-          value={fileName}
-          onChange={(event) => setFileName(event.target.value)}
+            onBlur={this.handleBlur}
+            onKeyDown={this.handleKeyDown}
+            id="filename"
+            value={this.state.fileName}
+            onChange={(event) =>
+              this.setState({ fileName: event.target.value })
+            }
           />
         ) : (
-        <span className="TextInput TextInput--readonly" id={`${id}-filename`}>
-          {props.value}
+          <span className="TextInput TextInput--readonly" id="filename">
+            {this.props.value}
           </span>
         )}
       </div>
     );
-};
+  }
+}

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/Spinner.scss

@@ -1,48 +0,0 @@
-@import "open-color/open-color.scss";
-
-$duration: 1.6s;
-
-.excalidraw {
-  .Spinner {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    height: 100%;
-    margin-left: auto;
-    margin-right: auto;
-
-    --spinner-color: var(--icon-fill-color);
-
-    svg {
-      animation: rotate $duration linear infinite;
-      transform-origin: center center;
-    }
-
-    circle {
-      stroke: var(--spinner-color);
-      animation: dash $duration linear 0s infinite;
-      stroke-linecap: round;
-    }
-  }
-
-  @keyframes rotate {
-    100% {
-      transform: rotate(360deg);
-    }
-  }
-
-  @keyframes dash {
-    0% {
-      stroke-dasharray: 1, 300;
-      stroke-dashoffset: 0;
-    }
-    50% {
-      stroke-dasharray: 150, 300;
-      stroke-dashoffset: -200;
-    }
-    100% {
-      stroke-dasharray: 1, 300;
-      stroke-dashoffset: -280;
-    }
-  }
-}

src/components/Spinner.tsx

@@ -1,28 +0,0 @@
-import React from "react";
-
-import "./Spinner.scss";
-
-const Spinner = ({
-  size = "1em",
-  circleWidth = 8,
-}: {
-  size?: string | number;
-  circleWidth?: number;
-}) => {
-  return (
-    <div className="Spinner">
-      <svg viewBox="0 0 100 100" style={{ width: size, height: size }}>
-        <circle
-          cx="50"
-          cy="50"
-          r={50 - circleWidth / 2}
-          strokeWidth={circleWidth}
-          fill="none"
-          strokeMiterlimit="10"
-        />
-      </svg>
-    </div>
-  );
-};
-
-export default Spinner;

src/components/Toast.tsx

@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useRef } from "react";
+import React, { useCallback, useEffect, useRef } from "react";
 import { TOAST_TIMEOUT } from "../constants";
 import "./Toast.scss";
 

src/components/ToolButton.tsx

@@ -1,13 +1,9 @@
 import "./ToolIcon.scss";
 
-import React, { useEffect, useRef, useState } from "react";
+import React from "react";
 import clsx from "clsx";
-import { useExcalidrawContainer } from "./App";
-import { AbortError } from "../errors";
-import Spinner from "./Spinner";
-import { PointerType } from "../element/types";
 
-export type ToolButtonSize = "small" | "medium";
+type ToolIconSize = "s" | "m";
 
 type ToolButtonBaseProps = {
   icon?: React.ReactNode;
@@ -18,7 +14,7 @@ type ToolButtonBaseProps = {
   title?: string;
   name?: string;
   id?: string;
-  size?: ToolButtonSize;
+  size?: ToolIconSize;
   keyBindingLabel?: string;
   showAriaLabel?: boolean;
   hidden?: boolean;
@@ -31,7 +27,7 @@ type ToolButtonProps =
   | (ToolButtonBaseProps & {
       type: "button";
       children?: React.ReactNode;
-      onClick?(event: React.MouseEvent): void;
+      onClick?(): void;
     })
   | (ToolButtonBaseProps & {
       type: "icon";
@@ -41,46 +37,15 @@ type ToolButtonProps =
   | (ToolButtonBaseProps & {
       type: "radio";
       checked: boolean;
-      onChange?(data: { pointerType: PointerType | null }): void;
+      onChange?(): void;
     });
 
+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}`;
-
-  const [isLoading, setIsLoading] = useState(false);
-
-  const isMountedRef = useRef(true);
-
-  const onClick = async (event: React.MouseEvent) => {
-    const ret = "onClick" in props && props.onClick?.(event);
-
-    if (ret && "then" in ret) {
-      try {
-        setIsLoading(true);
-        await ret;
-      } catch (error) {
-        if (!(error instanceof AbortError)) {
-          throw error;
-        }
-      } finally {
-        if (isMountedRef.current) {
-          setIsLoading(false);
-        }
-      }
-    }
-  };
-
-  useEffect(
-    () => () => {
-      isMountedRef.current = false;
-    },
-    [],
-  );
-
-  const lastPointerTypeRef = useRef<PointerType | null>(null);
+  const sizeCn = `ToolIcon_size_${props.size || DEFAULT_SIZE}`;
 
   if (props.type === "button" || props.type === "icon") {
     return (
@@ -103,9 +68,8 @@ export const ToolButton = React.forwardRef((props: ToolButtonProps, ref) => {
         title={props.title}
         aria-label={props["aria-label"]}
         type="button"
-        onClick={onClick}
+        onClick={props.onClick}
         ref={innerRef}
-        disabled={isLoading}
       >
         {(props.icon || props.label) && (
           <div className="ToolIcon__icon" aria-hidden="true">
@@ -118,9 +82,7 @@ export const ToolButton = React.forwardRef((props: ToolButtonProps, ref) => {
           </div>
         )}
         {props.showAriaLabel && (
-          <div className="ToolIcon__label">
-            {props["aria-label"]} {isLoading && <Spinner />}
-          </div>
+          <div className="ToolIcon__label">{props["aria-label"]}</div>
         )}
         {props.children}
       </button>
@@ -128,18 +90,7 @@ export const ToolButton = React.forwardRef((props: ToolButtonProps, ref) => {
   }
 
   return (
-    <label
-      className={clsx("ToolIcon", props.className)}
-      title={props.title}
-      onPointerDown={(event) => {
-        lastPointerTypeRef.current = event.pointerType || null;
-      }}
-      onPointerUp={() => {
-        requestAnimationFrame(() => {
-          lastPointerTypeRef.current = null;
-        });
-      }}
-    >
+    <label className={clsx("ToolIcon", props.className)} title={props.title}>
       <input
         className={`ToolIcon_type_radio ${sizeCn}`}
         type="radio"
@@ -147,10 +98,8 @@ 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}`}
-        onChange={() => {
-          props.onChange?.({ pointerType: lastPointerTypeRef.current });
-        }}
+        id={props.id}
+        onChange={props.onChange}
         checked={props.checked}
         ref={innerRef}
       />
@@ -167,5 +116,4 @@ export const ToolButton = React.forwardRef((props: ToolButtonProps, ref) => {
 ToolButton.defaultProps = {
   visible: true,
   className: "",
-  size: "medium",
 };

src/components/ToolIcon.scss

@@ -8,18 +8,10 @@
     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 {
@@ -54,21 +46,15 @@
   }
 
   .ToolIcon__label {
-    display: flex;
-    align-items: center;
     color: var(--icon-fill-color);
     font-family: var(--ui-font);
     margin: 0 0.8em;
     text-overflow: ellipsis;
-
-    .Spinner {
-      margin-left: 0.6em;
-    }
   }
 
-  .ToolIcon_size_small .ToolIcon__icon {
-    width: 2rem;
-    height: 2rem;
+  .ToolIcon_size_s .ToolIcon__icon {
+    width: 1.4rem;
+    height: 1.4rem;
     font-size: 0.8em;
   }
 
@@ -80,6 +66,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);
     }
@@ -92,14 +86,6 @@
       }
     }
 
-    &:hover {
-      background-color: var(--button-gray-2);
-    }
-
-    &:active {
-      background-color: var(--button-gray-3);
-    }
-
     &--show {
       visibility: visible;
     }
@@ -117,9 +103,6 @@
 
     &:not(.ToolIcon_toggle_opaque):checked + .ToolIcon__icon {
       background-color: var(--button-gray-2);
-      &:active {
-        background-color: var(--button-gray-3);
-      }
     }
 
     &:focus + .ToolIcon__icon {
@@ -147,21 +130,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;
     }
@@ -192,9 +166,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;
@@ -219,14 +194,6 @@
         position: static;
       }
     }
-    .ToolIcon.ToolIcon__library {
-      top: 100px;
-    }
-
-    .ToolIcon.ToolIcon__lock {
-      margin-inline-end: 0;
-      top: 60px;
-    }
   }
 
   .unlocked-icon {

src/components/Tooltip.scss

@@ -1,6 +1,4 @@
 @import "../css/variables.module";
-
-// container in body where the actual tooltip is appended to
 .excalidraw-tooltip {
   position: absolute;
   z-index: 1000;
@@ -26,13 +24,8 @@
   }
 }
 
-// wraps the element we want to apply the tooltip to
-.excalidraw-tooltip-wrapper {
-  display: flex;
-  height: 100%;
-}
-
-.excalidraw-tooltip-icon {
+.excalidraw {
+  .Tooltip-icon {
     width: 0.9em;
     height: 0.9em;
     margin-left: 5px;
@@ -43,3 +36,4 @@
       display: none;
     }
   }
+}

src/components/Tooltip.tsx

@@ -74,7 +74,6 @@ export const Tooltip = ({ children, label, long = false }: TooltipProps) => {
 
   return (
     <div
-      className="excalidraw-tooltip-wrapper"
       onPointerEnter={(event) =>
         updateTooltip(
           event.currentTarget as HTMLDivElement,

src/components/icons.tsx

@@ -10,15 +10,13 @@ import React from "react";
 
 import oc from "open-color";
 import clsx from "clsx";
-import { Theme } from "../element/types";
-import { THEME } from "../constants";
 
-const activeElementColor = (theme: Theme) =>
-  theme === THEME.LIGHT ? oc.orange[4] : oc.orange[9];
-const iconFillColor = (theme: Theme) =>
-  theme === THEME.LIGHT ? oc.black : oc.gray[4];
-const handlerColor = (theme: Theme) =>
-  theme === THEME.LIGHT ? oc.white : "#1e1e1e";
+const activeElementColor = (theme: "light" | "dark") =>
+  theme === "light" ? oc.orange[4] : oc.orange[9];
+const iconFillColor = (theme: "light" | "dark") =>
+  theme === "light" ? oc.black : oc.gray[4];
+const handlerColor = (theme: "light" | "dark") =>
+  theme === "light" ? oc.white : "#1e1e1e";
 
 type Opts = {
   width?: number;
@@ -26,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 (
@@ -177,7 +172,8 @@ export const resetZoom = createIcon(
   { width: 1024 },
 );
 
-export const BringForwardIcon = React.memo(({ theme }: { theme: Theme }) =>
+export const BringForwardIcon = React.memo(
+  ({ theme }: { theme: "light" | "dark" }) =>
     createIcon(
       <>
         <path
@@ -197,7 +193,8 @@ export const BringForwardIcon = React.memo(({ theme }: { theme: Theme }) =>
     ),
 );
 
-export const SendBackwardIcon = React.memo(({ theme }: { theme: Theme }) =>
+export const SendBackwardIcon = React.memo(
+  ({ theme }: { theme: "light" | "dark" }) =>
     createIcon(
       <>
         <path
@@ -217,7 +214,8 @@ export const SendBackwardIcon = React.memo(({ theme }: { theme: Theme }) =>
     ),
 );
 
-export const BringToFrontIcon = React.memo(({ theme }: { theme: Theme }) =>
+export const BringToFrontIcon = React.memo(
+  ({ theme }: { theme: "light" | "dark" }) =>
     createIcon(
       <>
         <path
@@ -237,7 +235,8 @@ export const BringToFrontIcon = React.memo(({ theme }: { theme: Theme }) =>
     ),
 );
 
-export const SendToBackIcon = React.memo(({ theme }: { theme: Theme }) =>
+export const SendToBackIcon = React.memo(
+  ({ theme }: { theme: "light" | "dark" }) =>
     createIcon(
       <>
         <path
@@ -263,7 +262,8 @@ export const SendToBackIcon = React.memo(({ theme }: { theme: Theme }) =>
 // first one the user sees. Horizontal align icons should not be flipped since
 // that would make them lie about their function.
 //
-export const AlignTopIcon = React.memo(({ theme }: { theme: Theme }) =>
+export const AlignTopIcon = React.memo(
+  ({ theme }: { theme: "light" | "dark" }) =>
     createIcon(
       <>
         <path
@@ -284,7 +284,8 @@ export const AlignTopIcon = React.memo(({ theme }: { theme: Theme }) =>
     ),
 );
 
-export const AlignBottomIcon = React.memo(({ theme }: { theme: Theme }) =>
+export const AlignBottomIcon = React.memo(
+  ({ theme }: { theme: "light" | "dark" }) =>
     createIcon(
       <>
         <path
@@ -305,7 +306,8 @@ export const AlignBottomIcon = React.memo(({ theme }: { theme: Theme }) =>
     ),
 );
 
-export const AlignLeftIcon = React.memo(({ theme }: { theme: Theme }) =>
+export const AlignLeftIcon = React.memo(
+  ({ theme }: { theme: "light" | "dark" }) =>
     createIcon(
       <>
         <path
@@ -326,7 +328,8 @@ export const AlignLeftIcon = React.memo(({ theme }: { theme: Theme }) =>
     ),
 );
 
-export const AlignRightIcon = React.memo(({ theme }: { theme: Theme }) =>
+export const AlignRightIcon = React.memo(
+  ({ theme }: { theme: "light" | "dark" }) =>
     createIcon(
       <>
         <path
@@ -348,7 +351,7 @@ export const AlignRightIcon = React.memo(({ theme }: { theme: Theme }) =>
 );
 
 export const DistributeHorizontallyIcon = React.memo(
-  ({ theme }: { theme: Theme }) =>
+  ({ theme }: { theme: "light" | "dark" }) =>
     createIcon(
       <>
         <path
@@ -369,7 +372,7 @@ export const DistributeHorizontallyIcon = React.memo(
 );
 
 export const DistributeVerticallyIcon = React.memo(
-  ({ theme }: { theme: Theme }) =>
+  ({ theme }: { theme: "light" | "dark" }) =>
     createIcon(
       <>
         <path
@@ -390,7 +393,8 @@ export const DistributeVerticallyIcon = React.memo(
     ),
 );
 
-export const CenterVerticallyIcon = React.memo(({ theme }: { theme: Theme }) =>
+export const CenterVerticallyIcon = React.memo(
+  ({ theme }: { theme: "light" | "dark" }) =>
     createIcon(
       <>
         <path
@@ -413,7 +417,7 @@ export const CenterVerticallyIcon = React.memo(({ theme }: { theme: Theme }) =>
 );
 
 export const CenterHorizontallyIcon = React.memo(
-  ({ theme }: { theme: Theme }) =>
+  ({ theme }: { theme: "light" | "dark" }) =>
     createIcon(
       <>
         <path
@@ -470,12 +474,7 @@ 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: Theme }) =>
+export const GroupIcon = React.memo(({ theme }: { theme: "light" | "dark" }) =>
   createIcon(
     <>
       <path d="M25 26H111V111H25" fill={iconFillColor(theme)} />
@@ -505,7 +504,8 @@ export const GroupIcon = React.memo(({ theme }: { theme: Theme }) =>
   ),
 );
 
-export const UngroupIcon = React.memo(({ theme }: { theme: Theme }) =>
+export const UngroupIcon = React.memo(
+  ({ theme }: { theme: "light" | "dark" }) =>
     createIcon(
       <>
         <path d="M25 26H111V111H25" fill={iconFillColor(theme)} />
@@ -537,7 +537,8 @@ export const UngroupIcon = React.memo(({ theme }: { theme: Theme }) =>
     ),
 );
 
-export const FillHachureIcon = React.memo(({ theme }: { theme: Theme }) =>
+export const FillHachureIcon = React.memo(
+  ({ theme }: { theme: "light" | "dark" }) =>
     createIcon(
       <path
         fillRule="evenodd"
@@ -549,7 +550,8 @@ export const FillHachureIcon = React.memo(({ theme }: { theme: Theme }) =>
     ),
 );
 
-export const FillCrossHatchIcon = React.memo(({ theme }: { theme: Theme }) =>
+export const FillCrossHatchIcon = React.memo(
+  ({ theme }: { theme: "light" | "dark" }) =>
     createIcon(
       <g fill={iconFillColor(theme)} fillRule="evenodd" clipRule="evenodd">
         <path d="M20.101 16H28.0934L36 8.95989V4H33.5779L20.101 16ZM30.5704 4L17.0935 16H9.10101L22.5779 4H30.5704ZM19.5704 4L6.09349 16H4V10.7475L11.5779 4H19.5704ZM8.57036 4H4V8.06952L8.57036 4ZM36 11.6378L31.101 16H36V11.6378ZM2 2V18H38V2H2Z" />
@@ -559,7 +561,8 @@ export const FillCrossHatchIcon = React.memo(({ theme }: { theme: Theme }) =>
     ),
 );
 
-export const FillSolidIcon = React.memo(({ theme }: { theme: Theme }) =>
+export const FillSolidIcon = React.memo(
+  ({ theme }: { theme: "light" | "dark" }) =>
     createIcon(<path d="M2 2H38V18H2V2Z" fill={iconFillColor(theme)} />, {
       width: 40,
       height: 20,
@@ -567,7 +570,7 @@ export const FillSolidIcon = React.memo(({ theme }: { theme: Theme }) =>
 );
 
 export const StrokeWidthIcon = React.memo(
-  ({ theme, strokeWidth }: { theme: Theme; strokeWidth: number }) =>
+  ({ theme, strokeWidth }: { theme: "light" | "dark"; strokeWidth: number }) =>
     createIcon(
       <path
         d="M6 10H32"
@@ -580,7 +583,8 @@ export const StrokeWidthIcon = React.memo(
     ),
 );
 
-export const StrokeStyleSolidIcon = React.memo(({ theme }: { theme: Theme }) =>
+export const StrokeStyleSolidIcon = React.memo(
+  ({ theme }: { theme: "light" | "dark" }) =>
     createIcon(
       <path
         d="M6 10H34"
@@ -596,7 +600,8 @@ export const StrokeStyleSolidIcon = React.memo(({ theme }: { theme: Theme }) =>
     ),
 );
 
-export const StrokeStyleDashedIcon = React.memo(({ theme }: { theme: Theme }) =>
+export const StrokeStyleDashedIcon = React.memo(
+  ({ theme }: { theme: "light" | "dark" }) =>
     createIcon(
       <path
         d="M6 10H34"
@@ -610,7 +615,8 @@ export const StrokeStyleDashedIcon = React.memo(({ theme }: { theme: Theme }) =>
     ),
 );
 
-export const StrokeStyleDottedIcon = React.memo(({ theme }: { theme: Theme }) =>
+export const StrokeStyleDottedIcon = React.memo(
+  ({ theme }: { theme: "light" | "dark" }) =>
     createIcon(
       <path
         d="M6 10H36"
@@ -625,7 +631,7 @@ export const StrokeStyleDottedIcon = React.memo(({ theme }: { theme: Theme }) =>
 );
 
 export const SloppinessArchitectIcon = React.memo(
-  ({ theme }: { theme: Theme }) =>
+  ({ theme }: { theme: "light" | "dark" }) =>
     createIcon(
       <path
         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"
@@ -638,7 +644,8 @@ export const SloppinessArchitectIcon = React.memo(
     ),
 );
 
-export const SloppinessArtistIcon = React.memo(({ theme }: { theme: Theme }) =>
+export const SloppinessArtistIcon = React.memo(
+  ({ theme }: { theme: "light" | "dark" }) =>
     createIcon(
       <path
         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"
@@ -652,7 +659,7 @@ export const SloppinessArtistIcon = React.memo(({ theme }: { theme: Theme }) =>
 );
 
 export const SloppinessCartoonistIcon = React.memo(
-  ({ theme }: { theme: Theme }) =>
+  ({ theme }: { theme: "light" | "dark" }) =>
     createIcon(
       <path
         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"
@@ -665,7 +672,8 @@ export const SloppinessCartoonistIcon = React.memo(
     ),
 );
 
-export const EdgeSharpIcon = React.memo(({ theme }: { theme: Theme }) =>
+export const EdgeSharpIcon = React.memo(
+  ({ theme }: { theme: "light" | "dark" }) =>
     createIcon(
       <path
         d="M10 17L10 5L35 5"
@@ -678,7 +686,8 @@ export const EdgeSharpIcon = React.memo(({ theme }: { theme: Theme }) =>
     ),
 );
 
-export const EdgeRoundIcon = React.memo(({ theme }: { theme: Theme }) =>
+export const EdgeRoundIcon = React.memo(
+  ({ theme }: { theme: "light" | "dark" }) =>
     createIcon(
       <path
         d="M10 17V15C10 8 13 5 21 5L33.5 5"
@@ -691,7 +700,8 @@ export const EdgeRoundIcon = React.memo(({ theme }: { theme: Theme }) =>
     ),
 );
 
-export const ArrowheadNoneIcon = React.memo(({ theme }: { theme: Theme }) =>
+export const ArrowheadNoneIcon = React.memo(
+  ({ theme }: { theme: "light" | "dark" }) =>
     createIcon(
       <path
         d="M6 10H34"
@@ -707,7 +717,7 @@ export const ArrowheadNoneIcon = React.memo(({ theme }: { theme: Theme }) =>
 );
 
 export const ArrowheadArrowIcon = React.memo(
-  ({ theme, flip = false }: { theme: Theme; flip?: boolean }) =>
+  ({ theme, flip = false }: { theme: "light" | "dark"; flip?: boolean }) =>
     createIcon(
       <g
         transform={flip ? "translate(40, 0) scale(-1, 1)" : ""}
@@ -723,7 +733,7 @@ export const ArrowheadArrowIcon = React.memo(
 );
 
 export const ArrowheadDotIcon = React.memo(
-  ({ theme, flip = false }: { theme: Theme; flip?: boolean }) =>
+  ({ theme, flip = false }: { theme: "light" | "dark"; flip?: boolean }) =>
     createIcon(
       <g
         stroke={iconFillColor(theme)}
@@ -738,7 +748,7 @@ export const ArrowheadDotIcon = React.memo(
 );
 
 export const ArrowheadBarIcon = React.memo(
-  ({ theme, flip = false }: { theme: Theme; flip?: boolean }) =>
+  ({ theme, flip = false }: { theme: "light" | "dark"; flip?: boolean }) =>
     createIcon(
       <g transform={flip ? "translate(40, 0) scale(-1, 1)" : ""}>
         <path
@@ -752,7 +762,8 @@ export const ArrowheadBarIcon = React.memo(
     ),
 );
 
-export const FontSizeSmallIcon = React.memo(({ theme }: { theme: Theme }) =>
+export const FontSizeSmallIcon = React.memo(
+  ({ theme }: { theme: "light" | "dark" }) =>
     createIcon(
       <path
         fill={iconFillColor(theme)}
@@ -762,7 +773,8 @@ export const FontSizeSmallIcon = React.memo(({ theme }: { theme: Theme }) =>
     ),
 );
 
-export const FontSizeMediumIcon = React.memo(({ theme }: { theme: Theme }) =>
+export const FontSizeMediumIcon = React.memo(
+  ({ theme }: { theme: "light" | "dark" }) =>
     createIcon(
       <path
         fill={iconFillColor(theme)}
@@ -772,7 +784,8 @@ export const FontSizeMediumIcon = React.memo(({ theme }: { theme: Theme }) =>
     ),
 );
 
-export const FontSizeLargeIcon = React.memo(({ theme }: { theme: Theme }) =>
+export const FontSizeLargeIcon = React.memo(
+  ({ theme }: { theme: "light" | "dark" }) =>
     createIcon(
       <path
         fill={iconFillColor(theme)}
@@ -783,7 +796,7 @@ export const FontSizeLargeIcon = React.memo(({ theme }: { theme: Theme }) =>
 );
 
 export const FontSizeExtraLargeIcon = React.memo(
-  ({ theme }: { theme: Theme }) =>
+  ({ theme }: { theme: "light" | "dark" }) =>
     createIcon(
       <path
         fill={iconFillColor(theme)}
@@ -794,7 +807,7 @@ export const FontSizeExtraLargeIcon = React.memo(
 );
 
 export const FontFamilyHandDrawnIcon = React.memo(
-  ({ theme }: { theme: Theme }) =>
+  ({ theme }: { theme: "light" | "dark" }) =>
     createIcon(
       <path
         fill={iconFillColor(theme)}
@@ -804,7 +817,8 @@ export const FontFamilyHandDrawnIcon = React.memo(
     ),
 );
 
-export const FontFamilyNormalIcon = React.memo(({ theme }: { theme: Theme }) =>
+export const FontFamilyNormalIcon = React.memo(
+  ({ theme }: { theme: "light" | "dark" }) =>
     createIcon(
       <>
         <path
@@ -820,7 +834,8 @@ export const FontFamilyNormalIcon = React.memo(({ theme }: { theme: Theme }) =>
     ),
 );
 
-export const FontFamilyCodeIcon = React.memo(({ theme }: { theme: Theme }) =>
+export const FontFamilyCodeIcon = React.memo(
+  ({ theme }: { theme: "light" | "dark" }) =>
     createIcon(
       <>
         <path
@@ -832,7 +847,8 @@ export const FontFamilyCodeIcon = React.memo(({ theme }: { theme: Theme }) =>
     ),
 );
 
-export const TextAlignLeftIcon = React.memo(({ theme }: { theme: Theme }) =>
+export const TextAlignLeftIcon = React.memo(
+  ({ theme }: { theme: "light" | "dark" }) =>
     createIcon(
       <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"
@@ -843,7 +859,8 @@ export const TextAlignLeftIcon = React.memo(({ theme }: { theme: Theme }) =>
     ),
 );
 
-export const TextAlignCenterIcon = React.memo(({ theme }: { theme: Theme }) =>
+export const TextAlignCenterIcon = React.memo(
+  ({ theme }: { theme: "light" | "dark" }) =>
     createIcon(
       <path
         d="M432 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-16zM108.1 96h231.81A12.09 12.09 0 00352 83.9V44.09A12.09 12.09 0 00339.91 32H108.1A12.09 12.09 0 0096 44.09V83.9A12.1 12.1 0 00108.1 96zm231.81 256A12.09 12.09 0 00352 339.9v-39.81A12.09 12.09 0 00339.91 288H108.1A12.09 12.09 0 0096 300.09v39.81a12.1 12.1 0 0012.1 12.1z"
@@ -853,7 +870,8 @@ export const TextAlignCenterIcon = React.memo(({ theme }: { theme: Theme }) =>
     ),
 );
 
-export const TextAlignRightIcon = React.memo(({ theme }: { theme: Theme }) =>
+export const TextAlignRightIcon = React.memo(
+  ({ theme }: { theme: "light" | "dark" }) =>
     createIcon(
       <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"

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: "",
@@ -35,7 +34,6 @@ export enum EVENT {
   MOUSE_MOVE = "mousemove",
   RESIZE = "resize",
   UNLOAD = "unload",
-  FOCUS = "focus",
   BLUR = "blur",
   DRAG_OVER = "dragover",
   DROP = "drop",
@@ -65,20 +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,
-};
-
-export const THEME = {
-  LIGHT: "light",
-  DARK: "dark",
-};
+  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}";
@@ -90,13 +83,7 @@ export const GRID_SIZE = 20; // TODO make it configurable?
 export const MIME_TYPES = {
   excalidraw: "application/vnd.excalidraw+json",
   excalidrawlib: "application/vnd.excalidrawlib+json",
-  json: "application/json",
-  svg: "image/svg+xml",
-  png: "image/png",
-  jpg: "image/jpeg",
-  gif: "image/gif",
-  binary: "application/octet-stream",
-} as const;
+};
 
 export const EXPORT_DATA_TYPES = {
   excalidraw: "excalidraw",
@@ -111,7 +98,6 @@ export const STORAGE_KEYS = {
 } as const;
 
 // time in milliseconds
-export const IMAGE_RENDER_TIMEOUT = 500;
 export const TAP_TWICE_TIMEOUT = 300;
 export const TOUCH_CTX_MENU_TIMEOUT = 500;
 export const TITLE_TIMEOUT = 10000;
@@ -145,11 +131,11 @@ 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,
   },
 };
 
@@ -158,19 +144,3 @@ 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
-
-export const DEFAULT_MAX_IMAGE_WIDTH_OR_HEIGHT = 1440;
-
-export const ALLOWED_IMAGE_MIME_TYPES = [
-  MIME_TYPES.png,
-  MIME_TYPES.jpg,
-  MIME_TYPES.svg,
-  MIME_TYPES.gif,
-] as const;
-
-export const MAX_ALLOWED_FILE_BYTES = 2 * 1024 * 1024;
-
-export const SVG_NS = "http://www.w3.org/2000/svg";

src/css/styles.scss

@@ -51,12 +51,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;
   }
 
@@ -414,6 +413,22 @@
     &:active {
       background-color: var(--button-gray-2);
     }
+
+    &.dropdown-select--floating {
+      margin: 0.5em;
+    }
+  }
+
+  .dropdown-select__language.dropdown-select--floating {
+    bottom: 10px;
+
+    :root[dir="ltr"] & {
+      right: 44px;
+    }
+
+    :root[dir="rtl"] & {
+      left: 44px;
+    }
   }
 
   .zIndexButton {
@@ -440,38 +455,26 @@
   }
 
   .help-icon {
-    display: flex;
     cursor: pointer;
     fill: $oc-gray-6;
+    width: 1.5rem;
     padding: 0;
     margin: 0;
+    margin-top: 5px;
     background: none;
     color: var(--icon-fill-color);
 
-    svg {
-      width: 1.5rem;
-      height: 1.5rem;
-    }
-
     &:hover {
       background: none;
     }
+
+    :root[dir="ltr"] & {
+      margin-right: 14px;
     }
 
-  .reset-zoom-button {
-    padding: 0.2em;
-    background: transparent;
-    color: var(--text-primary-color);
-    font-family: var(--ui-font);
+    :root[dir="rtl"] & {
+      margin-left: 14px;
     }
-
-  .undo-redo-buttons {
-    display: grid;
-    grid-auto-flow: column;
-    gap: 0.4em;
-    margin-top: auto;
-    margin-bottom: auto;
-    margin-inline-start: 0.6em;
   }
 
   @include isMobile {

src/data/blob.ts

@@ -1,17 +1,10 @@
-import { nanoid } from "nanoid";
 import { cleanAppStateForExport } from "../appState";
-import {
-  ALLOWED_IMAGE_MIME_TYPES,
-  EXPORT_DATA_TYPES,
-  MIME_TYPES,
-} from "../constants";
+import { EXPORT_DATA_TYPES } from "../constants";
 import { clearElementsForExport } from "../element";
-import { ExcalidrawElement, FileId } from "../element/types";
 import { CanvasError } from "../errors";
 import { t } from "../i18n";
 import { calculateScrollCenter } from "../scene";
-import { AppState, DataURL } from "../types";
-import { FileSystemHandle } from "./filesystem";
+import { AppState } from "../types";
 import { isValidExcalidrawData } from "./json";
 import { restore } from "./restore";
 import { ImportedLibraryData } from "./types";
@@ -19,22 +12,16 @@ import { ImportedLibraryData } from "./types";
 const parseFileContents = async (blob: Blob | File) => {
   let contents: string;
 
-  if (blob.type === MIME_TYPES.png) {
+  if (blob.type === "image/png") {
     try {
       return await (
         await import(/* webpackChunkName: "image" */ "./image")
       ).decodePngMetadata(blob);
     } catch (error) {
       if (error.message === "INVALID") {
-        throw new DOMException(
-          t("alerts.imageDoesNotContainScene"),
-          "EncodingError",
-        );
+        throw new Error(t("alerts.imageDoesNotContainScene"));
       } else {
-        throw new DOMException(
-          t("alerts.cannotRestoreFromImage"),
-          "EncodingError",
-        );
+        throw new Error(t("alerts.cannotRestoreFromImage"));
       }
     }
   } else {
@@ -51,7 +38,7 @@ const parseFileContents = async (blob: Blob | File) => {
         };
       });
     }
-    if (blob.type === MIME_TYPES.svg) {
+    if (blob.type === "image/svg+xml") {
       try {
         return await (
           await import(/* webpackChunkName: "image" */ "./image")
@@ -60,15 +47,9 @@ const parseFileContents = async (blob: Blob | File) => {
         });
       } catch (error) {
         if (error.message === "INVALID") {
-          throw new DOMException(
-            t("alerts.imageDoesNotContainScene"),
-            "EncodingError",
-          );
+          throw new Error(t("alerts.imageDoesNotContainScene"));
         } else {
-          throw new DOMException(
-            t("alerts.cannotRestoreFromImage"),
-            "EncodingError",
-          );
+          throw new Error(t("alerts.cannotRestoreFromImage"));
         }
       }
     }
@@ -87,50 +68,21 @@ export const getMimeType = (blob: Blob | string): string => {
     name = blob.name || "";
   }
   if (/\.(excalidraw|json)$/.test(name)) {
-    return MIME_TYPES.json;
+    return "application/json";
   } else if (/\.png$/.test(name)) {
-    return MIME_TYPES.png;
+    return "image/png";
   } else if (/\.jpe?g$/.test(name)) {
-    return MIME_TYPES.jpg;
+    return "image/jpeg";
   } else if (/\.svg$/.test(name)) {
-    return MIME_TYPES.svg;
+    return "image/svg+xml";
   }
   return "";
 };
 
-export const getFileHandleType = (handle: FileSystemHandle | null) => {
-  if (!handle) {
-    return null;
-  }
-
-  return handle.name.match(/\.(json|excalidraw|png|svg)$/)?.[1] || null;
-};
-
-export const isImageFileHandleType = (
-  type: string | null,
-): type is "png" | "svg" => {
-  return type === "png" || type === "svg";
-};
-
-export const isImageFileHandle = (handle: FileSystemHandle | null) => {
-  const type = getFileHandleType(handle);
-  return type === "png" || type === "svg";
-};
-
-export const isSupportedImageFile = (
-  blob: Blob | null | undefined,
-): blob is Blob & { type: typeof ALLOWED_IMAGE_MIME_TYPES[number] } => {
-  const { type } = blob || {};
-  return (
-    !!type && (ALLOWED_IMAGE_MIME_TYPES as readonly string[]).includes(type)
-  );
-};
-
 export const loadFromBlob = async (
   blob: Blob,
   /** @see restore.localAppState */
   localAppState: AppState | null,
-  localElements: readonly ExcalidrawElement[] | null,
 ) => {
   const contents = await parseFileContents(blob);
   try {
@@ -143,16 +95,14 @@ export const loadFromBlob = async (
         elements: clearElementsForExport(data.elements || []),
         appState: {
           theme: localAppState?.theme,
-          fileHandle: blob.handle || null,
+          fileHandle: (!blob.type.startsWith("image/") && blob.handle) || null,
           ...cleanAppStateForExport(data.appState || {}),
           ...(localAppState
             ? calculateScrollCenter(data.elements || [], localAppState, null)
             : {}),
         },
-        files: data.files,
       },
       localAppState,
-      localElements,
     );
 
     return result;
@@ -192,93 +142,3 @@ export const canvasToBlob = async (
     }
   });
 };
-
-/** generates SHA-1 digest from supplied file (if not supported, falls back
-    to a 40-char base64 random id) */
-export const generateIdFromFile = async (file: File) => {
-  let id: FileId;
-  try {
-    const hashBuffer = await window.crypto.subtle.digest(
-      "SHA-1",
-      await file.arrayBuffer(),
-    );
-    id =
-      // convert buffer to byte array
-      Array.from(new Uint8Array(hashBuffer))
-        // convert to hex string
-        .map((byte) => byte.toString(16).padStart(2, "0"))
-        .join("") as FileId;
-  } catch (error) {
-    console.error(error);
-    // length 40 to align with the HEX length of SHA-1 (which is 160 bit)
-    id = nanoid(40) as FileId;
-  }
-
-  return id;
-};
-
-export const getDataURL = async (file: Blob | File): Promise<DataURL> => {
-  return new Promise((resolve, reject) => {
-    const reader = new FileReader();
-    reader.onload = () => {
-      const dataURL = reader.result as DataURL;
-      resolve(dataURL);
-    };
-    reader.onerror = (error) => reject(error);
-    reader.readAsDataURL(file);
-  });
-};
-
-export const dataURLToFile = (dataURL: DataURL, filename = "") => {
-  const dataIndexStart = dataURL.indexOf(",");
-  const byteString = atob(dataURL.slice(dataIndexStart + 1));
-  const mimeType = dataURL.slice(0, dataIndexStart).split(":")[1].split(";")[0];
-
-  const ab = new ArrayBuffer(byteString.length);
-  const ia = new Uint8Array(ab);
-  for (let i = 0; i < byteString.length; i++) {
-    ia[i] = byteString.charCodeAt(i);
-  }
-  return new File([ab], filename, { type: mimeType });
-};
-
-export const resizeImageFile = async (
-  file: File,
-  maxWidthOrHeight: number,
-): Promise<File> => {
-  // SVG files shouldn't a can't be resized
-  if (file.type === MIME_TYPES.svg) {
-    return file;
-  }
-
-  const [pica, imageBlobReduce] = await Promise.all([
-    import("pica").then((res) => res.default),
-    // a wrapper for pica for better API
-    import("image-blob-reduce").then((res) => res.default),
-  ]);
-
-  // CRA's minification settings break pica in WebWorkers, so let's disable
-  // them for now
-  // https://github.com/nodeca/image-blob-reduce/issues/21#issuecomment-757365513
-  const reduce = imageBlobReduce({
-    pica: pica({ features: ["js", "wasm"] }),
-  });
-
-  const fileType = file.type;
-
-  if (!isSupportedImageFile(file)) {
-    throw new Error(t("errors.unsupportedFileType"));
-  }
-
-  return new File(
-    [await reduce.toBlob(file, { max: maxWidthOrHeight })],
-    file.name,
-    { type: fileType },
-  );
-};
-
-export const SVGStringToFile = (SVGString: string, filename: string = "") => {
-  return new File([new TextEncoder().encode(SVGString)], filename, {
-    type: MIME_TYPES.svg,
-  }) as File & { type: typeof MIME_TYPES.svg };
-};

src/data/encode.ts

@@ -1,19 +1,16 @@
 import { deflate, inflate } from "pako";
-import { encryptData, decryptData } from "./encryption";
 
 // -----------------------------------------------------------------------------
 // byte (binary) strings
 // -----------------------------------------------------------------------------
 
 // fast, Buffer-compatible implem
-export const toByteString = (
-  data: string | Uint8Array | ArrayBuffer,
-): Promise<string> => {
+export const toByteString = (data: string | Uint8Array): Promise<string> => {
   return new Promise((resolve, reject) => {
     const blob =
       typeof data === "string"
         ? new Blob([new TextEncoder().encode(data)])
-        : new Blob([data instanceof Uint8Array ? data : new Uint8Array(data)]);
+        : new Blob([data]);
     const reader = new FileReader();
     reader.onload = (event) => {
       if (!event.target || typeof event.target.result !== "string") {
@@ -47,14 +44,12 @@ const byteStringToString = (byteString: string) => {
  *  due to reencoding
  */
 export const stringToBase64 = async (str: string, isByteString = false) => {
-  return isByteString ? window.btoa(str) : window.btoa(await toByteString(str));
+  return isByteString ? btoa(str) : btoa(await toByteString(str));
 };
 
 // async to align with stringToBase64
 export const base64ToString = async (base64: string, isByteString = false) => {
-  return isByteString
-    ? window.atob(base64)
-    : byteStringToString(window.atob(base64));
+  return isByteString ? atob(base64) : byteStringToString(atob(base64));
 };
 
 // -----------------------------------------------------------------------------
@@ -119,261 +114,3 @@ export const decode = async (data: EncodedData): Promise<string> => {
 
   return decoded;
 };
-
-// -----------------------------------------------------------------------------
-// binary encoding
-// -----------------------------------------------------------------------------
-
-type FileEncodingInfo = {
-  /* version 2 is the version we're shipping the initial image support with.
-    version 1 was a PR version that a lot of people were using anyway.
-    Thus, if there are issues we can check whether they're not using the
-    unoffic version */
-  version: 1 | 2;
-  compression: "pako@1" | null;
-  encryption: "AES-GCM" | null;
-};
-
-// -----------------------------------------------------------------------------
-const CONCAT_BUFFERS_VERSION = 1;
-/** how many bytes we use to encode how many bytes the next chunk has.
- * Corresponds to DataView setter methods (setUint32, setUint16, etc).
- *
- * NOTE ! values must not be changed, which would be backwards incompatible !
- */
-const VERSION_DATAVIEW_BYTES = 4;
-const NEXT_CHUNK_SIZE_DATAVIEW_BYTES = 4;
-// -----------------------------------------------------------------------------
-
-const DATA_VIEW_BITS_MAP = { 1: 8, 2: 16, 4: 32 } as const;
-
-// getter
-function dataView(buffer: Uint8Array, bytes: 1 | 2 | 4, offset: number): number;
-// setter
-function dataView(
-  buffer: Uint8Array,
-  bytes: 1 | 2 | 4,
-  offset: number,
-  value: number,
-): Uint8Array;
-/**
- * abstraction over DataView that serves as a typed getter/setter in case
- * you're using constants for the byte size and want to ensure there's no
- * discrepenancy in the encoding across refactors.
- *
- * DataView serves for an endian-agnostic handling of numbers in ArrayBuffers.
- */
-function dataView(
-  buffer: Uint8Array,
-  bytes: 1 | 2 | 4,
-  offset: number,
-  value?: number,
-): Uint8Array | number {
-  if (value != null) {
-    if (value > Math.pow(2, DATA_VIEW_BITS_MAP[bytes]) - 1) {
-      throw new Error(
-        `attempting to set value higher than the allocated bytes (value: ${value}, bytes: ${bytes})`,
-      );
-    }
-    const method = `setUint${DATA_VIEW_BITS_MAP[bytes]}` as const;
-    new DataView(buffer.buffer)[method](offset, value);
-    return buffer;
-  }
-  const method = `getUint${DATA_VIEW_BITS_MAP[bytes]}` as const;
-  return new DataView(buffer.buffer)[method](offset);
-}
-
-// -----------------------------------------------------------------------------
-
-/**
- * Resulting concatenated buffer has this format:
- *
- * [
- *   VERSION chunk (4 bytes)
- *   LENGTH chunk 1 (4 bytes)
- *   DATA chunk 1 (up to 2^32 bits)
- *   LENGTH chunk 2 (4 bytes)
- *   DATA chunk 2 (up to 2^32 bits)
- *   ...
- * ]
- *
- * @param buffers each buffer (chunk) must be at most 2^32 bits large (~4GB)
- */
-const concatBuffers = (...buffers: Uint8Array[]) => {
-  const bufferView = new Uint8Array(
-    VERSION_DATAVIEW_BYTES +
-      NEXT_CHUNK_SIZE_DATAVIEW_BYTES * buffers.length +
-      buffers.reduce((acc, buffer) => acc + buffer.byteLength, 0),
-  );
-
-  let cursor = 0;
-
-  // as the first chunk we'll encode the version for backwards compatibility
-  dataView(bufferView, VERSION_DATAVIEW_BYTES, cursor, CONCAT_BUFFERS_VERSION);
-  cursor += VERSION_DATAVIEW_BYTES;
-
-  for (const buffer of buffers) {
-    dataView(
-      bufferView,
-      NEXT_CHUNK_SIZE_DATAVIEW_BYTES,
-      cursor,
-      buffer.byteLength,
-    );
-    cursor += NEXT_CHUNK_SIZE_DATAVIEW_BYTES;
-
-    bufferView.set(buffer, cursor);
-    cursor += buffer.byteLength;
-  }
-
-  return bufferView;
-};
-
-/** can only be used on buffers created via `concatBuffers()` */
-const splitBuffers = (concatenatedBuffer: Uint8Array) => {
-  const buffers = [];
-
-  let cursor = 0;
-
-  // first chunk is the version (ignored for now)
-  cursor += VERSION_DATAVIEW_BYTES;
-
-  while (true) {
-    const chunkSize = dataView(
-      concatenatedBuffer,
-      NEXT_CHUNK_SIZE_DATAVIEW_BYTES,
-      cursor,
-    );
-    cursor += NEXT_CHUNK_SIZE_DATAVIEW_BYTES;
-
-    buffers.push(concatenatedBuffer.slice(cursor, cursor + chunkSize));
-    cursor += chunkSize;
-    if (cursor >= concatenatedBuffer.byteLength) {
-      break;
-    }
-  }
-
-  return buffers;
-};
-
-// helpers for (de)compressing data with JSON metadata including encryption
-// -----------------------------------------------------------------------------
-
-/** @private */
-const _encryptAndCompress = async (
-  data: Uint8Array | string,
-  encryptionKey: string,
-) => {
-  const { encryptedBuffer, iv } = await encryptData(
-    encryptionKey,
-    deflate(data),
-  );
-
-  return { iv, buffer: new Uint8Array(encryptedBuffer) };
-};
-
-/**
- * The returned buffer has following format:
- * `[]` refers to a buffers wrapper (see `concatBuffers`)
- *
- * [
- *   encodingMetadataBuffer,
- *   iv,
- *   [
- *      contentsMetadataBuffer
- *      contentsBuffer
- *   ]
- * ]
- */
-export const compressData = async <T extends Record<string, any> = never>(
-  dataBuffer: Uint8Array,
-  options: {
-    encryptionKey: string;
-  } & ([T] extends [never]
-    ? {
-        metadata?: T;
-      }
-    : {
-        metadata: T;
-      }),
-): Promise<Uint8Array> => {
-  const fileInfo: FileEncodingInfo = {
-    version: 2,
-    compression: "pako@1",
-    encryption: "AES-GCM",
-  };
-
-  const encodingMetadataBuffer = new TextEncoder().encode(
-    JSON.stringify(fileInfo),
-  );
-
-  const contentsMetadataBuffer = new TextEncoder().encode(
-    JSON.stringify(options.metadata || null),
-  );
-
-  const { iv, buffer } = await _encryptAndCompress(
-    concatBuffers(contentsMetadataBuffer, dataBuffer),
-    options.encryptionKey,
-  );
-
-  return concatBuffers(encodingMetadataBuffer, iv, buffer);
-};
-
-/** @private */
-const _decryptAndDecompress = async (
-  iv: Uint8Array,
-  decryptedBuffer: Uint8Array,
-  decryptionKey: string,
-  isCompressed: boolean,
-) => {
-  decryptedBuffer = new Uint8Array(
-    await decryptData(iv, decryptedBuffer, decryptionKey),
-  );
-
-  if (isCompressed) {
-    return inflate(decryptedBuffer);
-  }
-
-  return decryptedBuffer;
-};
-
-export const decompressData = async <T extends Record<string, any>>(
-  bufferView: Uint8Array,
-  options: { decryptionKey: string },
-) => {
-  // first chunk is encoding metadata (ignored for now)
-  const [encodingMetadataBuffer, iv, buffer] = splitBuffers(bufferView);
-
-  const encodingMetadata: FileEncodingInfo = JSON.parse(
-    new TextDecoder().decode(encodingMetadataBuffer),
-  );
-
-  try {
-    const [contentsMetadataBuffer, contentsBuffer] = splitBuffers(
-      await _decryptAndDecompress(
-        iv,
-        buffer,
-        options.decryptionKey,
-        !!encodingMetadata.compression,
-      ),
-    );
-
-    const metadata = JSON.parse(
-      new TextDecoder().decode(contentsMetadataBuffer),
-    ) as T;
-
-    return {
-      /** metadata source is always JSON so we can decode it here */
-      metadata,
-      /** data can be anything so the caller must decode it */
-      data: contentsBuffer,
-    };
-  } catch (error) {
-    console.error(
-      `Error during decompressing and decrypting the file.`,
-      encodingMetadata,
-    );
-    throw error;
-  }
-};
-
-// -----------------------------------------------------------------------------

src/data/encryption.ts

@@ -1,79 +0,0 @@
-export const IV_LENGTH_BYTES = 12;
-
-export const createIV = () => {
-  const arr = new Uint8Array(IV_LENGTH_BYTES);
-  return window.crypto.getRandomValues(arr);
-};
-
-export const generateEncryptionKey = async () => {
-  const key = await window.crypto.subtle.generateKey(
-    {
-      name: "AES-GCM",
-      length: 128,
-    },
-    true, // extractable
-    ["encrypt", "decrypt"],
-  );
-  return (await window.crypto.subtle.exportKey("jwk", key)).k;
-};
-
-export const getImportedKey = (key: string, usage: KeyUsage) =>
-  window.crypto.subtle.importKey(
-    "jwk",
-    {
-      alg: "A128GCM",
-      ext: true,
-      k: key,
-      key_ops: ["encrypt", "decrypt"],
-      kty: "oct",
-    },
-    {
-      name: "AES-GCM",
-      length: 128,
-    },
-    false, // extractable
-    [usage],
-  );
-
-export const encryptData = async (
-  key: string,
-  data: Uint8Array | ArrayBuffer | Blob | File | string,
-): Promise<{ encryptedBuffer: ArrayBuffer; iv: Uint8Array }> => {
-  const importedKey = await getImportedKey(key, "encrypt");
-  const iv = createIV();
-  const buffer: ArrayBuffer | Uint8Array =
-    typeof data === "string"
-      ? new TextEncoder().encode(data)
-      : data instanceof Uint8Array
-      ? data
-      : data instanceof Blob
-      ? await data.arrayBuffer()
-      : data;
-
-  const encryptedBuffer = await window.crypto.subtle.encrypt(
-    {
-      name: "AES-GCM",
-      iv,
-    },
-    importedKey,
-    buffer as ArrayBuffer | Uint8Array,
-  );
-
-  return { encryptedBuffer, iv };
-};
-
-export const decryptData = async (
-  iv: Uint8Array,
-  encrypted: Uint8Array | ArrayBuffer,
-  privateKey: string,
-): Promise<ArrayBuffer> => {
-  const key = await getImportedKey(privateKey, "decrypt");
-  return window.crypto.subtle.decrypt(
-    {
-      name: "AES-GCM",
-      iv,
-    },
-    key,
-    encrypted,
-  );
-};

src/data/filesystem.ts

@@ -1,114 +0,0 @@
-import {
-  FileWithHandle,
-  fileOpen as _fileOpen,
-  fileSave as _fileSave,
-  FileSystemHandle,
-  supported as nativeFileSystemSupported,
-} from "@dwelle/browser-fs-access";
-import { EVENT, MIME_TYPES } from "../constants";
-import { AbortError } from "../errors";
-import { debounce } from "../utils";
-
-type FILE_EXTENSION =
-  | "gif"
-  | "jpg"
-  | "png"
-  | "svg"
-  | "json"
-  | "excalidraw"
-  | "excalidrawlib";
-
-const INPUT_CHANGE_INTERVAL_MS = 500;
-
-export const fileOpen = <M extends boolean | undefined = false>(opts: {
-  extensions?: FILE_EXTENSION[];
-  description?: string;
-  multiple?: M;
-}): Promise<
-  M extends false | undefined ? FileWithHandle : FileWithHandle[]
-> => {
-  // an unsafe TS hack, alas not much we can do AFAIK
-  type RetType = M extends false | undefined
-    ? FileWithHandle
-    : FileWithHandle[];
-
-  const mimeTypes = opts.extensions?.reduce((mimeTypes, type) => {
-    mimeTypes.push(MIME_TYPES[type]);
-
-    return mimeTypes;
-  }, [] as string[]);
-
-  const extensions = opts.extensions?.reduce((acc, ext) => {
-    if (ext === "jpg") {
-      return acc.concat(".jpg", ".jpeg");
-    }
-    return acc.concat(`.${ext}`);
-  }, [] as string[]);
-
-  return _fileOpen({
-    description: opts.description,
-    extensions,
-    mimeTypes,
-    multiple: opts.multiple ?? false,
-    legacySetup: (resolve, reject, input) => {
-      const scheduleRejection = debounce(reject, INPUT_CHANGE_INTERVAL_MS);
-      const focusHandler = () => {
-        checkForFile();
-        document.addEventListener(EVENT.KEYUP, scheduleRejection);
-        document.addEventListener(EVENT.POINTER_UP, scheduleRejection);
-        scheduleRejection();
-      };
-      const checkForFile = () => {
-        // this hack might not work when expecting multiple files
-        if (input.files?.length) {
-          const ret = opts.multiple ? [...input.files] : input.files[0];
-          resolve(ret as RetType);
-        }
-      };
-      requestAnimationFrame(() => {
-        window.addEventListener(EVENT.FOCUS, focusHandler);
-      });
-      const interval = window.setInterval(() => {
-        checkForFile();
-      }, INPUT_CHANGE_INTERVAL_MS);
-      return (rejectPromise) => {
-        clearInterval(interval);
-        scheduleRejection.cancel();
-        window.removeEventListener(EVENT.FOCUS, focusHandler);
-        document.removeEventListener(EVENT.KEYUP, scheduleRejection);
-        document.removeEventListener(EVENT.POINTER_UP, scheduleRejection);
-        if (rejectPromise) {
-          // so that something is shown in console if we need to debug this
-          console.warn("Opening the file was canceled (legacy-fs).");
-          rejectPromise(new AbortError());
-        }
-      };
-    },
-  }) as Promise<RetType>;
-};
-
-export const fileSave = (
-  blob: Blob,
-  opts: {
-    /** supply without the extension */
-    name: string;
-    /** file extension */
-    extension: FILE_EXTENSION;
-    description?: string;
-    /** existing FileSystemHandle */
-    fileHandle?: FileSystemHandle | null;
-  },
-) => {
-  return _fileSave(
-    blob,
-    {
-      fileName: `${opts.name}.${opts.extension}`,
-      description: opts.description,
-      extensions: [`.${opts.extension}`],
-    },
-    opts.fileHandle,
-  );
-};
-
-export type { FileSystemHandle };
-export { nativeFileSystemSupported };

src/data/image.ts

@@ -57,7 +57,7 @@ export const encodePngMetadata = async ({
   // insert metadata before last chunk (iEND)
   chunks.splice(-1, 0, metadataChunk);
 
-  return new Blob([encodePng(chunks)], { type: MIME_TYPES.png });
+  return new Blob([encodePng(chunks)], { type: "image/png" });
 };
 
 export const decodePngMetadata = async (blob: Blob) => {

src/data/index.ts

@@ -1,15 +1,14 @@
+import { fileSave } from "browser-fs-access";
 import {
   copyBlobToClipboardAsPng,
   copyTextToSystemClipboard,
 } from "../clipboard";
-import { DEFAULT_EXPORT_PADDING, MIME_TYPES } from "../constants";
 import { NonDeletedExcalidrawElement } from "../element/types";
 import { t } from "../i18n";
 import { exportToCanvas, exportToSvg } from "../scene/export";
 import { ExportType } from "../scene/types";
-import { AppState, BinaryFiles } from "../types";
+import { AppState } from "../types";
 import { canvasToBlob } from "./blob";
-import { fileSave, FileSystemHandle } from "./filesystem";
 import { serializeAsJSON } from "./json";
 
 export { loadFromBlob } from "./blob";
@@ -19,56 +18,56 @@ export const exportCanvas = async (
   type: ExportType,
   elements: readonly NonDeletedExcalidrawElement[],
   appState: AppState,
-  files: BinaryFiles,
   {
     exportBackground,
-    exportPadding = DEFAULT_EXPORT_PADDING,
+    exportPadding = 10,
     viewBackgroundColor,
     name,
-    fileHandle = null,
+    scale = 1,
   }: {
     exportBackground: boolean;
     exportPadding?: number;
     viewBackgroundColor: string;
     name: string;
-    fileHandle?: FileSystemHandle | null;
+    scale?: number;
   },
 ) => {
   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",
-      },
-      files,
-    );
+      scale,
+      metadata:
+        appState.exportEmbedScene && type === "svg"
+          ? await (
+              await import(/* webpackChunkName: "image" */ "./image")
+            ).encodeSvgMetadata({
+              text: serializeAsJSON(elements, appState),
+            })
+          : undefined,
+    });
     if (type === "svg") {
-      return await fileSave(
-        new Blob([tempSvg.outerHTML], { type: MIME_TYPES.svg }),
-        {
-          name,
-          extension: "svg",
-          fileHandle,
-        },
-      );
+      await fileSave(new Blob([tempSvg.outerHTML], { type: "image/svg+xml" }), {
+        fileName: `${name}.svg`,
+        extensions: [".svg"],
+      });
+      return;
     } else if (type === "clipboard-svg") {
-      await copyTextToSystemClipboard(tempSvg.outerHTML);
+      copyTextToSystemClipboard(tempSvg.outerHTML);
       return;
     }
   }
 
-  const tempCanvas = await exportToCanvas(elements, appState, files, {
+  const tempCanvas = exportToCanvas(elements, appState, {
     exportBackground,
     viewBackgroundColor,
     exportPadding,
+    scale,
   });
   tempCanvas.style.display = "none";
   document.body.appendChild(tempCanvas);
@@ -76,19 +75,19 @@ export const exportCanvas = async (
   tempCanvas.remove();
 
   if (type === "png") {
+    const fileName = `${name}.png`;
     if (appState.exportEmbedScene) {
       blob = await (
         await import(/* webpackChunkName: "image" */ "./image")
       ).encodePngMetadata({
         blob,
-        metadata: serializeAsJSON(elements, appState, files, "local"),
+        metadata: serializeAsJSON(elements, appState),
       });
     }
 
-    return await fileSave(blob, {
-      name,
-      extension: "png",
-      fileHandle,
+    await fileSave(blob, {
+      fileName,
+      extensions: [".png"],
     });
   } else if (type === "clipboard") {
     try {

src/data/json.ts

@@ -1,10 +1,10 @@
-import { fileOpen, fileSave } from "./filesystem";
-import { cleanAppStateForExport, clearAppStateForDatabase } from "../appState";
+import { fileOpen, fileSave } from "browser-fs-access";
+import { cleanAppStateForExport } from "../appState";
 import { EXPORT_DATA_TYPES, EXPORT_SOURCE, MIME_TYPES } from "../constants";
-import { clearElementsForDatabase, clearElementsForExport } from "../element";
+import { clearElementsForExport } from "../element";
 import { ExcalidrawElement } from "../element/types";
-import { AppState, BinaryFiles } from "../types";
-import { isImageFileHandle, loadFromBlob } from "./blob";
+import { AppState } from "../types";
+import { loadFromBlob } from "./blob";
 
 import {
   ExportedDataState,
@@ -13,50 +13,16 @@ import {
 } from "./types";
 import Library from "./library";
 
-/**
- * Strips out files which are only referenced by deleted elements
- */
-const filterOutDeletedFiles = (
-  elements: readonly ExcalidrawElement[],
-  files: BinaryFiles,
-) => {
-  const nextFiles: BinaryFiles = {};
-  for (const element of elements) {
-    if (
-      !element.isDeleted &&
-      "fileId" in element &&
-      element.fileId &&
-      files[element.fileId]
-    ) {
-      nextFiles[element.fileId] = files[element.fileId];
-    }
-  }
-  return nextFiles;
-};
-
 export const serializeAsJSON = (
   elements: readonly ExcalidrawElement[],
-  appState: Partial<AppState>,
-  files: BinaryFiles,
-  type: "local" | "database",
+  appState: AppState,
 ): string => {
   const data: ExportedDataState = {
     type: EXPORT_DATA_TYPES.excalidraw,
     version: 2,
     source: EXPORT_SOURCE,
-    elements:
-      type === "local"
-        ? clearElementsForExport(elements)
-        : clearElementsForDatabase(elements),
-    appState:
-      type === "local"
-        ? cleanAppStateForExport(appState)
-        : clearAppStateForDatabase(appState),
-    files:
-      type === "local"
-        ? filterOutDeletedFiles(elements, files)
-        : // will be stripped from JSON
-          undefined,
+    elements: clearElementsForExport(elements),
+    appState: cleanAppStateForExport(appState),
   };
 
   return JSON.stringify(data, null, 2);
@@ -65,35 +31,40 @@ export const serializeAsJSON = (
 export const saveAsJSON = async (
   elements: readonly ExcalidrawElement[],
   appState: AppState,
-  files: BinaryFiles,
 ) => {
-  const serialized = serializeAsJSON(elements, appState, files, "local");
+  const serialized = serializeAsJSON(elements, appState);
   const blob = new Blob([serialized], {
     type: MIME_TYPES.excalidraw,
   });
 
-  const fileHandle = await fileSave(blob, {
-    name: appState.name,
-    extension: "excalidraw",
+  const fileHandle = await fileSave(
+    blob,
+    {
+      fileName: `${appState.name}.excalidraw`,
       description: "Excalidraw file",
-    fileHandle: isImageFileHandle(appState.fileHandle)
-      ? null
-      : appState.fileHandle,
-  });
+      extensions: [".excalidraw"],
+    },
+    appState.fileHandle,
+  );
   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
     // gets resolved. Else, iOS users cannot open `.excalidraw` files.
-    // extensions: ["json", "excalidraw", "png", "svg"],
+    /*
+    extensions: [".json", ".excalidraw", ".png", ".svg"],
+    mimeTypes: [
+      MIME_TYPES.excalidraw,
+      "application/json",
+      "image/png",
+      "image/svg+xml",
+    ],
+    */
   });
-  return loadFromBlob(blob, localAppState, localElements);
+  return loadFromBlob(blob, localAppState);
 };
 
 export const isValidExcalidrawData = (data?: {
@@ -127,16 +98,15 @@ export const saveLibraryAsJSON = async (library: Library) => {
     library: libraryItems,
   };
   const serialized = JSON.stringify(data, null, 2);
-  await fileSave(
-    new Blob([serialized], {
+  const fileName = "library.excalidrawlib";
+  const blob = new Blob([serialized], {
     type: MIME_TYPES.excalidrawlib,
-    }),
-    {
-      name: "library",
-      extension: "excalidrawlib",
+  });
+  await fileSave(blob, {
+    fileName,
     description: "Excalidraw library file",
-    },
-  );
+    extensions: [".excalidrawlib"],
+  });
 };
 
 export const importLibraryFromJSON = async (library: Library) => {

src/data/library.ts

@@ -2,7 +2,7 @@ import { loadLibraryFromBlob } from "./blob";
 import { LibraryItems, LibraryItem } from "../types";
 import { restoreElements } from "./restore";
 import { getNonDeletedElements } from "../element";
-import type App from "../components/App";
+import App from "../components/App";
 
 class Library {
   private libraryCache: LibraryItems | null = null;
@@ -18,7 +18,7 @@ class Library {
   };
 
   restoreLibraryItem = (libraryItem: LibraryItem): LibraryItem | null => {
-    const elements = getNonDeletedElements(restoreElements(libraryItem, null));
+    const elements = getNonDeletedElements(restoreElements(libraryItem));
     return elements.length ? elements : null;
   };
 

src/data/resave.ts

@@ -1,40 +0,0 @@
-import { ExcalidrawElement } from "../element/types";
-import { AppState, BinaryFiles } from "../types";
-import { exportCanvas } from ".";
-import { getNonDeletedElements } from "../element";
-import { getFileHandleType, isImageFileHandleType } from "./blob";
-
-export const resaveAsImageWithScene = async (
-  elements: readonly ExcalidrawElement[],
-  appState: AppState,
-  files: BinaryFiles,
-) => {
-  const { exportBackground, viewBackgroundColor, name, fileHandle } = appState;
-
-  const fileHandleType = getFileHandleType(fileHandle);
-
-  if (!fileHandle || !isImageFileHandleType(fileHandleType)) {
-    throw new Error(
-      "fileHandle should exist and should be of type svg or png when resaving",
-    );
-  }
-  appState = {
-    ...appState,
-    exportEmbedScene: true,
-  };
-
-  await exportCanvas(
-    fileHandleType,
-    getNonDeletedElements(elements),
-    appState,
-    files,
-    {
-      exportBackground,
-      viewBackgroundColor,
-      name,
-      fileHandle,
-    },
-  );
-
-  return { fileHandle };
-};

src/data/restore.ts

@@ -1,26 +1,21 @@
 import {
   ExcalidrawElement,
+  FontFamily,
   ExcalidrawSelectionElement,
-  FontFamilyValues,
 } from "../element/types";
-import { AppState, BinaryFiles, NormalizedZoomValue } from "../types";
+import { AppState, NormalizedZoomValue } from "../types";
 import { ImportedDataState } from "./types";
-import {
-  getElementMap,
-  getNormalizedDimensions,
-  isInvisiblySmallElement,
-} from "../element";
+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,
@@ -37,7 +32,6 @@ export const AllowedExcalidrawElementTypes: Record<
   diamond: true,
   ellipse: true,
   line: true,
-  image: true,
   arrow: true,
   freedraw: true,
 };
@@ -45,33 +39,29 @@ export const AllowedExcalidrawElementTypes: Record<
 export type RestoredDataState = {
   elements: ExcalidrawElement[];
   appState: RestoredAppState;
-  files: BinaryFiles;
 };
 
-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 Pick<T, keyof Omit<Required<T>, keyof ExcalidrawElement>>
+  K extends keyof Omit<
+    Required<T>,
+    Exclude<keyof ExcalidrawElement, "type" | "x" | "y">
+  >
 >(
   element: Required<T>,
-  extra: Pick<
-    T,
-    // This extra Pick<T, keyof K> ensure no excess properties are passed.
-    // @ts-ignore TS complains here but type checks the call sites fine.
-    keyof K
-  > &
-    Partial<Pick<ExcalidrawElement, "type" | "x" | "y">>,
+  extra: Pick<T, K>,
 ): T => {
   const base: Pick<T, keyof ExcalidrawElement> = {
-    type: extra.type || element.type,
+    type: (extra as Partial<T>).type || element.type,
     // all elements must have version > 0 so getSceneVersion() will pick up
     // newly added elements
     version: element.version || 1,
@@ -84,8 +74,8 @@ const restoreElementWithProperties = <
     roughness: element.roughness ?? 1,
     opacity: element.opacity == null ? 100 : element.opacity,
     angle: element.angle || 0,
-    x: extra.x ?? element.x ?? 0,
-    y: extra.y ?? element.y ?? 0,
+    x: (extra as Partial<T>).x ?? element.x ?? 0,
+    y: (extra as Partial<T>).y ?? element.y ?? 0,
     strokeColor: element.strokeColor,
     backgroundColor: element.backgroundColor,
     width: element.width || 0,
@@ -107,7 +97,7 @@ const restoreElementWithProperties = <
 
 const restoreElement = (
   element: Exclude<ExcalidrawElement, ExcalidrawSelectionElement>,
-): typeof element | null => {
+): typeof element => {
   switch (element.type) {
     case "text":
       let fontSize = element.fontSize;
@@ -136,12 +126,6 @@ const restoreElement = (
         pressures: element.pressures,
       });
     }
-    case "image":
-      return restoreElementWithProperties(element, {
-        status: element.status || "pending",
-        fileId: element.fileId,
-        scale: element.scale || [1, 1],
-      });
     case "line":
     // @ts-ignore LEGACY type
     // eslint-disable-next-line no-fallthrough
@@ -197,20 +181,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 | null = 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);
       }
     }
@@ -220,25 +197,25 @@ export const restoreElements = (
 
 export const restoreAppState = (
   appState: ImportedDataState["appState"],
-  localAppState: Partial<AppState> | null | undefined,
+  localAppState: Partial<AppState> | null,
 ): RestoredAppState => {
   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 {
@@ -266,11 +243,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 => {
   return {
-    elements: restoreElements(data?.elements, localElements),
+    elements: restoreElements(data?.elements),
     appState: restoreAppState(data?.appState, localAppState || null),
-    files: data?.files || {},
   };
 };

src/data/types.ts

@@ -1,5 +1,5 @@
 import { ExcalidrawElement } from "../element/types";
-import { AppState, BinaryFiles, LibraryItems } from "../types";
+import { AppState, LibraryItems } from "../types";
 import type { cleanAppStateForExport } from "../appState";
 
 export interface ExportedDataState {
@@ -8,7 +8,6 @@ export interface ExportedDataState {
   source: string;
   elements: readonly ExcalidrawElement[];
   appState: ReturnType<typeof cleanAppStateForExport>;
-  files: BinaryFiles | undefined;
 }
 
 export interface ImportedDataState {
@@ -19,7 +18,6 @@ export interface ImportedDataState {
   appState?: Readonly<Partial<AppState>> | null;
   scrollToContent?: boolean;
   libraryItems?: LibraryItems;
-  files?: BinaryFiles;
 }
 
 export interface ExportedLibraryData {

src/element/collision.ts

@@ -23,7 +23,6 @@ import {
   ExcalidrawEllipseElement,
   NonDeleted,
   ExcalidrawFreeDrawElement,
-  ExcalidrawImageElement,
 } from "./types";
 
 import { getElementAbsoluteCoords, getCurvePathOps, Bounds } from "./bounds";
@@ -31,7 +30,6 @@ import { Point } from "../types";
 import { Drawable } from "roughjs/bin/core";
 import { AppState } from "../types";
 import { getShapeForElement } from "../renderer/renderElement";
-import { isImageElement } from "./typeChecks";
 
 const isElementDraggableFromInside = (
   element: NonDeletedExcalidrawElement,
@@ -49,7 +47,8 @@ const isElementDraggableFromInside = (
   if (element.type === "line") {
     return isDraggableFromInside && isPathALoop(element.points);
   }
-  return isDraggableFromInside || isImageElement(element);
+
+  return isDraggableFromInside;
 };
 
 export const hitTest = (
@@ -162,7 +161,6 @@ type HitTestArgs = {
 const hitTestPointAgainstElement = (args: HitTestArgs): boolean => {
   switch (args.element.type) {
     case "rectangle":
-    case "image":
     case "text":
     case "diamond":
     case "ellipse":
@@ -197,7 +195,6 @@ export const distanceToBindableElement = (
 ): number => {
   switch (element.type) {
     case "rectangle":
-    case "image":
     case "text":
       return distanceToRectangle(element, point);
     case "diamond":
@@ -227,8 +224,7 @@ const distanceToRectangle = (
   element:
     | ExcalidrawRectangleElement
     | ExcalidrawTextElement
-    | ExcalidrawFreeDrawElement
-    | ExcalidrawImageElement,
+    | ExcalidrawFreeDrawElement,
   point: Point,
 ): number => {
   const [, pointRel, hwidth, hheight] = pointRelativeToElement(element, point);
@@ -332,15 +328,15 @@ const hitTestFreeDrawElement = (
   let P: readonly [number, number];
 
   // For freedraw dots
-  if (
+  if (element.points.length === 2) {
+    return (
       distance2d(A[0], A[1], x, y) < threshold ||
       distance2d(B[0], B[1], x, y) < threshold
-  ) {
-    return true;
+    );
   }
 
   // For freedraw lines
-  for (let i = 0; i < element.points.length; i++) {
+  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]);
 
@@ -490,7 +486,6 @@ export const determineFocusDistance = (
   const nabs = Math.abs(n);
   switch (element.type) {
     case "rectangle":
-    case "image":
     case "text":
       return c / (hwidth * (nabs + q * mabs));
     case "diamond":
@@ -521,7 +516,6 @@ export const determineFocusPoint = (
   let point;
   switch (element.type) {
     case "rectangle":
-    case "image":
     case "text":
     case "diamond":
       point = findFocusPointForRectangulars(element, focus, adjecentPointRel);
@@ -571,7 +565,6 @@ const getSortedElementLineIntersections = (
   let intersections: GA.Point[];
   switch (element.type) {
     case "rectangle":
-    case "image":
     case "text":
     case "diamond":
       const corners = getCorners(element);
@@ -605,7 +598,6 @@ const getSortedElementLineIntersections = (
 const getCorners = (
   element:
     | ExcalidrawRectangleElement
-    | ExcalidrawImageElement
     | ExcalidrawDiamondElement
     | ExcalidrawTextElement,
   scale: number = 1,
@@ -614,7 +606,6 @@ const getCorners = (
   const hy = (scale * element.height) / 2;
   switch (element.type) {
     case "rectangle":
-    case "image":
     case "text":
       return [
         GA.point(hx, hy),
@@ -756,7 +747,6 @@ export const findFocusPointForEllipse = (
 export const findFocusPointForRectangulars = (
   element:
     | ExcalidrawRectangleElement
-    | ExcalidrawImageElement
     | ExcalidrawDiamondElement
     | ExcalidrawTextElement,
   // Between -1 and 1 for how far away should the focus point be relative

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,
@@ -62,16 +62,10 @@ export const dragNewElement = (
   y: number,
   width: number,
   height: number,
-  shouldMaintainAspectRatio: boolean,
-  shouldResizeFromCenter: boolean,
-  /** whether to keep given aspect ratio when `isResizeWithSidesSameLength` is
-      true */
-  widthAspectRatio?: number | null,
+  isResizeWithSidesSameLength: boolean,
+  isResizeCenterPoint: boolean,
 ) => {
-  if (shouldMaintainAspectRatio) {
-    if (widthAspectRatio) {
-      height = width / widthAspectRatio;
-    } else {
+  if (isResizeWithSidesSameLength) {
     ({ width, height } = getPerfectElementSize(
       elementType,
       width,
@@ -82,12 +76,11 @@ export const dragNewElement = (
       height = -height;
     }
   }
-  }
 
   let newX = x < originX ? originX - width : originX;
   let newY = y < originY ? originY - height : originY;
 
-  if (shouldResizeFromCenter) {
+  if (isResizeCenterPoint) {
     width += width;
     height += height;
     newX = originX - width / 2;

src/element/image.ts

@@ -1,111 +0,0 @@
-// -----------------------------------------------------------------------------
-// ExcalidrawImageElement & related helpers
-// -----------------------------------------------------------------------------
-
-import { MIME_TYPES, SVG_NS } from "../constants";
-import { t } from "../i18n";
-import { AppClassProperties, DataURL, BinaryFiles } from "../types";
-import { isInitializedImageElement } from "./typeChecks";
-import {
-  ExcalidrawElement,
-  FileId,
-  InitializedExcalidrawImageElement,
-} from "./types";
-
-export const loadHTMLImageElement = (dataURL: DataURL) => {
-  return new Promise<HTMLImageElement>((resolve, reject) => {
-    const image = new Image();
-    image.onload = () => {
-      resolve(image);
-    };
-    image.onerror = (error) => {
-      reject(error);
-    };
-    image.src = dataURL;
-  });
-};
-
-/** NOTE: updates cache even if already populated with given image. Thus,
- * you should filter out the images upstream if you want to optimize this. */
-export const updateImageCache = async ({
-  fileIds,
-  files,
-  imageCache,
-}: {
-  fileIds: FileId[];
-  files: BinaryFiles;
-  imageCache: AppClassProperties["imageCache"];
-}) => {
-  const updatedFiles = new Map<FileId, true>();
-  const erroredFiles = new Map<FileId, true>();
-
-  await Promise.all(
-    fileIds.reduce((promises, fileId) => {
-      const fileData = files[fileId as string];
-      if (fileData && !updatedFiles.has(fileId)) {
-        updatedFiles.set(fileId, true);
-        return promises.concat(
-          (async () => {
-            try {
-              if (fileData.mimeType === MIME_TYPES.binary) {
-                throw new Error("Only images can be added to ImageCache");
-              }
-
-              const imagePromise = loadHTMLImageElement(fileData.dataURL);
-              const data = {
-                image: imagePromise,
-                mimeType: fileData.mimeType,
-              } as const;
-              // store the promise immediately to indicate there's an in-progress
-              // initialization
-              imageCache.set(fileId, data);
-
-              const image = await imagePromise;
-
-              imageCache.set(fileId, { ...data, image });
-            } catch (error) {
-              erroredFiles.set(fileId, true);
-            }
-          })(),
-        );
-      }
-      return promises;
-    }, [] as Promise<any>[]),
-  );
-
-  return {
-    imageCache,
-    /** includes errored files because they cache was updated nonetheless */
-    updatedFiles,
-    /** files that failed when creating HTMLImageElement */
-    erroredFiles,
-  };
-};
-
-export const getInitializedImageElements = (
-  elements: readonly ExcalidrawElement[],
-) =>
-  elements.filter((element) =>
-    isInitializedImageElement(element),
-  ) as InitializedExcalidrawImageElement[];
-
-export const isHTMLSVGElement = (node: Node | null): node is SVGElement => {
-  // lower-casing due to XML/HTML convention differences
-  // https://johnresig.com/blog/nodename-case-sensitivity
-  return node?.nodeName.toLowerCase() === "svg";
-};
-
-export const normalizeSVG = async (SVGString: string) => {
-  const doc = new DOMParser().parseFromString(SVGString, MIME_TYPES.svg);
-  const svg = doc.querySelector("svg");
-  const errorNode = doc.querySelector("parsererror");
-  if (errorNode || !isHTMLSVGElement(svg)) {
-    throw new Error(t("errors.invalidSVGString"));
-  } else {
-    if (!svg.hasAttribute("xmlns")) {
-      svg.setAttribute("xmlns", SVG_NS);
-    }
-
-    return svg.outerHTML;
-  }
-};

src/element/index.ts

@@ -11,7 +11,6 @@ export {
   newTextElement,
   updateTextElement,
   newLinearElement,
-  newImageElement,
   duplicateElement,
 } from "./newElement";
 export {
@@ -94,10 +93,6 @@ const _clearElements = (
       : element,
   );
 
-export const clearElementsForDatabase = (
-  elements: readonly ExcalidrawElement[],
-) => _clearElements(elements);
-
 export const clearElementsForExport = (
   elements: readonly ExcalidrawElement[],
 ) => _clearElements(elements);

src/element/mutateElement.ts

@@ -17,13 +17,12 @@ type ElementUpdate<TElement extends ExcalidrawElement> = Omit<
 export const mutateElement = <TElement extends Mutable<ExcalidrawElement>>(
   element: TElement,
   updates: ElementUpdate<TElement>,
-  informMutation = true,
-): TElement => {
+) => {
   let didChange = false;
 
   // casting to any because can't use `in` operator
   // (see https://github.com/microsoft/TypeScript/issues/21732)
-  const { points, fileId } = updates as any;
+  const { points } = updates as any;
 
   if (typeof points !== "undefined") {
     updates = { ...getSizeFromPoints(points), ...updates };
@@ -34,23 +33,13 @@ export const mutateElement = <TElement extends Mutable<ExcalidrawElement>>(
     if (typeof value !== "undefined") {
       if (
         (element as any)[key] === value &&
-        // if object, always update because its attrs could have changed
-        // (except for specific keys we handle below)
-        (typeof value !== "object" ||
-          value === null ||
-          key === "groupIds" ||
-          key === "scale")
+        // if object, always update in case its deep prop was mutated
+        (typeof value !== "object" || value === null || key === "groupIds")
       ) {
         continue;
       }
 
-      if (key === "scale") {
-        const prevScale = (element as any)[key];
-        const nextScale = value;
-        if (prevScale[0] === nextScale[0] && prevScale[1] === nextScale[1]) {
-          continue;
-        }
-      } else if (key === "points") {
+      if (key === "points") {
         const prevPoints = (element as any)[key];
         const nextPoints = value;
         if (prevPoints.length === nextPoints.length) {
@@ -77,14 +66,14 @@ export const mutateElement = <TElement extends Mutable<ExcalidrawElement>>(
       didChange = true;
     }
   }
+
   if (!didChange) {
-    return element;
+    return;
   }
 
   if (
     typeof updates.height !== "undefined" ||
     typeof updates.width !== "undefined" ||
-    typeof fileId != "undefined" ||
     typeof points !== "undefined"
   ) {
     invalidateShapeForElement(element);
@@ -92,12 +81,7 @@ export const mutateElement = <TElement extends Mutable<ExcalidrawElement>>(
 
   element.version++;
   element.versionNonce = randomInteger();
-
-  if (informMutation) {
   Scene.getScene(element)?.informMutation();
-  }
-
-  return element;
 };
 
 export const newElementWith = <TElement extends ExcalidrawElement>(
@@ -110,8 +94,8 @@ export const newElementWith = <TElement extends ExcalidrawElement>(
     if (typeof value !== "undefined") {
       if (
         (element as any)[key] === value &&
-        // if object, always update because its attrs could have changed
-        (typeof value !== "object" || value === null)
+        // if object, always update in case its deep prop was mutated
+        (typeof value !== "object" || value === null || key === "groupIds")
       ) {
         continue;
       }
@@ -136,11 +120,8 @@ export const newElementWith = <TElement extends ExcalidrawElement>(
  *
  * NOTE: does not trigger re-render.
  */
-export const bumpVersion = (
-  element: Mutable<ExcalidrawElement>,
-  version?: ExcalidrawElement["version"],
-) => {
-  element.version = (version ?? element.version) + 1;
+export const bumpVersion = (element: Mutable<ExcalidrawElement>) => {
+  element.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

@@ -1,16 +1,15 @@
 import {
   ExcalidrawElement,
-  ExcalidrawImageElement,
   ExcalidrawTextElement,
   ExcalidrawLinearElement,
   ExcalidrawGenericElement,
   NonDeleted,
   TextAlign,
+  FontFamily,
   GroupId,
   VerticalAlign,
   Arrowhead,
   ExcalidrawFreeDrawElement,
-  FontFamilyValues,
 } from "../element/types";
 import { measureText, getFontString } from "../utils";
 import { randomInteger, randomId } from "../random";
@@ -110,7 +109,7 @@ export const newTextElement = (
   opts: {
     text: string;
     fontSize: number;
-    fontFamily: FontFamilyValues;
+    fontFamily: FontFamily;
     textAlign: TextAlign;
     verticalAlign: VerticalAlign;
   } & ElementConstructorOpts,
@@ -249,22 +248,6 @@ export const newLinearElement = (
   };
 };
 
-export const newImageElement = (
-  opts: {
-    type: ExcalidrawImageElement["type"];
-  } & ElementConstructorOpts,
-): NonDeleted<ExcalidrawImageElement> => {
-  return {
-    ..._newElementBase<ExcalidrawImageElement>("image", opts),
-    // in the future we'll support changing stroke color for some SVG elements,
-    // and `transparent` will likely mean "use original colors of the image"
-    strokeColor: "transparent",
-    status: "pending",
-    fileId: null,
-    scale: [1, 1],
-  };
-};
-
 // Simplified deep clone for the purpose of cloning ExcalidrawElement only
 // (doesn't clone Date, RegExp, Map, Set, Typed arrays etc.)
 //
@@ -324,19 +307,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,

src/element/resizeElements.ts

@@ -32,7 +32,8 @@ import {
   MaybeTransformHandleType,
   TransformHandleDirection,
 } from "./transformHandles";
-import { Point, PointerDownState } from "../types";
+import { PointerDownState } from "../components/App";
+import { Point } from "../types";
 
 export const normalizeAngle = (angle: number): number => {
   if (angle >= 2 * Math.PI) {
@@ -47,9 +48,9 @@ export const transformElements = (
   transformHandleType: MaybeTransformHandleType,
   selectedElements: readonly NonDeletedExcalidrawElement[],
   resizeArrowDirection: "origin" | "end",
-  shouldRotateWithDiscreteAngle: boolean,
-  shouldResizeFromCenter: boolean,
-  shouldMaintainAspectRatio: boolean,
+  isRotateWithDiscreteAngle: boolean,
+  isResizeCenterPoint: boolean,
+  shouldKeepSidesRatio: boolean,
   pointerX: number,
   pointerY: number,
   centerX: number,
@@ -62,7 +63,7 @@ export const transformElements = (
         element,
         pointerX,
         pointerY,
-        shouldRotateWithDiscreteAngle,
+        isRotateWithDiscreteAngle,
       );
       updateBoundElements(element);
     } else if (
@@ -76,7 +77,7 @@ export const transformElements = (
       reshapeSingleTwoPointElement(
         element,
         resizeArrowDirection,
-        shouldRotateWithDiscreteAngle,
+        isRotateWithDiscreteAngle,
         pointerX,
         pointerY,
       );
@@ -90,7 +91,7 @@ export const transformElements = (
       resizeSingleTextElement(
         element,
         transformHandleType,
-        shouldResizeFromCenter,
+        isResizeCenterPoint,
         pointerX,
         pointerY,
       );
@@ -98,10 +99,10 @@ export const transformElements = (
     } else if (transformHandleType) {
       resizeSingleElement(
         pointerDownState.originalElements.get(element.id) as typeof element,
-        shouldMaintainAspectRatio,
+        shouldKeepSidesRatio,
         element,
         transformHandleType,
-        shouldResizeFromCenter,
+        isResizeCenterPoint,
         pointerX,
         pointerY,
       );
@@ -115,7 +116,7 @@ export const transformElements = (
         selectedElements,
         pointerX,
         pointerY,
-        shouldRotateWithDiscreteAngle,
+        isRotateWithDiscreteAngle,
         centerX,
         centerY,
       );
@@ -142,13 +143,13 @@ const rotateSingleElement = (
   element: NonDeletedExcalidrawElement,
   pointerX: number,
   pointerY: number,
-  shouldRotateWithDiscreteAngle: boolean,
+  isRotateWithDiscreteAngle: boolean,
 ) => {
   const [x1, y1, x2, y2] = getElementAbsoluteCoords(element);
   const cx = (x1 + x2) / 2;
   const cy = (y1 + y2) / 2;
   let angle = (5 * Math.PI) / 2 + Math.atan2(pointerY - cy, pointerX - cx);
-  if (shouldRotateWithDiscreteAngle) {
+  if (isRotateWithDiscreteAngle) {
     angle += SHIFT_LOCKING_ANGLE / 2;
     angle -= angle % SHIFT_LOCKING_ANGLE;
   }
@@ -187,7 +188,7 @@ const getPerfectElementSizeWithRotation = (
 export const reshapeSingleTwoPointElement = (
   element: NonDeleted<ExcalidrawLinearElement>,
   resizeArrowDirection: "origin" | "end",
-  shouldRotateWithDiscreteAngle: boolean,
+  isRotateWithDiscreteAngle: boolean,
   pointerX: number,
   pointerY: number,
 ) => {
@@ -212,7 +213,7 @@ export const reshapeSingleTwoPointElement = (
           element.x + element.points[1][0] - rotatedX,
           element.y + element.points[1][1] - rotatedY,
         ];
-  if (shouldRotateWithDiscreteAngle) {
+  if (isRotateWithDiscreteAngle) {
     [width, height] = getPerfectElementSizeWithRotation(
       element.type,
       width,
@@ -281,28 +282,28 @@ const measureFontSizeFromWH = (
 
 const getSidesForTransformHandle = (
   transformHandleType: TransformHandleType,
-  shouldResizeFromCenter: boolean,
+  isResizeFromCenter: boolean,
 ) => {
   return {
     n:
       /^(n|ne|nw)$/.test(transformHandleType) ||
-      (shouldResizeFromCenter && /^(s|se|sw)$/.test(transformHandleType)),
+      (isResizeFromCenter && /^(s|se|sw)$/.test(transformHandleType)),
     s:
       /^(s|se|sw)$/.test(transformHandleType) ||
-      (shouldResizeFromCenter && /^(n|ne|nw)$/.test(transformHandleType)),
+      (isResizeFromCenter && /^(n|ne|nw)$/.test(transformHandleType)),
     w:
       /^(w|nw|sw)$/.test(transformHandleType) ||
-      (shouldResizeFromCenter && /^(e|ne|se)$/.test(transformHandleType)),
+      (isResizeFromCenter && /^(e|ne|se)$/.test(transformHandleType)),
     e:
       /^(e|ne|se)$/.test(transformHandleType) ||
-      (shouldResizeFromCenter && /^(w|nw|sw)$/.test(transformHandleType)),
+      (isResizeFromCenter && /^(w|nw|sw)$/.test(transformHandleType)),
   };
 };
 
 const resizeSingleTextElement = (
   element: NonDeleted<ExcalidrawTextElement>,
   transformHandleType: "nw" | "ne" | "sw" | "se",
-  shouldResizeFromCenter: boolean,
+  isResizeFromCenter: boolean,
   pointerX: number,
   pointerY: number,
 ) => {
@@ -361,7 +362,7 @@ const resizeSingleTextElement = (
     const deltaX2 = (x2 - nextX2) / 2;
     const deltaY2 = (y2 - nextY2) / 2;
     const [nextElementX, nextElementY] = adjustXYWithRotation(
-      getSidesForTransformHandle(transformHandleType, shouldResizeFromCenter),
+      getSidesForTransformHandle(transformHandleType, isResizeFromCenter),
       element.x,
       element.y,
       element.angle,
@@ -383,10 +384,10 @@ const resizeSingleTextElement = (
 
 export const resizeSingleElement = (
   stateAtResizeStart: NonDeletedExcalidrawElement,
-  shouldMaintainAspectRatio: boolean,
+  shouldKeepSidesRatio: boolean,
   element: NonDeletedExcalidrawElement,
   transformHandleDirection: TransformHandleDirection,
-  shouldResizeFromCenter: boolean,
+  isResizeFromCenter: boolean,
   pointerX: number,
   pointerY: number,
 ) => {
@@ -444,13 +445,13 @@ export const resizeSingleElement = (
   let eleNewHeight = element.height * scaleY;
 
   // adjust dimensions for resizing from center
-  if (shouldResizeFromCenter) {
+  if (isResizeFromCenter) {
     eleNewWidth = 2 * eleNewWidth - eleInitialWidth;
     eleNewHeight = 2 * eleNewHeight - eleInitialHeight;
   }
 
   // adjust dimensions to keep sides ratio
-  if (shouldMaintainAspectRatio) {
+  if (shouldKeepSidesRatio) {
     const widthRatio = Math.abs(eleNewWidth) / eleInitialWidth;
     const heightRatio = Math.abs(eleNewHeight) / eleInitialHeight;
     if (transformHandleDirection.length === 1) {
@@ -495,7 +496,7 @@ export const resizeSingleElement = (
   }
 
   // Keeps opposite handle fixed during resize
-  if (shouldMaintainAspectRatio) {
+  if (shouldKeepSidesRatio) {
     if (["s", "n"].includes(transformHandleDirection)) {
       newTopLeft[0] = startCenter[0] - newBoundsWidth / 2;
     }
@@ -523,7 +524,7 @@ export const resizeSingleElement = (
     }
   }
 
-  if (shouldResizeFromCenter) {
+  if (isResizeFromCenter) {
     newTopLeft[0] = startCenter[0] - Math.abs(newBoundsWidth) / 2;
     newTopLeft[1] = startCenter[1] - Math.abs(newBoundsHeight) / 2;
   }
@@ -558,18 +559,6 @@ export const resizeSingleElement = (
     ...rescaledPoints,
   };
 
-  if ("scale" in element && "scale" in stateAtResizeStart) {
-    mutateElement(element, {
-      scale: [
-        // defaulting because scaleX/Y can be 0/-0
-        (Math.sign(scaleX) || stateAtResizeStart.scale[0]) *
-          stateAtResizeStart.scale[0],
-        (Math.sign(scaleY) || stateAtResizeStart.scale[1]) *
-          stateAtResizeStart.scale[1],
-      ],
-    });
-  }
-
   if (
     resizedElement.width !== 0 &&
     resizedElement.height !== 0 &&
@@ -704,13 +693,13 @@ const rotateMultipleElements = (
   elements: readonly NonDeletedExcalidrawElement[],
   pointerX: number,
   pointerY: number,
-  shouldRotateWithDiscreteAngle: boolean,
+  isRotateWithDiscreteAngle: boolean,
   centerX: number,
   centerY: number,
 ) => {
   let centerAngle =
     (5 * Math.PI) / 2 + Math.atan2(pointerY - centerY, pointerX - centerX);
-  if (shouldRotateWithDiscreteAngle) {
+  if (isRotateWithDiscreteAngle) {
     centerAngle += SHIFT_LOCKING_ANGLE / 2;
     centerAngle -= centerAngle % SHIFT_LOCKING_ANGLE;
   }