chore(deps): bump image-blob-reduce from 3.0.1 to 4.1.0

Bumps [image-blob-reduce](https://github.com/nodeca/image-blob-reduce) from 3.0.1 to 4.1.0.
- [Release notes](https://github.com/nodeca/image-blob-reduce/releases)
- [Changelog](https://github.com/nodeca/image-blob-reduce/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nodeca/image-blob-reduce/compare/3.0.1...4.1.0)

---
updated-dependencies:
- dependency-name: image-blob-reduce
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

.dockerignore

@@ -1,6 +1,5 @@
 *
-!.env.development
+!.env
-!.env.production
 !.eslintrc.json
 !.npmrc
 !.prettierrc

.env.development

@@ -20,5 +20,3 @@ REACT_APP_DEV_ENABLE_SW=
 # whether to disable live reload / HMR. Usuaully what you want to do when
 # debugging Service Workers.
 REACT_APP_DEV_DISABLE_LIVE_RELOAD=
-
-FAST_REFRESH=false

.github/workflows/autorelease-excalidraw.yml

@@ -2,7 +2,7 @@ name: Auto release excalidraw next
 on:
   push:
     branches:
-      - release
+      - master
 
 jobs:
   Auto-release-excalidraw-next:

.github/workflows/build-docker.yml

@@ -3,7 +3,7 @@ name: Build Docker image
 on:
   push:
     branches:
-      - release
+      - master
 
 jobs:
   build-docker:

.github/workflows/cancel.yml

@@ -3,7 +3,7 @@ name: Cancel previous runs
 on:
   push:
     branches:
-      - release
+      - master
   pull_request:
 
 jobs:

.github/workflows/publish-docker.yml

@@ -3,7 +3,7 @@ name: Publish Docker
 on:
   push:
     branches:
-      - release
+      - master
 
 jobs:
   publish-docker:

.github/workflows/sentry-production.yml

@@ -3,7 +3,7 @@ name: New Sentry production release
 on:
   push:
     branches:
-      - release
+      - master
 
 jobs:
   sentry:

dev-docs/yarn.lock

@@ -4755,9 +4755,9 @@ loader-runner@^4.2.0:
   integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==
 
 loader-utils@^2.0.0:
-  version "2.0.4"
+  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129"
-  integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==
+  integrity sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==
   dependencies:
     big.js "^5.2.2"
     emojis-list "^3.0.0"

package.json

@@ -31,12 +31,11 @@
     "@types/socket.io-client": "1.4.36",
     "browser-fs-access": "0.29.1",
     "clsx": "1.1.1",
-    "cross-env": "7.0.3",
     "fake-indexeddb": "3.1.7",
     "firebase": "8.3.3",
     "i18next-browser-languagedetector": "6.1.4",
     "idb-keyval": "6.0.3",
-    "image-blob-reduce": "3.0.1",
+    "image-blob-reduce": "4.1.0",
     "jotai": "1.6.4",
     "lodash.throttle": "4.1.1",
     "nanoid": "3.3.3",
@@ -51,23 +50,11 @@
     "pwacompat": "2.0.17",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "react-scripts": "5.0.1",
+    "react-scripts": "4.0.3",
     "roughjs": "4.5.2",
     "sass": "1.51.0",
     "socket.io-client": "2.3.1",
-    "typescript": "4.9.4",
+    "typescript": "4.5.5"
-    "workbox-background-sync": "^6.5.4",
-    "workbox-broadcast-update": "^6.5.4",
-    "workbox-cacheable-response": "^6.5.4",
-    "workbox-core": "^6.5.4",
-    "workbox-expiration": "^6.5.4",
-    "workbox-google-analytics": "^6.5.4",
-    "workbox-navigation-preload": "^6.5.4",
-    "workbox-precaching": "^6.5.4",
-    "workbox-range-requests": "^6.5.4",
-    "workbox-routing": "^6.5.4",
-    "workbox-strategies": "^6.5.4",
-    "workbox-streams": "^6.5.4"
   },
   "devDependencies": {
     "@excalidraw/eslint-config": "1.0.0",
@@ -80,7 +67,6 @@
     "dotenv": "16.0.1",
     "eslint-config-prettier": "8.5.0",
     "eslint-plugin-prettier": "3.3.1",
-    "http-server": "14.1.1",
     "husky": "7.0.4",
     "jest-canvas-mock": "2.4.0",
     "lint-staged": "12.3.7",
@@ -104,9 +90,10 @@
   "scripts": {
     "build-node": "node ./scripts/build-node.js",
     "build:app:docker": "REACT_APP_DISABLE_SENTRY=true react-scripts build",
-    "build:app": "cross-env REACT_APP_GIT_SHA=$VERCEL_GIT_COMMIT_SHA react-scripts build",
+    "build:app": "REACT_APP_GIT_SHA=$VERCEL_GIT_COMMIT_SHA react-scripts build",
     "build:version": "node ./scripts/build-version.js",
-    "build": "yarn build:app && yarn build:version",
+    "build:prebuild": "node ./scripts/prebuild.js",
+    "build": "yarn build:prebuild && yarn build:app && yarn build:version",
     "eject": "react-scripts eject",
     "fix:code": "yarn test:code --fix",
     "fix:other": "yarn prettier --write",
@@ -116,7 +103,6 @@
     "prepare": "husky install",
     "prettier": "prettier \"**/*.{css,scss,json,md,html,yml}\" --ignore-path=.eslintignore",
     "start": "react-scripts start",
-    "start:production": "npm run build && npx http-server build -a localhost -p 5001 -o",
     "test:all": "yarn test:typecheck && yarn test:code && yarn test:other && yarn test:app --watchAll=false",
     "test:app": "react-scripts test --passWithNoTests",
     "test:code": "eslint --max-warnings=0 --ext .js,.ts,.tsx .",

public/fonts.css

@@ -11,28 +11,3 @@
   src: url("Cascadia.woff2");
   font-display: swap;
 }
-
-@font-face {
-  font-family: "Assistant";
-  src: url("Assistant-Regular.woff2");
-  font-display: swap;
-  font-weight: 400;
-}
-@font-face {
-  font-family: "Assistant";
-  src: url("Assistant-Medium.woff2");
-  font-display: swap;
-  font-weight: 500;
-}
-@font-face {
-  font-family: "Assistant";
-  src: url("Assistant-SemiBold.woff2");
-  font-display: swap;
-  font-weight: 600;
-}
-@font-face {
-  font-family: "Assistant";
-  src: url("Assistant-Bold.woff2");
-  font-display: swap;
-  font-weight: 700;
-}

public/index.html

@@ -8,57 +8,49 @@
       content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, viewport-fit=cover, shrink-to-fit=no"
     />
     <meta name="referrer" content="origin" />
+
     <meta name="mobile-web-app-capable" content="yes" />
-    <meta name="theme-color" content="#121212" />
 
-    <!-- Primary Meta Tags -->
+    <meta name="theme-color" content="#000" />
-    <meta
-      name="title"
-      content="Excalidraw — Collaborative whiteboarding made easy"
-    />
-    <meta
-      name="description"
-      content="Excalidraw is a virtual collaborative whiteboard tool that lets you easily sketch diagrams that have a hand-drawn feel to them."
-    />
-    <meta name="image" content="https://excalidraw.com/og-general-v1.png" />
-
-    <!-- Open Graph / Facebook -->
-    <meta property="og:site_name" content="Excalidraw" />
-    <meta property="og:type" content="website" />
-    <meta property="og:url" content="https://excalidraw.com" />
-    <meta
-      property="og:title"
-      content="Excalidraw — Collaborative whiteboarding made easy"
-    />
-    <meta property="og:image:alt" content="Excalidraw logo" />
-    <meta
-      property="og:description"
-      content="Excalidraw is a virtual collaborative whiteboard tool that lets you easily sketch diagrams that have a hand-drawn feel to them."
-    />
-    <meta property="og:image" content="https://excalidraw.com/og-fb-v1.png" />
-
-    <!-- Twitter -->
-    <meta property="twitter:card" content="summary_large_image" />
-    <meta property="twitter:site" content="@excalidraw" />
-    <meta property="twitter:url" content="https://excalidraw.com" />
-    <meta
-      property="twitter:title"
-      content="Excalidraw — Collaborative whiteboarding made easy"
-    />
-    <meta
-      property="twitter:description"
-      content="Excalidraw is a virtual collaborative whiteboard tool that lets you easily sketch diagrams that have a hand-drawn feel to them."
-    />
-    <meta
-      property="twitter:image"
-      content="https://excalidraw.com/og-twitter-v1.png"
-    />
 
     <!-- General tags -->
     <meta
       name="description"
       content="Excalidraw is a virtual collaborative whiteboard tool that lets you easily sketch diagrams that have a hand-drawn feel to them."
     />
+    <meta name="image" content="og-image.png" />
+
+    <!-- OpenGraph tags -->
+    <meta property="og:url" content="https://excalidraw.com" />
+    <meta property="og:site_name" content="Excalidraw" />
+    <meta property="og:type" content="website" />
+    <meta property="og:title" content="Excalidraw" />
+    <meta
+      property="og:description"
+      content="Excalidraw is a whiteboard tool that lets you easily sketch diagrams that have a hand-drawn feel to them."
+    />
+    <!-- OG tags require an absolute url for images -->
+    <meta
+      property="og:image"
+      name="twitter:image"
+      content="https://excalidraw.com/og-image.png"
+    />
+    <meta
+      property="og:image:secure_url"
+      name="twitter:image"
+      content="https://excalidraw.com/og-image.png"
+    />
+    <meta property="og:image:width" content="1280" />
+    <meta property="og:image:height" content="669" />
+    <meta property="og:image:alt" content="Excalidraw logo with byline." />
+
+    <!-- Twitter Card tags -->
+    <meta name="twitter:card" content="summary_large_image" />
+    <meta name="twitter:title" content="Excalidraw" />
+    <meta
+      name="twitter:description"
+      content="Excalidraw is a whiteboard tool that lets you easily sketch diagrams that have a hand-drawn feel to them."
+    />
 
     <!------------------------------------------------------------------------->
     <!--   to minimize white flash on load when user has dark mode enabled   -->
@@ -166,8 +158,8 @@
       body,
       html {
         margin: 0;
-        --ui-font: Assistant, system-ui, BlinkMacSystemFont, -apple-system,
+        --ui-font: system-ui, BlinkMacSystemFont, -apple-system, Segoe UI,
-          Segoe UI, Roboto, Helvetica, Arial, sans-serif;
+          Roboto, Helvetica, Arial, sans-serif;
         font-family: var(--ui-font);
         -webkit-text-size-adjust: 100%;
 

public/robots.txt

@@ -1,9 +1,3 @@
-User-agent: Twitterbot
-Disallow:
-
-User-agent: facebookexternalhit
-Disallow:
-
 user-agent: *
 Allow: /$
 Disallow: /

public/service-worker.js

@@ -0,0 +1,81 @@
+// eslint-disable-next-line no-restricted-globals
+// eslint-disable-next-line no-unused-expressions
+
+/* eslint-disable no-restricted-globals */
+/* global importScripts, workbox */
+
+/**
+ * Welcome to your Workbox-powered service worker!
+ *
+ * You'll need to register this file in your web app and you should
+ * disable HTTP caching for this file too.
+ * See https://goo.gl/nhQhGp
+ *
+ * The rest of the code is auto-generated. Please don't update this file
+ * directly; instead, make changes to your Workbox build configuration
+ * and re-run your build process.
+ * See https://goo.gl/2aRDsh
+ */
+
+// in dev, `process` is undefined because this file is not compiled until build
+const IS_DEVELOPMENT =
+  typeof process === "undefined" || process.env.NODE_ENV !== "production";
+
+if (IS_DEVELOPMENT) {
+  importScripts(
+    "https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js",
+  );
+  workbox.setConfig({
+    debug: true,
+  });
+} else {
+  importScripts("/workbox/workbox-sw.js");
+  workbox.setConfig({
+    modulePathPrefix: "/workbox/",
+  });
+}
+
+self.addEventListener("message", (event) => {
+  if (event.data && event.data.type === "SKIP_WAITING") {
+    self.skipWaiting();
+  }
+});
+
+workbox.core.clientsClaim();
+
+if (!IS_DEVELOPMENT) {
+  workbox.precaching.precacheAndRoute(self.__WB_MANIFEST);
+
+  workbox.routing.registerNavigationRoute(
+    workbox.precaching.getCacheKeyForURL("./index.html"),
+    {
+      blacklist: [/^\/_/, /\/[^/?]+\.[^/]+$/],
+    },
+  );
+}
+
+// Cache relevant font files
+workbox.routing.registerRoute(
+  new RegExp("/(fonts.css|.+.(ttf|woff2|otf))"),
+  new workbox.strategies.StaleWhileRevalidate({
+    cacheName: "fonts",
+    plugins: [new workbox.expiration.Plugin({ maxEntries: 10 })],
+  }),
+);
+
+self.addEventListener("fetch", (event) => {
+  if (
+    event.request.method === "POST" &&
+    event.request.url.endsWith("/web-share-target")
+  ) {
+    return event.respondWith(
+      (async () => {
+        const formData = await event.request.formData();
+        const file = formData.get("file");
+        const webShareTargetCache = await caches.open("web-share-target");
+        await webShareTargetCache.put("shared-file", new Response(file));
+        return Response.redirect("/?web-share-target", 303);
+      })(),
+    );
+  }
+});

scripts/locales-coverage-description.js

@@ -50,8 +50,8 @@ const crowdinMap = {
   "lv-LV": "en-lv",
   "cs-CZ": "en-cs",
   "kk-KZ": "en-kk",
-  "vi-VN": "en-vi",
+  "vi-vn": "en-vi",
-  "mr-IN": "en-mr",
+  "mr-in": "en-mr",
 };
 
 const flags = {
@@ -120,7 +120,6 @@ const languages = {
   "fa-IR": "فارسی",
   "fi-FI": "Suomi",
   "fr-FR": "Français",
-  "gl-ES": "Galego",
   "he-IL": "עברית",
   "hi-IN": "हिन्दी",
   "hu-HU": "Magyar",
@@ -130,7 +129,6 @@ const languages = {
   "kab-KAB": "Taqbaylit",
   "kk-KZ": "Қазақ тілі",
   "ko-KR": "한국어",
-  "ku-TR": "Kurdî",
   "lt-LT": "Lietuvių",
   "lv-LV": "Latviešu",
   "my-MM": "Burmese",

scripts/prebuild.js

@@ -0,0 +1,21 @@
+const fs = require("fs");
+const path = require("path");
+
+// for development purposes we want to have the service-worker.js file
+// accessible from the public folder. On build though, we need to compile it
+// and CRA expects that file to be in src/ folder.
+const moveServiceWorkerScript = () => {
+  const oldPath = path.resolve(__dirname, "../public/service-worker.js");
+  const newPath = path.resolve(__dirname, "../src/service-worker.js");
+
+  fs.rename(oldPath, newPath, (error) => {
+    if (error) {
+      throw error;
+    }
+    console.info("public/service-worker.js moved to src/");
+  });
+};
+
+// -----------------------------------------------------------------------------
+
+moveServiceWorkerScript();

src/actions/actionAlign.tsx

@@ -60,7 +60,7 @@ export const actionAlignTop = register({
     <ToolButton
       hidden={!enableActionGroup(elements, appState)}
       type="button"
-      icon={AlignTopIcon}
+      icon={<AlignTopIcon theme={appState.theme} />}
       onClick={() => updateData(null)}
       title={`${t("labels.alignTop")} — ${getShortcutKey(
         "CtrlOrCmd+Shift+Up",
@@ -90,7 +90,7 @@ export const actionAlignBottom = register({
     <ToolButton
       hidden={!enableActionGroup(elements, appState)}
       type="button"
-      icon={AlignBottomIcon}
+      icon={<AlignBottomIcon theme={appState.theme} />}
       onClick={() => updateData(null)}
       title={`${t("labels.alignBottom")} — ${getShortcutKey(
         "CtrlOrCmd+Shift+Down",
@@ -120,7 +120,7 @@ export const actionAlignLeft = register({
     <ToolButton
       hidden={!enableActionGroup(elements, appState)}
       type="button"
-      icon={AlignLeftIcon}
+      icon={<AlignLeftIcon theme={appState.theme} />}
       onClick={() => updateData(null)}
       title={`${t("labels.alignLeft")} — ${getShortcutKey(
         "CtrlOrCmd+Shift+Left",
@@ -151,7 +151,7 @@ export const actionAlignRight = register({
     <ToolButton
       hidden={!enableActionGroup(elements, appState)}
       type="button"
-      icon={AlignRightIcon}
+      icon={<AlignRightIcon theme={appState.theme} />}
       onClick={() => updateData(null)}
       title={`${t("labels.alignRight")} — ${getShortcutKey(
         "CtrlOrCmd+Shift+Right",
@@ -180,7 +180,7 @@ export const actionAlignVerticallyCentered = register({
     <ToolButton
       hidden={!enableActionGroup(elements, appState)}
       type="button"
-      icon={CenterVerticallyIcon}
+      icon={<CenterVerticallyIcon theme={appState.theme} />}
       onClick={() => updateData(null)}
       title={t("labels.centerVertically")}
       aria-label={t("labels.centerVertically")}
@@ -206,7 +206,7 @@ export const actionAlignHorizontallyCentered = register({
     <ToolButton
       hidden={!enableActionGroup(elements, appState)}
       type="button"
-      icon={CenterHorizontallyIcon}
+      icon={<CenterHorizontallyIcon theme={appState.theme} />}
       onClick={() => updateData(null)}
       title={t("labels.centerHorizontally")}
       aria-label={t("labels.centerHorizontally")}

src/actions/actionBoundText.tsx

@@ -6,10 +6,6 @@ import {
   measureText,
   redrawTextBoundingBox,
 } from "../element/textElement";
-import {
-  getOriginalContainerHeightFromCache,
-  resetOriginalContainerCache,
-} from "../element/textWysiwyg";
 import {
   hasBoundTextElement,
   isTextBindableContainer,
@@ -42,11 +38,6 @@ export const actionUnbindText = register({
           boundTextElement.originalText,
           getFontString(boundTextElement),
         );
-        const originalContainerHeight = getOriginalContainerHeightFromCache(
-          element.id,
-        );
-        resetOriginalContainerCache(element.id);
-
         mutateElement(boundTextElement as ExcalidrawTextElement, {
           containerId: null,
           width,
@@ -58,9 +49,6 @@ export const actionUnbindText = register({
           boundElements: element.boundElements?.filter(
             (ele) => ele.id !== boundTextElement.id,
           ),
-          height: originalContainerHeight
-            ? originalContainerHeight
-            : element.height,
         });
       }
     });

src/actions/actionCanvas.tsx

@@ -1,12 +1,7 @@
 import { ColorPicker } from "../components/ColorPicker";
-import {
+import { eraser, zoomIn, zoomOut } from "../components/icons";
-  eraser,
-  MoonIcon,
-  SunIcon,
-  ZoomInIcon,
-  ZoomOutIcon,
-} from "../components/icons";
 import { ToolButton } from "../components/ToolButton";
+import { DarkModeToggle } from "../components/DarkModeToggle";
 import { MIN_ZOOM, THEME, ZOOM_STEP } from "../constants";
 import { getCommonBounds, getNonDeletedElements } from "../element";
 import { ExcalidrawElement } from "../element/types";
@@ -23,8 +18,6 @@ import { newElementWith } from "../element/mutateElement";
 import { getDefaultAppState, isEraserActive } from "../appState";
 import ClearCanvas from "../components/ClearCanvas";
 import clsx from "clsx";
-import MenuItem from "../components/MenuItem";
-import { getShortcutFromShortcutName } from "./shortcuts";
 
 export const actionChangeViewBackgroundColor = register({
   name: "changeViewBackgroundColor",
@@ -90,7 +83,6 @@ export const actionClearCanvas = register({
 
 export const actionZoomIn = register({
   name: "zoomIn",
-  viewMode: true,
   trackEvent: { category: "canvas" },
   perform: (_elements, appState, _, app) => {
     return {
@@ -111,13 +103,13 @@ export const actionZoomIn = register({
   PanelComponent: ({ updateData }) => (
     <ToolButton
       type="button"
-      className="zoom-in-button zoom-button"
+      icon={zoomIn}
-      icon={ZoomInIcon}
       title={`${t("buttons.zoomIn")} — ${getShortcutKey("CtrlOrCmd++")}`}
       aria-label={t("buttons.zoomIn")}
       onClick={() => {
         updateData(null);
       }}
+      size="small"
     />
   ),
   keyTest: (event) =>
@@ -127,7 +119,6 @@ export const actionZoomIn = register({
 
 export const actionZoomOut = register({
   name: "zoomOut",
-  viewMode: true,
   trackEvent: { category: "canvas" },
   perform: (_elements, appState, _, app) => {
     return {
@@ -148,13 +139,13 @@ export const actionZoomOut = register({
   PanelComponent: ({ updateData }) => (
     <ToolButton
       type="button"
-      className="zoom-out-button zoom-button"
+      icon={zoomOut}
-      icon={ZoomOutIcon}
       title={`${t("buttons.zoomOut")} — ${getShortcutKey("CtrlOrCmd+-")}`}
       aria-label={t("buttons.zoomOut")}
       onClick={() => {
         updateData(null);
       }}
+      size="small"
     />
   ),
   keyTest: (event) =>
@@ -164,7 +155,6 @@ export const actionZoomOut = register({
 
 export const actionResetZoom = register({
   name: "resetZoom",
-  viewMode: true,
   trackEvent: { category: "canvas" },
   perform: (_elements, appState, _, app) => {
     return {
@@ -186,12 +176,13 @@ export const actionResetZoom = register({
     <Tooltip label={t("buttons.resetZoom")} style={{ height: "100%" }}>
       <ToolButton
         type="button"
-        className="reset-zoom-button zoom-button"
+        className="reset-zoom-button"
         title={t("buttons.resetZoom")}
         aria-label={t("buttons.resetZoom")}
         onClick={() => {
           updateData(null);
         }}
+        size="small"
       >
         {(appState.zoom.value * 100).toFixed(0)}%
       </ToolButton>
@@ -274,7 +265,6 @@ export const actionZoomToSelected = register({
 
 export const actionZoomToFit = register({
   name: "zoomToFit",
-  viewMode: true,
   trackEvent: { category: "canvas" },
   perform: (elements, appState) => zoomToFitElements(elements, appState, false),
   keyTest: (event) =>
@@ -286,7 +276,6 @@ export const actionZoomToFit = register({
 
 export const actionToggleTheme = register({
   name: "toggleTheme",
-  viewMode: true,
   trackEvent: { category: "canvas" },
   perform: (_, appState, value) => {
     return {
@@ -299,19 +288,14 @@ export const actionToggleTheme = register({
     };
   },
   PanelComponent: ({ appState, updateData }) => (
-    <MenuItem
+    <div style={{ marginInlineStart: "0.25rem" }}>
-      label={
+      <DarkModeToggle
-        appState.theme === "dark"
+        value={appState.theme}
-          ? t("buttons.lightMode")
+        onChange={(theme) => {
-          : t("buttons.darkMode")
+          updateData(theme);
-      }
-      onClick={() => {
-        updateData(appState.theme === THEME.LIGHT ? THEME.DARK : THEME.LIGHT);
         }}
-      icon={appState.theme === "dark" ? SunIcon : MoonIcon}
-      dataTestId="toggle-dark-mode"
-      shortcut={getShortcutFromShortcutName("toggleTheme")}
       />
+    </div>
   ),
   keyTest: (event) => event.altKey && event.shiftKey && event.code === CODES.D,
 });

src/actions/actionClipboard.tsx

@@ -3,7 +3,6 @@ import { register } from "./register";
 import {
   copyTextToSystemClipboard,
   copyToClipboard,
-  probablySupportsClipboardBlob,
   probablySupportsClipboardWriteText,
 } from "../clipboard";
 import { actionDeleteSelected } from "./actionDeleteSelected";
@@ -24,31 +23,11 @@ export const actionCopy = register({
       commitToHistory: false,
     };
   },
-  contextItemPredicate: (elements, appState, appProps, app) => {
-    return app.device.isMobile && !!navigator.clipboard;
-  },
   contextItemLabel: "labels.copy",
   // don't supply a shortcut since we handle this conditionally via onCopy event
   keyTest: undefined,
 });
 
-export const actionPaste = register({
-  name: "paste",
-  trackEvent: { category: "element" },
-  perform: (elements: any, appStates: any, data, app) => {
-    app.pasteFromClipboard(null);
-    return {
-      commitToHistory: false,
-    };
-  },
-  contextItemPredicate: (elements, appState, appProps, app) => {
-    return app.device.isMobile && !!navigator.clipboard;
-  },
-  contextItemLabel: "labels.paste",
-  // don't supply a shortcut since we handle this conditionally via onCopy event
-  keyTest: undefined,
-});
-
 export const actionCut = register({
   name: "cut",
   trackEvent: { category: "element" },
@@ -56,9 +35,6 @@ export const actionCut = register({
     actionCopy.perform(elements, appState, data, app);
     return actionDeleteSelected.perform(elements, appState);
   },
-  contextItemPredicate: (elements, appState, appProps, app) => {
-    return app.device.isMobile && !!navigator.clipboard;
-  },
   contextItemLabel: "labels.cut",
   keyTest: (event) => event[KEYS.CTRL_OR_CMD] && event.key === KEYS.X,
 });
@@ -101,9 +77,6 @@ export const actionCopyAsSvg = register({
       };
     }
   },
-  contextItemPredicate: (elements) => {
-    return probablySupportsClipboardWriteText && elements.length > 0;
-  },
   contextItemLabel: "labels.copyAsSvg",
 });
 
@@ -158,9 +131,6 @@ export const actionCopyAsPng = register({
       };
     }
   },
-  contextItemPredicate: (elements) => {
-    return probablySupportsClipboardBlob && elements.length > 0;
-  },
   contextItemLabel: "labels.copyAsPng",
   keyTest: (event) => event.code === CODES.C && event.altKey && event.shiftKey,
 });

src/actions/actionDeleteSelected.tsx

@@ -1,6 +1,7 @@
 import { isSomeElementSelected } from "../scene";
 import { KEYS } from "../keys";
 import { ToolButton } from "../components/ToolButton";
+import { trash } from "../components/icons";
 import { t } from "../i18n";
 import { register } from "./register";
 import { getNonDeletedElements } from "../element";
@@ -12,7 +13,6 @@ import { LinearElementEditor } from "../element/linearElementEditor";
 import { fixBindingsAfterDeletion } from "../element/binding";
 import { isBoundToContainer } from "../element/typeChecks";
 import { updateActiveTool } from "../utils";
-import { TrashIcon } from "../components/icons";
 
 const deleteSelectedElements = (
   elements: readonly ExcalidrawElement[],
@@ -72,22 +72,13 @@ export const actionDeleteSelected = register({
       if (!element) {
         return false;
       }
-      // case: no point selected → do nothing, as deleting the whole element
+      if (
-      // is most likely a mistake, where you wanted to delete a specific point
+        // case: no point selected → delete whole element
-      // but failed to select it (or you thought it's selected, while it was
+        selectedPointsIndices == null ||
-      // only in a hover state)
-      if (selectedPointsIndices == null) {
-        return false;
-      }
-
         // case: deleting last remaining point
-      if (element.points.length < 2) {
+        element.points.length < 2
-        const nextElements = elements.map((el) => {
+      ) {
-          if (el.id === element.id) {
+        const nextElements = elements.filter((el) => el.id !== element.id);
-            return newElementWith(el, { isDeleted: true });
-          }
-          return el;
-        });
         const nextAppState = handleGroupEditingState(appState, nextElements);
 
         return {
@@ -158,7 +149,7 @@ export const actionDeleteSelected = register({
   PanelComponent: ({ elements, appState, updateData }) => (
     <ToolButton
       type="button"
-      icon={TrashIcon}
+      icon={trash}
       title={t("labels.delete")}
       aria-label={t("labels.delete")}
       onClick={() => updateData(null)}

src/actions/actionDistribute.tsx

@@ -56,7 +56,7 @@ export const distributeHorizontally = register({
     <ToolButton
       hidden={!enableActionGroup(elements, appState)}
       type="button"
-      icon={DistributeHorizontallyIcon}
+      icon={<DistributeHorizontallyIcon theme={appState.theme} />}
       onClick={() => updateData(null)}
       title={`${t("labels.distributeHorizontally")} — ${getShortcutKey(
         "Alt+H",
@@ -86,7 +86,7 @@ export const distributeVertically = register({
     <ToolButton
       hidden={!enableActionGroup(elements, appState)}
       type="button"
-      icon={DistributeVerticallyIcon}
+      icon={<DistributeVerticallyIcon theme={appState.theme} />}
       onClick={() => updateData(null)}
       title={`${t("labels.distributeVertically")} — ${getShortcutKey("Alt+V")}`}
       aria-label={t("labels.distributeVertically")}

src/actions/actionDuplicateSelection.tsx

@@ -4,6 +4,7 @@ import { ExcalidrawElement } from "../element/types";
 import { duplicateElement, getNonDeletedElements } from "../element";
 import { getSelectedElements, isSomeElementSelected } from "../scene";
 import { ToolButton } from "../components/ToolButton";
+import { clone } from "../components/icons";
 import { t } from "../i18n";
 import { arrayToMap, getShortcutKey } from "../utils";
 import { LinearElementEditor } from "../element/linearElementEditor";
@@ -18,7 +19,6 @@ import { ActionResult } from "./types";
 import { GRID_SIZE } from "../constants";
 import { bindTextToShapeAfterDuplication } from "../element/textElement";
 import { isBoundToContainer } from "../element/typeChecks";
-import { DuplicateIcon } from "../components/icons";
 
 export const actionDuplicateSelection = register({
   name: "duplicateSelection",
@@ -49,7 +49,7 @@ export const actionDuplicateSelection = register({
   PanelComponent: ({ elements, appState, updateData }) => (
     <ToolButton
       type="button"
-      icon={DuplicateIcon}
+      icon={clone}
       title={`${t("labels.duplicateSelection")} — ${getShortcutKey(
         "CtrlOrCmd+D",
       )}`}

src/actions/actionExport.tsx

@@ -1,4 +1,4 @@
-import { LoadIcon, questionCircle, saveAs } from "../components/icons";
+import { load, questionCircle, saveAs } from "../components/icons";
 import { ProjectName } from "../components/ProjectName";
 import { ToolButton } from "../components/ToolButton";
 import "../components/ToolIcon.scss";
@@ -19,8 +19,6 @@ import { ActiveFile } from "../components/ActiveFile";
 import { isImageFileHandle } from "../data/blob";
 import { nativeFileSystemSupported } from "../data/filesystem";
 import { Theme } from "../element/types";
-import MenuItem from "../components/MenuItem";
-import { getShortcutFromShortcutName } from "./shortcuts";
 
 export const actionChangeProjectName = register({
   name: "changeProjectName",
@@ -179,7 +177,6 @@ export const actionSaveToActiveFile = register({
 
 export const actionSaveFileToDisk = register({
   name: "saveFileToDisk",
-  viewMode: true,
   trackEvent: { category: "export" },
   perform: async (elements, appState, value, app) => {
     try {
@@ -248,12 +245,14 @@ export const actionLoadScene = register({
   },
   keyTest: (event) => event[KEYS.CTRL_OR_CMD] && event.key === KEYS.O,
   PanelComponent: ({ updateData }) => (
-    <MenuItem
+    <ToolButton
-      label={t("buttons.load")}
+      type="button"
-      icon={LoadIcon}
+      icon={load}
+      title={t("buttons.load")}
+      aria-label={t("buttons.load")}
+      showAriaLabel={useDevice().isMobile}
       onClick={updateData}
-      dataTestId="load-button"
+      data-testid="load-button"
-      shortcut={getShortcutFromShortcutName("loadScene")}
     />
   ),
 });

src/actions/actionFlip.ts

@@ -14,7 +14,6 @@ import {
 } from "../element/bounds";
 import { isLinearElement } from "../element/typeChecks";
 import { LinearElementEditor } from "../element/linearElementEditor";
-import { KEYS } from "../keys";
 
 const enableActionFlipHorizontal = (
   elements: readonly ExcalidrawElement[],
@@ -64,8 +63,7 @@ export const actionFlipVertical = register({
       commitToHistory: true,
     };
   },
-  keyTest: (event) =>
+  keyTest: (event) => event.shiftKey && event.code === "KeyV",
-    event.shiftKey && event.code === "KeyV" && !event[KEYS.CTRL_OR_CMD],
   contextItemLabel: "labels.flipVertical",
   contextItemPredicate: (elements, appState) =>
     enableActionFlipVertical(elements, appState),
@@ -153,7 +151,11 @@ const flipElement = (
 
   let initialPointsCoords;
   if (isLinearElement(element)) {
-    initialPointsCoords = getElementPointsCoords(element, element.points);
+    initialPointsCoords = getElementPointsCoords(
+      element,
+      element.points,
+      element.strokeSharpness,
+    );
   }
   const initialElementAbsoluteCoords = getElementAbsoluteCoords(element);
 
@@ -211,7 +213,11 @@ const flipElement = (
     // Adjusting origin because when a beizer curve path exceeds min/max points it offsets the origin.
     // There's still room for improvement since when the line roughness is > 1
     // we still have a small offset of the origin when fliipping the element.
-    const finalPointsCoords = getElementPointsCoords(element, element.points);
+    const finalPointsCoords = getElementPointsCoords(
+      element,
+      element.points,
+      element.strokeSharpness,
+    );
 
     const topLeftCoordsDiff = initialPointsCoords[0] - finalPointsCoords[0];
     const topRightCoordDiff = initialPointsCoords[2] - finalPointsCoords[2];

src/actions/actionHistory.tsx

@@ -1,5 +1,5 @@
 import { Action, ActionResult } from "./types";
-import { UndoIcon, RedoIcon } from "../components/icons";
+import { undo, redo } from "../components/icons";
 import { ToolButton } from "../components/ToolButton";
 import { t } from "../i18n";
 import History, { HistoryEntry } from "../history";
@@ -72,7 +72,7 @@ export const createUndoAction: ActionCreator = (history) => ({
   PanelComponent: ({ updateData, data }) => (
     <ToolButton
       type="button"
-      icon={UndoIcon}
+      icon={undo}
       aria-label={t("buttons.undo")}
       onClick={updateData}
       size={data?.size || "medium"}
@@ -94,7 +94,7 @@ export const createRedoAction: ActionCreator = (history) => ({
   PanelComponent: ({ updateData, data }) => (
     <ToolButton
       type="button"
-      icon={RedoIcon}
+      icon={redo}
       aria-label={t("buttons.redo")}
       onClick={updateData}
       size={data?.size || "medium"}

src/actions/actionMenu.tsx

@@ -1,12 +1,11 @@
-import { HamburgerMenuIcon, HelpIcon, palette } from "../components/icons";
+import { menu, palette } from "../components/icons";
 import { ToolButton } from "../components/ToolButton";
 import { t } from "../i18n";
 import { showSelectedShapeActions, getNonDeletedElements } from "../element";
 import { register } from "./register";
 import { allowFullScreen, exitFullScreen, isFullScreen } from "../utils";
 import { KEYS } from "../keys";
-import { HelpButton } from "../components/HelpButton";
+import { HelpIcon } from "../components/HelpIcon";
-import MenuItem from "../components/MenuItem";
 
 export const actionToggleCanvasMenu = register({
   name: "toggleCanvasMenu",
@@ -21,7 +20,7 @@ export const actionToggleCanvasMenu = register({
   PanelComponent: ({ appState, updateData }) => (
     <ToolButton
       type="button"
-      icon={HamburgerMenuIcon}
+      icon={menu}
       aria-label={t("buttons.menu")}
       onClick={updateData}
       selected={appState.openMenu === "canvas"}
@@ -56,7 +55,6 @@ export const actionToggleEditMenu = register({
 
 export const actionFullScreen = register({
   name: "toggleFullScreen",
-  viewMode: true,
   trackEvent: { category: "canvas", predicate: (appState) => !isFullScreen() },
   perform: () => {
     if (!isFullScreen()) {
@@ -74,31 +72,21 @@ export const actionFullScreen = register({
 
 export const actionShortcuts = register({
   name: "toggleShortcuts",
-  viewMode: true,
   trackEvent: { category: "menu", action: "toggleHelpDialog" },
   perform: (_elements, appState, _, { focusContainer }) => {
-    if (appState.openDialog === "help") {
+    if (appState.showHelpDialog) {
       focusContainer();
     }
     return {
       appState: {
         ...appState,
-        openDialog: appState.openDialog === "help" ? null : "help",
+        showHelpDialog: !appState.showHelpDialog,
       },
       commitToHistory: false,
     };
   },
-  PanelComponent: ({ updateData, isInHamburgerMenu }) =>
+  PanelComponent: ({ updateData }) => (
-    isInHamburgerMenu ? (
+    <HelpIcon title={t("helpDialog.title")} onClick={updateData} />
-      <MenuItem
-        label={t("helpDialog.title")}
-        dataTestId="help-menu-item"
-        icon={HelpIcon}
-        onClick={updateData}
-        shortcut="?"
-      />
-    ) : (
-      <HelpButton title={t("helpDialog.title")} onClick={updateData} />
   ),
   keyTest: (event) => event.key === KEYS.QUESTION_MARK,
 });

src/actions/actionNavigate.tsx

@@ -6,7 +6,6 @@ import { register } from "./register";
 
 export const actionGoToCollaborator = register({
   name: "goToCollaborator",
-  viewMode: true,
   trackEvent: { category: "collab" },
   perform: (_elements, appState, value) => {
     const point = value as Collaborator["pointer"];

src/actions/actionProperties.tsx

@@ -2,47 +2,42 @@ import { AppState } from "../../src/types";
 import { ButtonIconSelect } from "../components/ButtonIconSelect";
 import { ColorPicker } from "../components/ColorPicker";
 import { IconPicker } from "../components/IconPicker";
-// TODO barnabasmolnar/editor-redesign
-// TextAlignTopIcon, TextAlignBottomIcon,TextAlignMiddleIcon,
-// ArrowHead icons
 import {
   ArrowheadArrowIcon,
   ArrowheadBarIcon,
   ArrowheadDotIcon,
   ArrowheadTriangleIcon,
   ArrowheadNoneIcon,
-  StrokeStyleDashedIcon,
+  EdgeRoundIcon,
-  StrokeStyleDottedIcon,
+  EdgeSharpIcon,
-  TextAlignTopIcon,
-  TextAlignBottomIcon,
-  TextAlignMiddleIcon,
-  FillHachureIcon,
   FillCrossHatchIcon,
+  FillHachureIcon,
   FillSolidIcon,
+  FontFamilyCodeIcon,
+  FontFamilyHandDrawnIcon,
+  FontFamilyNormalIcon,
+  FontSizeExtraLargeIcon,
+  FontSizeLargeIcon,
+  FontSizeMediumIcon,
+  FontSizeSmallIcon,
   SloppinessArchitectIcon,
   SloppinessArtistIcon,
   SloppinessCartoonistIcon,
-  StrokeWidthBaseIcon,
+  StrokeStyleDashedIcon,
-  StrokeWidthBoldIcon,
+  StrokeStyleDottedIcon,
-  StrokeWidthExtraBoldIcon,
+  StrokeStyleSolidIcon,
-  FontSizeSmallIcon,
+  StrokeWidthIcon,
-  FontSizeMediumIcon,
-  FontSizeLargeIcon,
-  FontSizeExtraLargeIcon,
-  EdgeSharpIcon,
-  EdgeRoundIcon,
-  FreedrawIcon,
-  FontFamilyNormalIcon,
-  FontFamilyCodeIcon,
-  TextAlignLeftIcon,
   TextAlignCenterIcon,
+  TextAlignLeftIcon,
   TextAlignRightIcon,
+  TextAlignTopIcon,
+  TextAlignBottomIcon,
+  TextAlignMiddleIcon,
 } from "../components/icons";
 import {
   DEFAULT_FONT_FAMILY,
   DEFAULT_FONT_SIZE,
   FONT_FAMILY,
-  ROUNDNESS,
   VERTICAL_ALIGN,
 } from "../constants";
 import {
@@ -58,7 +53,7 @@ import {
 import {
   isBoundToContainer,
   isLinearElement,
-  isUsingAdaptiveRadius,
+  isLinearElementType,
 } from "../element/typeChecks";
 import {
   Arrowhead,
@@ -73,7 +68,7 @@ import { getLanguage, t } from "../i18n";
 import { KEYS } from "../keys";
 import { randomInteger } from "../random";
 import {
-  canChangeRoundness,
+  canChangeSharpness,
   canHaveArrowheads,
   getCommonAttributeOfSelectedElements,
   getSelectedElements,
@@ -312,17 +307,17 @@ export const actionChangeFillStyle = register({
           {
             value: "hachure",
             text: t("labels.hachure"),
-            icon: FillHachureIcon,
+            icon: <FillHachureIcon theme={appState.theme} />,
           },
           {
             value: "cross-hatch",
             text: t("labels.crossHatch"),
-            icon: FillCrossHatchIcon,
+            icon: <FillCrossHatchIcon theme={appState.theme} />,
           },
           {
             value: "solid",
             text: t("labels.solid"),
-            icon: FillSolidIcon,
+            icon: <FillSolidIcon theme={appState.theme} />,
           },
         ]}
         group="fill"
@@ -363,17 +358,17 @@ export const actionChangeStrokeWidth = register({
           {
             value: 1,
             text: t("labels.thin"),
-            icon: StrokeWidthBaseIcon,
+            icon: <StrokeWidthIcon theme={appState.theme} strokeWidth={2} />,
           },
           {
             value: 2,
             text: t("labels.bold"),
-            icon: StrokeWidthBoldIcon,
+            icon: <StrokeWidthIcon theme={appState.theme} strokeWidth={6} />,
           },
           {
             value: 4,
             text: t("labels.extraBold"),
-            icon: StrokeWidthExtraBoldIcon,
+            icon: <StrokeWidthIcon theme={appState.theme} strokeWidth={10} />,
           },
         ]}
         value={getFormValue(
@@ -412,17 +407,17 @@ export const actionChangeSloppiness = register({
           {
             value: 0,
             text: t("labels.architect"),
-            icon: SloppinessArchitectIcon,
+            icon: <SloppinessArchitectIcon theme={appState.theme} />,
           },
           {
             value: 1,
             text: t("labels.artist"),
-            icon: SloppinessArtistIcon,
+            icon: <SloppinessArtistIcon theme={appState.theme} />,
           },
           {
             value: 2,
             text: t("labels.cartoonist"),
-            icon: SloppinessCartoonistIcon,
+            icon: <SloppinessCartoonistIcon theme={appState.theme} />,
           },
         ]}
         value={getFormValue(
@@ -460,17 +455,17 @@ export const actionChangeStrokeStyle = register({
           {
             value: "solid",
             text: t("labels.strokeStyle_solid"),
-            icon: StrokeWidthBaseIcon,
+            icon: <StrokeStyleSolidIcon theme={appState.theme} />,
           },
           {
             value: "dashed",
             text: t("labels.strokeStyle_dashed"),
-            icon: StrokeStyleDashedIcon,
+            icon: <StrokeStyleDashedIcon theme={appState.theme} />,
           },
           {
             value: "dotted",
             text: t("labels.strokeStyle_dotted"),
-            icon: StrokeStyleDottedIcon,
+            icon: <StrokeStyleDottedIcon theme={appState.theme} />,
           },
         ]}
         value={getFormValue(
@@ -540,25 +535,25 @@ export const actionChangeFontSize = register({
           {
             value: 16,
             text: t("labels.small"),
-            icon: FontSizeSmallIcon,
+            icon: <FontSizeSmallIcon theme={appState.theme} />,
             testId: "fontSize-small",
           },
           {
             value: 20,
             text: t("labels.medium"),
-            icon: FontSizeMediumIcon,
+            icon: <FontSizeMediumIcon theme={appState.theme} />,
             testId: "fontSize-medium",
           },
           {
             value: 28,
             text: t("labels.large"),
-            icon: FontSizeLargeIcon,
+            icon: <FontSizeLargeIcon theme={appState.theme} />,
             testId: "fontSize-large",
           },
           {
             value: 36,
             text: t("labels.veryLarge"),
-            icon: FontSizeExtraLargeIcon,
+            icon: <FontSizeExtraLargeIcon theme={appState.theme} />,
             testId: "fontSize-veryLarge",
           },
         ]}
@@ -663,17 +658,17 @@ export const actionChangeFontFamily = register({
       {
         value: FONT_FAMILY.Virgil,
         text: t("labels.handDrawn"),
-        icon: FreedrawIcon,
+        icon: <FontFamilyHandDrawnIcon theme={appState.theme} />,
       },
       {
         value: FONT_FAMILY.Helvetica,
         text: t("labels.normal"),
-        icon: FontFamilyNormalIcon,
+        icon: <FontFamilyNormalIcon theme={appState.theme} />,
       },
       {
         value: FONT_FAMILY.Cascadia,
         text: t("labels.code"),
-        icon: FontFamilyCodeIcon,
+        icon: <FontFamilyCodeIcon theme={appState.theme} />,
       },
     ];
 
@@ -744,17 +739,17 @@ export const actionChangeTextAlign = register({
             {
               value: "left",
               text: t("labels.left"),
-              icon: TextAlignLeftIcon,
+              icon: <TextAlignLeftIcon theme={appState.theme} />,
             },
             {
               value: "center",
               text: t("labels.center"),
-              icon: TextAlignCenterIcon,
+              icon: <TextAlignCenterIcon theme={appState.theme} />,
             },
             {
               value: "right",
               text: t("labels.right"),
-              icon: TextAlignRightIcon,
+              icon: <TextAlignRightIcon theme={appState.theme} />,
             },
           ]}
           value={getFormValue(
@@ -817,19 +812,16 @@ export const actionChangeVerticalAlign = register({
               value: VERTICAL_ALIGN.TOP,
               text: t("labels.alignTop"),
               icon: <TextAlignTopIcon theme={appState.theme} />,
-              testId: "align-top",
             },
             {
               value: VERTICAL_ALIGN.MIDDLE,
               text: t("labels.centerVertically"),
               icon: <TextAlignMiddleIcon theme={appState.theme} />,
-              testId: "align-middle",
             },
             {
               value: VERTICAL_ALIGN.BOTTOM,
               text: t("labels.alignBottom"),
               icon: <TextAlignBottomIcon theme={appState.theme} />,
-              testId: "align-bottom",
             },
           ]}
           value={getFormValue(elements, appState, (element) => {
@@ -849,41 +841,39 @@ export const actionChangeVerticalAlign = register({
   },
 });
 
-export const actionChangeRoundness = register({
+export const actionChangeSharpness = register({
-  name: "changeRoundness",
+  name: "changeSharpness",
   trackEvent: false,
   perform: (elements, appState, value) => {
-    return {
-      elements: changeProperty(elements, appState, (el) =>
-        newElementWith(el, {
-          roundness:
-            value === "round"
-              ? {
-                  type: isUsingAdaptiveRadius(el.type)
-                    ? ROUNDNESS.ADAPTIVE_RADIUS
-                    : ROUNDNESS.PROPORTIONAL_RADIUS,
-                }
-              : null,
-        }),
-      ),
-      appState: {
-        ...appState,
-        currentItemRoundness: value,
-      },
-      commitToHistory: true,
-    };
-  },
-  PanelComponent: ({ elements, appState, updateData }) => {
     const targetElements = getTargetElements(
       getNonDeletedElements(elements),
       appState,
     );
-
+    const shouldUpdateForNonLinearElements = targetElements.length
-    const hasLegacyRoundness = targetElements.some(
+      ? targetElements.every((el) => !isLinearElement(el))
-      (el) => el.roundness?.type === ROUNDNESS.LEGACY,
+      : !isLinearElementType(appState.activeTool.type);
-    );
+    const shouldUpdateForLinearElements = targetElements.length
-
+      ? targetElements.every(isLinearElement)
-    return (
+      : isLinearElementType(appState.activeTool.type);
+    return {
+      elements: changeProperty(elements, appState, (el) =>
+        newElementWith(el, {
+          strokeSharpness: value,
+        }),
+      ),
+      appState: {
+        ...appState,
+        currentItemStrokeSharpness: shouldUpdateForNonLinearElements
+          ? value
+          : appState.currentItemStrokeSharpness,
+        currentItemLinearStrokeSharpness: shouldUpdateForLinearElements
+          ? value
+          : appState.currentItemLinearStrokeSharpness,
+      },
+      commitToHistory: true,
+    };
+  },
+  PanelComponent: ({ elements, appState, updateData }) => (
     <fieldset>
       <legend>{t("labels.edges")}</legend>
       <ButtonIconSelect
@@ -892,28 +882,28 @@ export const actionChangeRoundness = register({
           {
             value: "sharp",
             text: t("labels.sharp"),
-              icon: EdgeSharpIcon,
+            icon: <EdgeSharpIcon theme={appState.theme} />,
           },
           {
             value: "round",
             text: t("labels.round"),
-              icon: EdgeRoundIcon,
+            icon: <EdgeRoundIcon theme={appState.theme} />,
           },
         ]}
         value={getFormValue(
           elements,
           appState,
-            (element) =>
+          (element) => element.strokeSharpness,
-              hasLegacyRoundness ? null : element.roundness ? "round" : "sharp",
+          (canChangeSharpness(appState.activeTool.type) &&
-            (canChangeRoundness(appState.activeTool.type) &&
+            (isLinearElementType(appState.activeTool.type)
-              appState.currentItemRoundness) ||
+              ? appState.currentItemLinearStrokeSharpness
+              : appState.currentItemStrokeSharpness)) ||
             null,
         )}
         onChange={(value) => updateData(value)}
       />
     </fieldset>
-    );
+  ),
-  },
 });
 
 export const actionChangeArrowhead = register({
@@ -959,38 +949,42 @@ export const actionChangeArrowhead = register({
     return (
       <fieldset>
         <legend>{t("labels.arrowheads")}</legend>
-        <div className="iconSelectList buttonList">
+        <div className="iconSelectList">
           <IconPicker
             label="arrowhead_start"
             options={[
               {
                 value: null,
                 text: t("labels.arrowhead_none"),
-                icon: ArrowheadNoneIcon,
+                icon: <ArrowheadNoneIcon theme={appState.theme} />,
                 keyBinding: "q",
               },
               {
                 value: "arrow",
                 text: t("labels.arrowhead_arrow"),
-                icon: <ArrowheadArrowIcon flip={!isRTL} />,
+                icon: (
+                  <ArrowheadArrowIcon theme={appState.theme} flip={!isRTL} />
+                ),
                 keyBinding: "w",
               },
               {
                 value: "bar",
                 text: t("labels.arrowhead_bar"),
-                icon: <ArrowheadBarIcon flip={!isRTL} />,
+                icon: <ArrowheadBarIcon theme={appState.theme} flip={!isRTL} />,
                 keyBinding: "e",
               },
               {
                 value: "dot",
                 text: t("labels.arrowhead_dot"),
-                icon: <ArrowheadDotIcon flip={!isRTL} />,
+                icon: <ArrowheadDotIcon theme={appState.theme} flip={!isRTL} />,
                 keyBinding: "r",
               },
               {
                 value: "triangle",
                 text: t("labels.arrowhead_triangle"),
-                icon: <ArrowheadTriangleIcon flip={!isRTL} />,
+                icon: (
+                  <ArrowheadTriangleIcon theme={appState.theme} flip={!isRTL} />
+                ),
                 keyBinding: "t",
               },
             ]}
@@ -1013,30 +1007,34 @@ export const actionChangeArrowhead = register({
                 value: null,
                 text: t("labels.arrowhead_none"),
                 keyBinding: "q",
-                icon: ArrowheadNoneIcon,
+                icon: <ArrowheadNoneIcon theme={appState.theme} />,
               },
               {
                 value: "arrow",
                 text: t("labels.arrowhead_arrow"),
                 keyBinding: "w",
-                icon: <ArrowheadArrowIcon flip={isRTL} />,
+                icon: (
+                  <ArrowheadArrowIcon theme={appState.theme} flip={isRTL} />
+                ),
               },
               {
                 value: "bar",
                 text: t("labels.arrowhead_bar"),
                 keyBinding: "e",
-                icon: <ArrowheadBarIcon flip={isRTL} />,
+                icon: <ArrowheadBarIcon theme={appState.theme} flip={isRTL} />,
               },
               {
                 value: "dot",
                 text: t("labels.arrowhead_dot"),
                 keyBinding: "r",
-                icon: <ArrowheadDotIcon flip={isRTL} />,
+                icon: <ArrowheadDotIcon theme={appState.theme} flip={isRTL} />,
               },
               {
                 value: "triangle",
                 text: t("labels.arrowhead_triangle"),
-                icon: <ArrowheadTriangleIcon flip={isRTL} />,
+                icon: (
+                  <ArrowheadTriangleIcon theme={appState.theme} flip={isRTL} />
+                ),
                 keyBinding: "t",
               },
             ]}

src/actions/actionStyles.ts

@@ -13,11 +13,7 @@ import {
   DEFAULT_TEXT_ALIGN,
 } from "../constants";
 import { getBoundTextElement } from "../element/textElement";
-import {
+import { hasBoundTextElement } from "../element/typeChecks";
-  hasBoundTextElement,
-  canApplyRoundnessTypeToElement,
-  getDefaultRoundnessTypeForElement,
-} from "../element/typeChecks";
 import { getSelectedElements } from "../scene";
 
 // `copiedStyles` is exported only for tests.
@@ -81,14 +77,6 @@ export const actionPasteStyles = register({
             fillStyle: elementStylesToCopyFrom?.fillStyle,
             opacity: elementStylesToCopyFrom?.opacity,
             roughness: elementStylesToCopyFrom?.roughness,
-            roundness: elementStylesToCopyFrom.roundness
-              ? canApplyRoundnessTypeToElement(
-                  elementStylesToCopyFrom.roundness.type,
-                  element,
-                )
-                ? elementStylesToCopyFrom.roundness
-                : getDefaultRoundnessTypeForElement(element)
-              : null,
           });
 
           if (isTextElement(newElement)) {

src/actions/actionToggleGridMode.tsx

@@ -5,7 +5,6 @@ import { AppState } from "../types";
 
 export const actionToggleGridMode = register({
   name: "gridMode",
-  viewMode: true,
   trackEvent: {
     category: "canvas",
     predicate: (appState) => !appState.gridSize,
@@ -20,9 +19,6 @@ export const actionToggleGridMode = register({
     };
   },
   checked: (appState: AppState) => appState.gridSize !== null,
-  contextItemPredicate: (element, appState, props) => {
-    return typeof props.gridModeEnabled === "undefined";
-  },
   contextItemLabel: "labels.showGrid",
   keyTest: (event) => event[KEYS.CTRL_OR_CMD] && event.code === CODES.QUOTE,
 });

src/actions/actionToggleLock.ts

@@ -41,9 +41,15 @@ export const actionToggleLock = register({
         : "labels.elementLock.lock";
     }
 
+    if (selected.length > 1) {
       return getOperation(selected) === "lock"
         ? "labels.elementLock.lockAll"
         : "labels.elementLock.unlockAll";
+    }
+
+    throw new Error(
+      "Unexpected zero elements to lock/unlock. This should never happen.",
+    );
   },
   keyTest: (event, appState, elements) => {
     return (

src/actions/actionToggleStats.tsx

@@ -3,7 +3,6 @@ import { CODES, KEYS } from "../keys";
 
 export const actionToggleStats = register({
   name: "stats",
-  viewMode: true,
   trackEvent: { category: "menu" },
   perform(elements, appState) {
     return {

src/actions/actionToggleViewMode.tsx

@@ -3,7 +3,6 @@ import { register } from "./register";
 
 export const actionToggleViewMode = register({
   name: "viewMode",
-  viewMode: true,
   trackEvent: {
     category: "canvas",
     predicate: (appState) => !appState.viewModeEnabled,
@@ -18,9 +17,6 @@ export const actionToggleViewMode = register({
     };
   },
   checked: (appState) => appState.viewModeEnabled,
-  contextItemPredicate: (elements, appState, appProps) => {
-    return typeof appProps.viewModeEnabled === "undefined";
-  },
   contextItemLabel: "labels.viewMode",
   keyTest: (event) =>
     !event[KEYS.CTRL_OR_CMD] && event.altKey && event.code === CODES.R,

src/actions/actionToggleZenMode.tsx

@@ -3,7 +3,6 @@ import { register } from "./register";
 
 export const actionToggleZenMode = register({
   name: "zenMode",
-  viewMode: true,
   trackEvent: {
     category: "canvas",
     predicate: (appState) => !appState.zenModeEnabled,
@@ -18,9 +17,6 @@ export const actionToggleZenMode = register({
     };
   },
   checked: (appState) => appState.zenModeEnabled,
-  contextItemPredicate: (elements, appState, appProps) => {
-    return typeof appProps.zenModeEnabled === "undefined";
-  },
   contextItemLabel: "buttons.zenMode",
   keyTest: (event) =>
     !event[KEYS.CTRL_OR_CMD] && event.altKey && event.code === CODES.Z,

src/actions/actionZindex.tsx

@@ -10,10 +10,10 @@ import { t } from "../i18n";
 import { getShortcutKey } from "../utils";
 import { register } from "./register";
 import {
-  BringForwardIcon,
-  BringToFrontIcon,
   SendBackwardIcon,
+  BringToFrontIcon,
   SendToBackIcon,
+  BringForwardIcon,
 } from "../components/icons";
 
 export const actionSendBackward = register({
@@ -39,7 +39,7 @@ export const actionSendBackward = register({
       onClick={() => updateData(null)}
       title={`${t("labels.sendBackward")} — ${getShortcutKey("CtrlOrCmd+[")}`}
     >
-      {SendBackwardIcon}
+      <SendBackwardIcon theme={appState.theme} />
     </button>
   ),
 });
@@ -67,7 +67,7 @@ export const actionBringForward = register({
       onClick={() => updateData(null)}
       title={`${t("labels.bringForward")} — ${getShortcutKey("CtrlOrCmd+]")}`}
     >
-      {BringForwardIcon}
+      <BringForwardIcon theme={appState.theme} />
     </button>
   ),
 });
@@ -102,7 +102,7 @@ export const actionSendToBack = register({
           : getShortcutKey("CtrlOrCmd+Shift+[")
       }`}
     >
-      {SendToBackIcon}
+      <SendToBackIcon theme={appState.theme} />
     </button>
   ),
 });
@@ -138,7 +138,7 @@ export const actionBringToFront = register({
           : getShortcutKey("CtrlOrCmd+Shift+]")
       }`}
     >
-      {BringToFrontIcon}
+      <BringToFrontIcon theme={appState.theme} />
     </button>
   ),
 });

src/actions/manager.tsx

@@ -9,6 +9,7 @@ import {
 } from "./types";
 import { ExcalidrawElement } from "../element/types";
 import { AppClassProperties, AppState } from "../types";
+import { MODES } from "../constants";
 import { trackEvent } from "../analytics";
 
 const trackAction = (
@@ -102,9 +103,12 @@ export class ActionManager {
 
     const action = data[0];
 
-    if (this.getAppState().viewModeEnabled && action.viewMode !== true) {
+    const { viewModeEnabled } = this.getAppState();
+    if (viewModeEnabled) {
+      if (!Object.values(MODES).includes(data[0].name)) {
         return false;
       }
+    }
 
     const elements = this.getElementsIncludingDeleted();
     const appState = this.getAppState();
@@ -131,13 +135,8 @@ export class ActionManager {
   /**
    * @param data additional data sent to the PanelComponent
    */
-  renderAction = (
+  renderAction = (name: ActionName, data?: PanelComponentProps["data"]) => {
-    name: ActionName,
-    data?: PanelComponentProps["data"],
-    isInHamburgerMenu = false,
-  ) => {
     const canvasActions = this.app.props.UIOptions.canvasActions;
-
     if (
       this.actions[name] &&
       "PanelComponent" in this.actions[name] &&
@@ -170,7 +169,6 @@ export class ActionManager {
           updateData={updateData}
           appProps={this.app.props}
           data={data}
-          isInHamburgerMenu={isInHamburgerMenu}
         />
       );
     }

src/actions/shortcuts.ts

@@ -3,11 +3,8 @@ import { isDarwin } from "../keys";
 import { getShortcutKey } from "../utils";
 import { ActionName } from "./types";
 
-export type ShortcutName =
+export type ShortcutName = SubtypeOf<
-  | SubtypeOf<
   ActionName,
-      | "toggleTheme"
-      | "loadScene"
   | "cut"
   | "copy"
   | "paste"
@@ -33,22 +30,16 @@ export type ShortcutName =
   | "flipVertical"
   | "hyperlink"
   | "toggleLock"
-    >
+>;
-  | "saveScene"
-  | "imageExport";
 
 const shortcutMap: Record<ShortcutName, string[]> = {
-  toggleTheme: [getShortcutKey("Shift+Alt+D")],
-  saveScene: [getShortcutKey("CtrlOrCmd+S")],
-  loadScene: [getShortcutKey("CtrlOrCmd+O")],
-  imageExport: [getShortcutKey("CtrlOrCmd+Shift+E")],
   cut: [getShortcutKey("CtrlOrCmd+X")],
   copy: [getShortcutKey("CtrlOrCmd+C")],
   paste: [getShortcutKey("CtrlOrCmd+V")],
   copyStyles: [getShortcutKey("CtrlOrCmd+Alt+C")],
   pasteStyles: [getShortcutKey("CtrlOrCmd+Alt+V")],
   selectAll: [getShortcutKey("CtrlOrCmd+A")],
-  deleteSelectedElements: [getShortcutKey("Delete")],
+  deleteSelectedElements: [getShortcutKey("Del")],
   duplicateSelection: [
     getShortcutKey("CtrlOrCmd+D"),
     getShortcutKey(`Alt+${t("helpDialog.drag")}`),

src/actions/types.ts

@@ -91,7 +91,7 @@ export type ActionName =
   | "ungroup"
   | "goToCollaborator"
   | "addToLibrary"
-  | "changeRoundness"
+  | "changeSharpness"
   | "alignTop"
   | "alignBottom"
   | "alignLeft"
@@ -124,9 +124,7 @@ export type PanelComponentProps = {
 
 export interface Action {
   name: ActionName;
-  PanelComponent?: React.FC<
+  PanelComponent?: React.FC<PanelComponentProps>;
-    PanelComponentProps & { isInHamburgerMenu: boolean }
-  >;
   perform: ActionFn;
   keyPriority?: number;
   keyTest?: (
@@ -143,8 +141,6 @@ export interface Action {
   contextItemPredicate?: (
     elements: readonly ExcalidrawElement[],
     appState: AppState,
-    appProps: ExcalidrawProps,
-    app: AppClassProperties,
   ) => boolean;
   checked?: (appState: Readonly<AppState>) => boolean;
   trackEvent:
@@ -166,7 +162,4 @@ export interface Action {
           value: any,
         ) => boolean;
       };
-  /** if set to `true`, allow action to be performed in viewMode.
-   *  Defaults to `false` */
-  viewMode?: boolean;
 }

src/appState.ts

@@ -19,7 +19,6 @@ export const getDefaultAppState = (): Omit<
   "offsetTop" | "offsetLeft" | "width" | "height"
 > => {
   return {
-    showWelcomeScreen: false,
     theme: THEME.LIGHT,
     collaborators: new Map(),
     currentChartType: "bar",
@@ -28,11 +27,12 @@ export const getDefaultAppState = (): Omit<
     currentItemFillStyle: "hachure",
     currentItemFontFamily: DEFAULT_FONT_FAMILY,
     currentItemFontSize: DEFAULT_FONT_SIZE,
+    currentItemLinearStrokeSharpness: "round",
     currentItemOpacity: 100,
     currentItemRoughness: 1,
     currentItemStartArrowhead: null,
     currentItemStrokeColor: oc.black,
-    currentItemRoundness: "round",
+    currentItemStrokeSharpness: "sharp",
     currentItemStrokeStyle: "solid",
     currentItemStrokeWidth: 1,
     currentItemTextAlign: DEFAULT_TEXT_ALIGN,
@@ -64,11 +64,9 @@ export const getDefaultAppState = (): Omit<
     lastPointerDownWith: "mouse",
     multiElement: null,
     name: `${t("labels.untitled")}-${getDateTime()}`,
-    contextMenu: null,
     openMenu: null,
     openPopup: null,
     openSidebar: null,
-    openDialog: null,
     pasteDialog: { shown: false, data: null },
     previousSelectedElementIds: {},
     resizingElement: null,
@@ -79,6 +77,7 @@ export const getDefaultAppState = (): Omit<
     selectedGroupIds: {},
     selectionElement: null,
     shouldCacheIgnoreZoom: false,
+    showHelpDialog: false,
     showStats: false,
     startBoundElement: null,
     suggestedBindings: [],
@@ -111,7 +110,6 @@ const APP_STATE_STORAGE_CONF = (<
   T extends Record<keyof AppState, Values>,
 >(config: { [K in keyof T]: K extends keyof AppState ? T[K] : never }) =>
   config)({
-  showWelcomeScreen: { browser: true, export: false, server: false },
   theme: { browser: true, export: false, server: false },
   collaborators: { browser: false, export: false, server: false },
   currentChartType: { browser: true, export: false, server: false },
@@ -120,7 +118,7 @@ const APP_STATE_STORAGE_CONF = (<
   currentItemFillStyle: { browser: true, export: false, server: false },
   currentItemFontFamily: { browser: true, export: false, server: false },
   currentItemFontSize: { browser: true, export: false, server: false },
-  currentItemRoundness: {
+  currentItemLinearStrokeSharpness: {
     browser: true,
     export: false,
     server: false,
@@ -129,6 +127,7 @@ const APP_STATE_STORAGE_CONF = (<
   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 },
@@ -158,11 +157,9 @@ const APP_STATE_STORAGE_CONF = (<
   name: { browser: true, export: false, server: false },
   offsetLeft: { browser: false, export: false, server: false },
   offsetTop: { browser: false, export: false, server: false },
-  contextMenu: { browser: false, export: false, server: false },
   openMenu: { browser: true, export: false, server: false },
   openPopup: { browser: false, export: false, server: false },
   openSidebar: { browser: true, export: false, server: false },
-  openDialog: { 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 },
@@ -173,6 +170,7 @@ const APP_STATE_STORAGE_CONF = (<
   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 },

src/charts.ts

@@ -172,7 +172,7 @@ const commonProps = {
   opacity: 100,
   roughness: 1,
   strokeColor: colors.elementStroke[0],
-  roundness: null,
+  strokeSharpness: "sharp",
   strokeStyle: "solid",
   strokeWidth: 1,
   verticalAlign: VERTICAL_ALIGN.MIDDLE,
@@ -322,7 +322,7 @@ const chartBaseElements = (
         text: spreadsheet.title,
         x: x + chartWidth / 2,
         y: y - BAR_HEIGHT - BAR_GAP * 2 - DEFAULT_FONT_SIZE,
-        roundness: null,
+        strokeSharpness: "sharp",
         strokeStyle: "solid",
         textAlign: "center",
       })

src/clients.ts

@@ -11,18 +11,27 @@ export const getClientColors = (clientId: string, appState: AppState) => {
   // Naive way of getting an integer out of the clientId
   const sum = clientId.split("").reduce((a, str) => a + str.charCodeAt(0), 0);
 
-  // Skip transparent & gray colors
+  // Skip transparent background.
-  const backgrounds = colors.elementBackground.slice(3);
+  const backgrounds = colors.elementBackground.slice(1);
-  const strokes = colors.elementStroke.slice(3);
+  const strokes = colors.elementStroke.slice(1);
   return {
     background: backgrounds[sum % backgrounds.length],
     stroke: strokes[sum % strokes.length],
   };
 };
 
-export const getClientInitials = (userName?: string | null) => {
+export const getClientInitials = (username?: string | null) => {
-  if (!userName) {
+  if (!username) {
     return "?";
   }
-  return userName.trim()[0].toUpperCase();
+  const names = username.trim().split(" ");
+
+  if (names.length < 2) {
+    return names[0].substring(0, 2).toUpperCase();
+  }
+
+  const firstName = names[0];
+  const lastName = names[names.length - 1];
+
+  return (firstName[0] + lastName[0]).toUpperCase();
 };

src/clipboard.test.ts

@@ -1,27 +0,0 @@
-import { parseClipboard } from "./clipboard";
-
-describe("Test parseClipboard", () => {
-  it("should parse valid json correctly", async () => {
-    let text = "123";
-
-    let clipboardData = await parseClipboard({
-      //@ts-ignore
-      clipboardData: {
-        getData: () => text,
-      },
-    });
-
-    expect(clipboardData.text).toBe(text);
-
-    text = "[123]";
-
-    clipboardData = await parseClipboard({
-      //@ts-ignore
-      clipboardData: {
-        getData: () => text,
-      },
-    });
-
-    expect(clipboardData.text).toBe(text);
-  });
-});

src/clipboard.ts

@@ -109,16 +109,16 @@ const parsePotentialSpreadsheet = (
  * Retrieves content from system clipboard (either from ClipboardEvent or
  *  via async clipboard API if supported)
  */
-export const getSystemClipboard = async (
+const getSystemClipboard = async (
   event: ClipboardEvent | null,
 ): Promise<string> => {
   try {
     const text = event
-      ? event.clipboardData?.getData("text/plain")
+      ? event.clipboardData?.getData("text/plain").trim()
       : probablySupportsClipboardReadText &&
         (await navigator.clipboard.readText());
 
-    return (text || "").trim();
+    return text || "";
   } catch {
     return "";
   }
@@ -129,25 +129,19 @@ export const getSystemClipboard = async (
  */
 export const parseClipboard = async (
   event: ClipboardEvent | null,
-  isPlainPaste = false,
 ): Promise<ClipboardData> => {
   const systemClipboard = await getSystemClipboard(event);
 
   // if system clipboard empty, couldn't be resolved, or contains previously
   // copied excalidraw scene as SVG, fall back to previously copied excalidraw
   // elements
-  if (
+  if (!systemClipboard || systemClipboard.includes(SVG_EXPORT_TAG)) {
-    !systemClipboard ||
-    (!isPlainPaste && systemClipboard.includes(SVG_EXPORT_TAG))
-  ) {
     return getAppClipboard();
   }
 
   // if system clipboard contains spreadsheet, use it even though it's
   // technically possible it's staler than in-app clipboard
-  const spreadsheetResult =
+  const spreadsheetResult = parsePotentialSpreadsheet(systemClipboard);
-    !isPlainPaste && parsePotentialSpreadsheet(systemClipboard);
-
   if (spreadsheetResult) {
     return spreadsheetResult;
   }
@@ -160,23 +154,17 @@ export const parseClipboard = async (
       return {
         elements: systemClipboardData.elements,
         files: systemClipboardData.files,
-        text: isPlainPaste
-          ? JSON.stringify(systemClipboardData.elements, null, 2)
-          : undefined,
       };
     }
-  } catch (e) {}
+    return appClipboardData;
+  } catch {
     // system clipboard doesn't contain excalidraw elements → return plaintext
     // unless we set a flag to prefer in-app clipboard because browser didn't
     // support storing to system clipboard on copy
     return PREFER_APP_CLIPBOARD && appClipboardData.elements
-    ? {
+      ? appClipboardData
-        ...appClipboardData,
-        text: isPlainPaste
-          ? JSON.stringify(appClipboardData.elements, null, 2)
-          : undefined,
-      }
       : { text: systemClipboard };
+  }
 };
 
 export const copyBlobToClipboardAsPng = async (blob: Blob | Promise<Blob>) => {

src/components/Actions.scss

@@ -1,92 +0,0 @@
-.zoom-actions,
-.undo-redo-buttons {
-  background-color: var(--island-bg-color);
-  border-radius: var(--border-radius-lg);
-}
-
-.zoom-button,
-.undo-redo-buttons button {
-  border: 1px solid var(--default-border-color) !important;
-  border-radius: 0 !important;
-  background-color: transparent !important;
-  font-size: 0.875rem !important;
-  width: var(--lg-button-size);
-  height: var(--lg-button-size);
-  svg {
-    width: var(--lg-icon-size) !important;
-    height: var(--lg-icon-size) !important;
-  }
-
-  .ToolIcon__icon {
-    width: 100%;
-    height: 100%;
-  }
-}
-
-.reset-zoom-button {
-  border-left: 0 !important;
-  border-right: 0 !important;
-  padding: 0 0.625rem !important;
-  width: 3.75rem !important;
-  justify-content: center;
-  color: var(--text-primary-color);
-}
-
-.zoom-out-button {
-  border-top-left-radius: var(--border-radius-lg) !important;
-  border-bottom-left-radius: var(--border-radius-lg) !important;
-
-  :root[dir="rtl"] & {
-    transform: scaleX(-1);
-  }
-
-  .ToolIcon__icon {
-    border-top-right-radius: 0 !important;
-    border-bottom-right-radius: 0 !important;
-  }
-}
-
-.zoom-in-button {
-  border-top-right-radius: var(--border-radius-lg) !important;
-  border-bottom-right-radius: var(--border-radius-lg) !important;
-
-  :root[dir="rtl"] & {
-    transform: scaleX(-1);
-  }
-
-  .ToolIcon__icon {
-    border-top-left-radius: 0 !important;
-    border-bottom-left-radius: 0 !important;
-  }
-}
-
-.undo-redo-buttons {
-  .undo-button-container button {
-    border-top-left-radius: var(--border-radius-lg) !important;
-    border-bottom-left-radius: var(--border-radius-lg) !important;
-    border-right: 0 !important;
-
-    :root[dir="rtl"] & {
-      transform: scaleX(-1);
-    }
-
-    .ToolIcon__icon {
-      border-top-right-radius: 0 !important;
-      border-bottom-right-radius: 0 !important;
-    }
-  }
-
-  .redo-button-container button {
-    border-top-right-radius: var(--border-radius-lg) !important;
-    border-bottom-right-radius: var(--border-radius-lg) !important;
-
-    :root[dir="rtl"] & {
-      transform: scaleX(-1);
-    }
-
-    .ToolIcon__icon {
-      border-top-left-radius: 0 !important;
-      border-bottom-left-radius: 0 !important;
-    }
-  }
-}

src/components/Actions.tsx

@@ -5,7 +5,7 @@ import { ExcalidrawElement, PointerType } from "../element/types";
 import { t } from "../i18n";
 import { useDevice } from "../components/App";
 import {
-  canChangeRoundness,
+  canChangeSharpness,
   canHaveArrowheads,
   getTargetElements,
   hasBackground,
@@ -25,12 +25,9 @@ import Stack from "./Stack";
 import { ToolButton } from "./ToolButton";
 import { hasStrokeColor } from "../scene/comparisons";
 import { trackEvent } from "../analytics";
-import { hasBoundTextElement } from "../element/typeChecks";
+import { hasBoundTextElement, isBoundToContainer } from "../element/typeChecks";
 import clsx from "clsx";
 import { actionToggleZenMode } from "../actions";
-import "./Actions.scss";
-import { Tooltip } from "./Tooltip";
-import { shouldAllowVerticalAlign } from "../element/textElement";
 
 export const SelectedShapeActions = ({
   appState,
@@ -82,16 +79,12 @@ export const SelectedShapeActions = ({
 
   return (
     <div className="panelColumn">
-      <div>
       {((hasStrokeColor(appState.activeTool.type) &&
         appState.activeTool.type !== "image" &&
         commonSelectedType !== "image") ||
         targetElements.some((element) => hasStrokeColor(element.type))) &&
         renderAction("changeStrokeColor")}
-      </div>
+      {showChangeBackgroundIcons && renderAction("changeBackgroundColor")}
-      {showChangeBackgroundIcons && (
-        <div>{renderAction("changeBackgroundColor")}</div>
-      )}
       {showFillIcons && renderAction("changeFillStyle")}
 
       {(hasStrokeWidth(appState.activeTool.type) ||
@@ -110,9 +103,9 @@ export const SelectedShapeActions = ({
         </>
       )}
 
-      {(canChangeRoundness(appState.activeTool.type) ||
+      {(canChangeSharpness(appState.activeTool.type) ||
-        targetElements.some((element) => canChangeRoundness(element.type))) && (
+        targetElements.some((element) => canChangeSharpness(element.type))) && (
-        <>{renderAction("changeRoundness")}</>
+        <>{renderAction("changeSharpness")}</>
       )}
 
       {(hasText(appState.activeTool.type) ||
@@ -126,8 +119,10 @@ export const SelectedShapeActions = ({
         </>
       )}
 
-      {shouldAllowVerticalAlign(targetElements) &&
+      {targetElements.some(
-        renderAction("changeVerticalAlign")}
+        (element) =>
+          hasBoundTextElement(element) || isBoundToContainer(element),
+      ) && renderAction("changeVerticalAlign")}
       {(canHaveArrowheads(appState.activeTool.type) ||
         targetElements.some((element) => canHaveArrowheads(element.type))) && (
         <>{renderAction("changeArrowhead")}</>
@@ -168,16 +163,7 @@ export const SelectedShapeActions = ({
             )}
             {targetElements.length > 2 &&
               renderAction("distributeHorizontally")}
-            {/* breaks the row ˇˇ */}
+            <div className="iconRow">
-            <div style={{ flexBasis: "100%", height: 0 }} />
-            <div
-              style={{
-                display: "flex",
-                flexWrap: "wrap",
-                gap: ".5rem",
-                marginTop: "-0.5rem",
-              }}
-            >
               {renderAction("alignTop")}
               {renderAction("alignVerticallyCentered")}
               {renderAction("alignBottom")}
@@ -217,25 +203,25 @@ export const ShapesSwitcher = ({
   appState: AppState;
 }) => (
   <>
-    {SHAPES.map(({ value, icon, key, numericKey, fillable }, index) => {
+    {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")} ${numericKey}`
+        ? `${capitalizeString(letter)} ${t("helpDialog.or")} ${index + 1}`
-        : `${numericKey}`;
+        : `${index + 1}`;
       return (
         <ToolButton
-          className={clsx("Shape", { fillable })}
+          className="Shape"
           key={value}
           type="radio"
           icon={icon}
           checked={activeTool.type === value}
           name="editor-current-shape"
           title={`${capitalizeString(label)} — ${shortcut}`}
-          keyBindingLabel={numericKey}
+          keyBindingLabel={`${index + 1}`}
           aria-label={capitalizeString(label)}
           aria-keyshortcuts={shortcut}
-          data-testid={`toolbar-${value}`}
+          data-testid={value}
           onPointerDown={({ pointerType }) => {
             if (!appState.penDetected && pointerType === "pen") {
               setAppState({
@@ -277,11 +263,11 @@ export const ZoomActions = ({
   renderAction: ActionManager["renderAction"];
   zoom: Zoom;
 }) => (
-  <Stack.Col gap={1} className="zoom-actions">
+  <Stack.Col gap={1}>
-    <Stack.Row align="center">
+    <Stack.Row gap={1} align="center">
       {renderAction("zoomOut")}
-      {renderAction("resetZoom")}
       {renderAction("zoomIn")}
+      {renderAction("resetZoom")}
     </Stack.Row>
   </Stack.Col>
 );
@@ -294,12 +280,8 @@ export const UndoRedoActions = ({
   className?: string;
 }) => (
   <div className={`undo-redo-buttons ${className}`}>
-    <div className="undo-button-container">
+    {renderAction("undo", { size: "small" })}
-      <Tooltip label={t("buttons.undo")}>{renderAction("undo")}</Tooltip>
+    {renderAction("redo", { size: "small" })}
-    </div>
-    <div className="redo-button-container">
-      <Tooltip label={t("buttons.redo")}> {renderAction("redo")}</Tooltip>
-    </div>
   </div>
 );
 

src/components/ActiveFile.tsx

@@ -1,11 +1,9 @@
-// TODO barnabasmolnar/editor-redesign
+import Stack from "../components/Stack";
-// this icon is not great
+import { ToolButton } from "../components/ToolButton";
-import { getShortcutFromShortcutName } from "../actions/shortcuts";
+import { save, file } from "../components/icons";
-import { save } from "../components/icons";
 import { t } from "../i18n";
 
 import "./ActiveFile.scss";
-import MenuItem from "./MenuItem";
 
 type ActiveFileProps = {
   fileName?: string;
@@ -13,11 +11,18 @@ type ActiveFileProps = {
 };
 
 export const ActiveFile = ({ fileName, onSave }: ActiveFileProps) => (
-  <MenuItem
+  <Stack.Row className="ActiveFile" gap={1} align="center">
-    label={`${t("buttons.save")}`}
+    <span className="ActiveFile__fileName">
-    shortcut={getShortcutFromShortcutName("saveScene")}
+      {file}
-    dataTestId="save-button"
+      <span>{fileName}</span>
-    onClick={onSave}
+    </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/Avatar.scss

@@ -2,35 +2,21 @@
 
 .excalidraw {
   .Avatar {
-    width: 1.25rem;
+    width: 2.5rem;
-    height: 1.25rem;
+    height: 2.5rem;
-    position: relative;
+    border-radius: 1.25rem;
-    border-radius: 100%;
-    outline-offset: 2px;
     display: flex;
     justify-content: center;
     align-items: center;
     color: $oc-white;
     cursor: pointer;
-    font-size: 0.625rem;
+    font-size: 0.8rem;
     font-weight: 500;
-    line-height: 1;
 
     &-img {
       width: 100%;
       height: 100%;
       border-radius: 100%;
     }
-
-    &::before {
-      content: "";
-      position: absolute;
-      top: -3px;
-      right: -3px;
-      bottom: -3px;
-      left: -3px;
-      border: 1px solid var(--avatar-border-color);
-      border-radius: 100%;
-    }
   }
 }

src/components/Avatar.tsx

@@ -11,11 +11,13 @@ type AvatarProps = {
   src?: string;
 };
 
-export const Avatar = ({ color, onClick, name, src }: AvatarProps) => {
+export const Avatar = ({ color, border, onClick, name, src }: AvatarProps) => {
   const shortName = getClientInitials(name);
   const [error, setError] = useState(false);
   const loadImg = !error && src;
-  const style = loadImg ? undefined : { background: color };
+  const style = loadImg
+    ? undefined
+    : { background: color, border: `1px solid ${border}` };
   return (
     <div className="Avatar" style={style} onClick={onClick}>
       {loadImg ? (

src/components/BackgroundPickerAndDarkModeToggle.tsx

@@ -0,0 +1,12 @@
+import { ActionManager } from "../actions/manager";
+
+export const BackgroundPickerAndDarkModeToggle = ({
+  actionManager,
+}: {
+  actionManager: ActionManager;
+}) => (
+  <div style={{ display: "flex" }}>
+    {actionManager.renderAction("changeViewBackgroundColor")}
+    {actionManager.renderAction("toggleTheme")}
+  </div>
+);

src/components/CheckboxItem.scss

@@ -64,8 +64,6 @@
 
       color: #{$oc-blue-7};
 
-      border: 0;
-
       &:focus {
         box-shadow: 0 0 0 3px #{$oc-blue-7};
       }

src/components/ClearCanvas.tsx

@@ -1,9 +1,10 @@
 import { useState } from "react";
 import { t } from "../i18n";
-import { TrashIcon } from "./icons";
+import { useDevice } from "./App";
+import { trash } from "./icons";
+import { ToolButton } from "./ToolButton";
 
 import ConfirmDialog from "./ConfirmDialog";
-import MenuItem from "./MenuItem";
 
 const ClearCanvas = ({ onConfirm }: { onConfirm: () => void }) => {
   const [showDialog, setShowDialog] = useState(false);
@@ -13,11 +14,14 @@ const ClearCanvas = ({ onConfirm }: { onConfirm: () => void }) => {
 
   return (
     <>
-      <MenuItem
+      <ToolButton
-        label={t("buttons.clearReset")}
+        type="button"
-        icon={TrashIcon}
+        icon={trash}
+        title={t("buttons.clearReset")}
+        aria-label={t("buttons.clearReset")}
+        showAriaLabel={useDevice().isMobile}
         onClick={toggleDialog}
-        dataTestId="clear-canvas-button"
+        data-testid="clear-canvas-button"
       />
 
       {showDialog && (

src/components/CollabButton.scss

@@ -1,51 +1,6 @@
 @import "../css/variables.module";
 
 .excalidraw {
-  .collab-button {
-    @include outlineButtonStyles;
-    width: var(--lg-button-size);
-    height: var(--lg-button-size);
-
-    svg {
-      width: var(--lg-icon-size);
-      height: var(--lg-icon-size);
-    }
-    background-color: var(--color-primary);
-    border-color: var(--color-primary);
-    color: white;
-    flex-shrink: 0;
-
-    &:hover {
-      background-color: var(--color-primary-darker);
-      border-color: var(--color-primary-darker);
-    }
-
-    &:active {
-      background-color: var(--color-primary-darker);
-    }
-
-    &.active {
-      background-color: #0fb884;
-      border-color: #0fb884;
-
-      svg {
-        color: #fff;
-      }
-
-      &:hover,
-      &:active {
-        background-color: #0fb884;
-        border-color: #0fb884;
-      }
-    }
-  }
-
-  &.theme--dark {
-    .collab-button {
-      color: var(--color-gray-90);
-    }
-  }
-
   .CollabButton.is-collaborating {
     background-color: var(--button-special-active-bg-color);
 
@@ -69,9 +24,9 @@
     bottom: -5px;
     padding: 3px;
     border-radius: 50%;
-    background-color: $oc-green-2;
+    background-color: $oc-green-6;
-    color: $oc-green-9;
+    color: $oc-white;
-    font-size: 0.6rem;
+    font-size: 0.6em;
     font-family: "Cascadia";
   }
 }

src/components/CollabButton.tsx

@@ -1,47 +1,37 @@
+import clsx from "clsx";
+import { ToolButton } from "./ToolButton";
 import { t } from "../i18n";
-import { UsersIcon } from "./icons";
+import { useDevice } from "../components/App";
+import { users } from "./icons";
 
 import "./CollabButton.scss";
-import MenuItem from "./MenuItem";
-import clsx from "clsx";
 
 const CollabButton = ({
   isCollaborating,
   collaboratorCount,
   onClick,
-  isInHamburgerMenu = true,
 }: {
   isCollaborating: boolean;
   collaboratorCount: number;
   onClick: () => void;
-  isInHamburgerMenu?: boolean;
 }) => {
   return (
     <>
-      {isInHamburgerMenu ? (
+      <ToolButton
-        <MenuItem
+        className={clsx("CollabButton", {
-          label={t("labels.liveCollaboration")}
+          "is-collaborating": isCollaborating,
-          dataTestId="collab-button"
+        })}
-          icon={UsersIcon}
         onClick={onClick}
-          isCollaborating={isCollaborating}
+        icon={users}
-        />
-      ) : (
-        <button
-          className={clsx("collab-button", { active: isCollaborating })}
         type="button"
-          onClick={onClick}
-          style={{ position: "relative" }}
         title={t("labels.liveCollaboration")}
+        aria-label={t("labels.liveCollaboration")}
+        showAriaLabel={useDevice().isMobile}
       >
-          {UsersIcon}
+        {isCollaborating && (
-          {collaboratorCount > 0 && (
+          <div className="CollabButton-collaborators">{collaboratorCount}</div>
-            <div className="CollabButton-collaborators">
-              {collaboratorCount}
-            </div>
-          )}
-        </button>
         )}
+      </ToolButton>
     </>
   );
 };

src/components/ColorPicker.scss

@@ -21,23 +21,6 @@
     display: grid;
     grid-template-columns: auto 1fr;
     align-items: center;
-    column-gap: 0.5rem;
-  }
-
-  .color-picker-control-container + .popover {
-    position: static;
-  }
-
-  .color-picker-popover-container {
-    margin-top: -0.25rem;
-
-    :root[dir="ltr"] & {
-      margin-left: 0.5rem;
-    }
-
-    :root[dir="rtl"] & {
-      margin-left: -3rem;
-    }
   }
 
   .color-picker-triangle {
@@ -47,29 +30,20 @@
     border-width: 0 9px 10px;
     border-color: transparent transparent var(--popup-bg-color);
     position: absolute;
-    top: 10px;
+    top: -10px;
 
     :root[dir="ltr"] & {
-      transform: rotate(270deg);
+      left: 12px;
-      left: -14px;
     }
 
     :root[dir="rtl"] & {
-      transform: rotate(90deg);
+      right: 12px;
-      right: -14px;
     }
   }
 
   .color-picker-triangle-shadow {
     border-color: transparent transparent transparentize($oc-black, 0.9);
-
+    top: -11px;
-    :root[dir="ltr"] & {
-      left: -14px;
-    }
-
-    :root[dir="rtl"] & {
-      right: -16px;
-    }
   }
 
   .color-picker-content--default {
@@ -145,21 +119,16 @@
   }
 
   .color-picker-hash {
-    height: var(--default-button-size);
+    background: var(--input-border-color);
-    flex-shrink: 0;
+    height: 1.875rem;
-    padding: 0.5rem 0.5rem 0.5rem 0.75rem;
+    width: 1.875rem;
-    border: 1px solid var(--default-border-color);
-    border-right: 0;
-    box-sizing: border-box;
 
     :root[dir="ltr"] & {
-      border-radius: var(--border-radius-lg) 0 0 var(--border-radius-lg);
+      border-radius: 4px 0 0 4px;
     }
 
     :root[dir="rtl"] & {
-      border-radius: 0 var(--border-radius-lg) var(--border-radius-lg) 0;
+      border-radius: 0 4px 4px 0;
-      border-right: 1px solid var(--default-border-color);
-      border-left: 0;
     }
 
     color: var(--input-label-color);
@@ -169,64 +138,81 @@
     position: relative;
   }
 
-  .color-input-container {
+  .color-input-container:focus-within .color-picker-hash {
-    display: flex;
+    box-shadow: 0 0 0 2px var(--focus-highlight-color);
-
-    &:focus-within {
-      box-shadow: 0 0 0 1px var(--color-primary-darkest);
-      border-radius: var(--border-radius-lg);
-    }
   }
 
-  .color-picker-input {
+  .color-input-container:focus-within .color-picker-hash::before,
-    box-sizing: border-box;
+  .color-input-container:focus-within .color-picker-hash::after {
-    width: 100%;
+    content: "";
-    margin: 0;
+    width: 1px;
-    font-size: 0.875rem;
+    height: 100%;
-    background-color: transparent;
+    position: absolute;
-    color: var(--text-primary-color);
+    top: 0;
-    border: 0;
+  }
-    outline: none;
+
-    height: var(--default-button-size);
+  .color-input-container:focus-within .color-picker-hash::before {
-    border: 1px solid var(--default-border-color);
+    background: var(--input-border-color);
-    border-left: 0;
-    letter-spacing: 0.4px;
 
     :root[dir="ltr"] & {
-      border-radius: 0 var(--border-radius-lg) var(--border-radius-lg) 0;
+      right: -1px;
     }
 
     :root[dir="rtl"] & {
-      border-radius: var(--border-radius-lg) 0 0 var(--border-radius-lg);
+      left: -1px;
-      border-left: 1px solid var(--default-border-color);
+    }
-      border-right: 0;
   }
 
-    padding: 0.5rem;
+  .color-input-container:focus-within .color-picker-hash::after {
-    padding-left: 0.25rem;
+    background: var(--input-bg-color);
+
+    :root[dir="ltr"] & {
+      right: -2px;
+    }
+
+    :root[dir="rtl"] & {
+      left: -2px;
+    }
+  }
+
+  .color-input-container {
+    display: flex;
+  }
+
+  .color-picker-input {
+    width: 11ch; /* length of `transparent` */
+    margin: 0;
+    font-size: 1rem;
+    background-color: var(--input-bg-color);
+    color: var(--text-primary-color);
+    border: 0;
+    outline: none;
+    height: 1.75em;
+    box-shadow: var(--input-border-color) 0 0 0 1px inset;
+
+    :root[dir="ltr"] & {
+      border-radius: 0 4px 4px 0;
+    }
+
+    :root[dir="rtl"] & {
+      border-radius: 4px 0 0 4px;
+    }
+
+    float: left;
+    padding: 1px;
+    padding-inline-start: 0.5em;
     appearance: none;
-
-    &:focus-visible {
-      box-shadow: none;
-    }
-  }
-
-  .color-picker-label-swatch-container {
-    border: 1px solid var(--default-border-color);
-    border-radius: var(--border-radius-lg);
-    width: var(--default-button-size);
-    height: var(--default-button-size);
-    box-sizing: border-box;
-    overflow: hidden;
   }
 
   .color-picker-label-swatch {
-    @include outlineButtonStyles;
+    height: 1.875rem;
-    background-color: var(--swatch-color) !important;
+    width: 1.875rem;
-    overflow: hidden;
+    margin-inline-end: 0.25rem;
+    border: 1px solid $oc-gray-3;
     position: relative;
+    overflow: hidden;
+    background-color: transparent !important;
     filter: var(--theme-filter);
-    border: 0 !important;
 
     &:after {
       content: "";

src/components/ColorPicker.tsx

@@ -66,13 +66,10 @@ const getColor = (color: string): string | null => {
     return color;
   }
 
-  // testing for `#` first fixes a bug on Electron (more specfically, an
+  return isValidColor(color)
-  // Obsidian popout window), where a hex color without `#` is (incorrectly)
-  // considered valid
-  return isValidColor(`#${color}`)
-    ? `#${color}`
-    : isValidColor(color)
     ? color
+    : isValidColor(`#${color}`)
+    ? `#${color}`
     : null;
 };
 
@@ -368,12 +365,10 @@ export const ColorPicker = ({
   appState: AppState;
 }) => {
   const pickerButton = React.useRef<HTMLButtonElement>(null);
-  const coords = pickerButton.current?.getBoundingClientRect();
 
   return (
     <div>
       <div className="color-picker-control-container">
-        <div className="color-picker-label-swatch-container">
         <button
           className="color-picker-label-swatch"
           aria-label={label}
@@ -381,7 +376,6 @@ export const ColorPicker = ({
           onClick={() => setActive(!isActive)}
           ref={pickerButton}
         />
-        </div>
         <ColorInput
           color={color}
           label={label}
@@ -392,15 +386,6 @@ export const ColorPicker = ({
       </div>
       <React.Suspense fallback="">
         {isActive ? (
-          <div
-            className="color-picker-popover-container"
-            style={{
-              position: "fixed",
-              top: coords?.top,
-              left: coords?.right,
-              zIndex: 1,
-            }}
-          >
           <Popover
             onCloseRequest={(event) =>
               event.target !== pickerButton.current && setActive(false)
@@ -422,7 +407,6 @@ export const ColorPicker = ({
               elements={elements}
             />
           </Popover>
-          </div>
         ) : null}
       </React.Suspense>
     </div>

src/components/ConfirmDialog.scss

@@ -4,8 +4,34 @@
   .confirm-dialog {
     &-buttons {
       display: flex;
-      column-gap: 0.5rem;
+      padding: 0.2rem 0;
       justify-content: flex-end;
     }
+    .ToolIcon__icon {
+      min-width: 2.5rem;
+      width: auto;
+      font-size: 1rem;
+    }
+
+    .ToolIcon_type_button {
+      margin-left: 0.8rem;
+      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;
+      }
+    }
   }
 }

src/components/ConfirmDialog.tsx

@@ -1,11 +1,8 @@
 import { t } from "../i18n";
 import { Dialog, DialogProps } from "./Dialog";
+import { ToolButton } from "./ToolButton";
 
 import "./ConfirmDialog.scss";
-import DialogActionButton from "./DialogActionButton";
-import { isMenuOpenAtom } from "./App";
-import { isDropdownOpenAtom } from "./App";
-import { useSetAtom } from "jotai";
 
 interface Props extends Omit<DialogProps, "onCloseRequest"> {
   onConfirm: () => void;
@@ -23,10 +20,6 @@ const ConfirmDialog = (props: Props) => {
     className = "",
     ...rest
   } = props;
-
-  const setIsMenuOpen = useSetAtom(isMenuOpenAtom);
-  const setIsDropdownOpen = useSetAtom(isDropdownOpenAtom);
-
   return (
     <Dialog
       onCloseRequest={onCancel}
@@ -36,22 +29,21 @@ const ConfirmDialog = (props: Props) => {
     >
       {children}
       <div className="confirm-dialog-buttons">
-        <DialogActionButton
+        <ToolButton
+          type="button"
+          title={cancelText}
+          aria-label={cancelText}
           label={cancelText}
-          onClick={() => {
+          onClick={onCancel}
-            setIsMenuOpen(false);
+          className="confirm-dialog--cancel"
-            setIsDropdownOpen(false);
-            onCancel();
-          }}
         />
-        <DialogActionButton
+        <ToolButton
+          type="button"
+          title={confirmText}
+          aria-label={confirmText}
           label={confirmText}
-          onClick={() => {
+          onClick={onConfirm}
-            setIsMenuOpen(false);
+          className="confirm-dialog--confirm"
-            setIsDropdownOpen(false);
-            onConfirm();
-          }}
-          actionType="danger"
         />
       </div>
     </Dialog>

src/components/ContextMenu.scss

@@ -19,7 +19,7 @@
     color: var(--popup-text-color);
   }
 
-  .context-menu-item {
+  .context-menu-option {
     position: relative;
     width: 100%;
     min-width: 9.5rem;
@@ -43,16 +43,16 @@
     }
 
     &.dangerous {
-      .context-menu-item__label {
+      .context-menu-option__label {
         color: $oc-red-7;
       }
     }
 
-    .context-menu-item__label {
+    .context-menu-option__label {
       justify-self: start;
       margin-inline-end: 20px;
     }
-    .context-menu-item__shortcut {
+    .context-menu-option__shortcut {
       justify-self: end;
       opacity: 0.6;
       font-family: inherit;
@@ -60,37 +60,37 @@
     }
   }
 
-  .context-menu-item:hover {
+  .context-menu-option:hover {
     color: var(--popup-bg-color);
     background-color: var(--select-highlight-color);
 
     &.dangerous {
-      .context-menu-item__label {
+      .context-menu-option__label {
         color: var(--popup-bg-color);
       }
       background-color: $oc-red-6;
     }
   }
 
-  .context-menu-item:focus {
+  .context-menu-option:focus {
     z-index: 1;
   }
 
   @include isMobile {
-    .context-menu-item {
+    .context-menu-option {
       display: block;
 
-      .context-menu-item__label {
+      .context-menu-option__label {
         margin-inline-end: 0;
       }
 
-      .context-menu-item__shortcut {
+      .context-menu-option__shortcut {
         display: none;
       }
     }
   }
 
-  .context-menu-item-separator {
+  .context-menu-option-separator {
     border: none;
     border-top: 1px solid $oc-gray-5;
   }

src/components/ContextMenu.tsx

@@ -1,3 +1,4 @@
+import { render, unmountComponentAtNode } from "react-dom";
 import clsx from "clsx";
 import { Popover } from "./Popover";
 import { t } from "../i18n";
@@ -9,52 +10,33 @@ import {
 } from "../actions/shortcuts";
 import { Action } from "../actions/types";
 import { ActionManager } from "../actions/manager";
-import {
+import { AppState } from "../types";
-  useExcalidrawAppState,
+import { NonDeletedExcalidrawElement } from "../element/types";
-  useExcalidrawElements,
-  useExcalidrawSetAppState,
-} from "./App";
-import React from "react";
 
-export type ContextMenuItem = typeof CONTEXT_MENU_SEPARATOR | Action;
+export type ContextMenuOption = "separator" | Action;
-
-export type ContextMenuItems = (ContextMenuItem | false | null | undefined)[];
 
 type ContextMenuProps = {
-  actionManager: ActionManager;
+  options: ContextMenuOption[];
-  items: ContextMenuItems;
+  onCloseRequest?(): void;
   top: number;
   left: number;
+  actionManager: ActionManager;
+  appState: Readonly<AppState>;
+  elements: readonly NonDeletedExcalidrawElement[];
 };
 
-export const CONTEXT_MENU_SEPARATOR = "separator";
+const ContextMenu = ({
-
+  options,
-export const ContextMenu = React.memo(
+  onCloseRequest,
-  ({ actionManager, items, top, left }: ContextMenuProps) => {
+  top,
-    const appState = useExcalidrawAppState();
+  left,
-    const setAppState = useExcalidrawSetAppState();
+  actionManager,
-    const elements = useExcalidrawElements();
-
-    const filteredItems = items.reduce((acc: ContextMenuItem[], item) => {
-      if (
-        item &&
-        (item === CONTEXT_MENU_SEPARATOR ||
-          !item.contextItemPredicate ||
-          item.contextItemPredicate(
-            elements,
   appState,
-            actionManager.app.props,
+  elements,
-            actionManager.app,
+}: ContextMenuProps) => {
-          ))
-      ) {
-        acc.push(item);
-      }
-      return acc;
-    }, []);
-
   return (
     <Popover
-        onCloseRequest={() => setAppState({ contextMenu: null })}
+      onCloseRequest={onCloseRequest}
       top={top}
       left={left}
       fitInViewport={true}
@@ -67,48 +49,33 @@ export const ContextMenu = React.memo(
         className="context-menu"
         onContextMenu={(event) => event.preventDefault()}
       >
-          {filteredItems.map((item, idx) => {
+        {options.map((option, idx) => {
-            if (item === CONTEXT_MENU_SEPARATOR) {
+          if (option === "separator") {
-              if (
+            return <hr key={idx} className="context-menu-option-separator" />;
-                !filteredItems[idx - 1] ||
-                filteredItems[idx - 1] === CONTEXT_MENU_SEPARATOR
-              ) {
-                return null;
-              }
-              return <hr key={idx} className="context-menu-item-separator" />;
           }
 
-            const actionName = item.name;
+          const actionName = option.name;
           let label = "";
-            if (item.contextItemLabel) {
+          if (option.contextItemLabel) {
-              if (typeof item.contextItemLabel === "function") {
+            if (typeof option.contextItemLabel === "function") {
-                label = t(item.contextItemLabel(elements, appState));
+              label = t(option.contextItemLabel(elements, appState));
             } else {
-                label = t(item.contextItemLabel);
+              label = t(option.contextItemLabel);
             }
           }
-
           return (
-              <li
+            <li key={idx} data-testid={actionName} onClick={onCloseRequest}>
-                key={idx}
-                data-testid={actionName}
-                onClick={() => {
-                  // we need update state before executing the action in case
-                  // the action uses the appState it's being passed (that still
-                  // contains a defined contextMenu) to return the next state.
-                  setAppState({ contextMenu: null }, () => {
-                    actionManager.executeAction(item, "contextMenu");
-                  });
-                }}
-              >
               <button
-                  className={clsx("context-menu-item", {
+                className={clsx("context-menu-option", {
                   dangerous: actionName === "deleteSelectedElements",
-                    checkmark: item.checked?.(appState),
+                  checkmark: option.checked?.(appState),
                 })}
+                onClick={() =>
+                  actionManager.executeAction(option, "contextMenu")
+                }
               >
-                  <div className="context-menu-item__label">{label}</div>
+                <div className="context-menu-option__label">{label}</div>
-                  <kbd className="context-menu-item__shortcut">
+                <kbd className="context-menu-option__shortcut">
                   {actionName
                     ? getShortcutFromShortcutName(actionName as ShortcutName)
                     : ""}
@@ -120,5 +87,63 @@ export const ContextMenu = React.memo(
       </ul>
     </Popover>
   );
+};
+
+const contextMenuNodeByContainer = new WeakMap<HTMLElement, HTMLDivElement>();
+
+const getContextMenuNode = (container: HTMLElement): HTMLDivElement => {
+  let contextMenuNode = contextMenuNodeByContainer.get(container);
+  if (contextMenuNode) {
+    return contextMenuNode;
+  }
+  contextMenuNode = document.createElement("div");
+  container
+    .querySelector(".excalidraw-contextMenuContainer")!
+    .appendChild(contextMenuNode);
+  contextMenuNodeByContainer.set(container, contextMenuNode);
+  return contextMenuNode;
+};
+
+type ContextMenuParams = {
+  options: (ContextMenuOption | false | null | undefined)[];
+  top: ContextMenuProps["top"];
+  left: ContextMenuProps["left"];
+  actionManager: ContextMenuProps["actionManager"];
+  appState: Readonly<AppState>;
+  container: HTMLElement;
+  elements: readonly NonDeletedExcalidrawElement[];
+};
+
+const handleClose = (container: HTMLElement) => {
+  const contextMenuNode = contextMenuNodeByContainer.get(container);
+  if (contextMenuNode) {
+    unmountComponentAtNode(contextMenuNode);
+    contextMenuNode.remove();
+    contextMenuNodeByContainer.delete(container);
+  }
+};
+
+export default {
+  push(params: ContextMenuParams) {
+    const options = Array.of<ContextMenuOption>();
+    params.options.forEach((option) => {
+      if (option) {
+        options.push(option);
+      }
+    });
+    if (options.length) {
+      render(
+        <ContextMenu
+          top={params.top}
+          left={params.left}
+          options={options}
+          onCloseRequest={() => handleClose(params.container)}
+          actionManager={params.actionManager}
+          appState={params.appState}
+          elements={params.elements}
+        />,
+        getContextMenuNode(params.container),
+      );
+    }
   },
-);
+};

src/components/Dialog.scss

@@ -7,11 +7,68 @@
   }
 
   .Dialog__title {
+    display: grid;
+    align-items: center;
+    margin-top: 0;
+    grid-template-columns: 1fr calc(var(--space-factor) * 7);
+    grid-gap: var(--metric);
+    padding: calc(var(--space-factor) * 2);
+    text-align: center;
+    font-variant: small-caps;
+    font-size: 1.2em;
+  }
+
+  .Dialog__titleContent {
+    flex: 1;
+  }
+
+  .Dialog .Modal__close {
+    color: var(--icon-fill-color);
     margin: 0;
-    text-align: left;
+  }
-    font-size: 1.25rem;
+
-    border-bottom: 1px solid var(--dialog-border-color);
+  .Dialog__content {
-    padding: 0 0 0.75rem;
+    padding: 0 16px 16px;
-    margin-bottom: 1.5rem;
+  }
+
+  @include isMobile {
+    .Dialog {
+      --metric: calc(var(--space-factor) * 4);
+      --inset-left: #{"max(var(--metric), var(--sal))"};
+      --inset-right: #{"max(var(--metric), var(--sar))"};
+    }
+
+    .Dialog__title {
+      grid-template-columns: calc(var(--space-factor) * 7) 1fr calc(
+          var(--space-factor) * 7
+        );
+      position: sticky;
+      top: 0;
+      padding: calc(var(--space-factor) * 2);
+      background: var(--island-bg-color);
+      font-size: 1.25em;
+
+      box-sizing: border-box;
+      border-bottom: 1px solid var(--button-gray-2);
+      z-index: 1;
+    }
+
+    .Dialog__titleContent {
+      text-align: center;
+    }
+
+    .Dialog .Island {
+      width: 100vw;
+      height: 100%;
+      box-sizing: border-box;
+      overflow-y: auto;
+      padding-left: #{"max(calc(var(--padding) * var(--space-factor)), var(--sal))"};
+      padding-right: #{"max(calc(var(--padding) * var(--space-factor)), var(--sar))"};
+      padding-bottom: #{"max(calc(var(--padding) * var(--space-factor)), var(--sab))"};
+    }
+
+    .Dialog .Modal__close {
+      order: -1;
+    }
   }
 }

src/components/Dialog.tsx

@@ -5,13 +5,11 @@ import { t } from "../i18n";
 import { useExcalidrawContainer, useDevice } from "../components/App";
 import { KEYS } from "../keys";
 import "./Dialog.scss";
-import { back, CloseIcon } from "./icons";
+import { back, close } from "./icons";
 import { Island } from "./Island";
 import { Modal } from "./Modal";
 import { AppState } from "../types";
 import { queryFocusableElements } from "../utils";
-import { isMenuOpenAtom, isDropdownOpenAtom } from "./App";
-import { useSetAtom } from "jotai";
 
 export interface DialogProps {
   children: React.ReactNode;
@@ -67,12 +65,7 @@ export const Dialog = (props: DialogProps) => {
     return () => islandNode.removeEventListener("keydown", handleKeyDown);
   }, [islandNode, props.autofocus]);
 
-  const setIsMenuOpen = useSetAtom(isMenuOpenAtom);
-  const setIsDropdownOpen = useSetAtom(isDropdownOpenAtom);
-
   const onClose = () => {
-    setIsMenuOpen(false);
-    setIsDropdownOpen(false);
     (lastActiveElement as HTMLElement).focus();
     props.onCloseRequest();
   };
@@ -95,7 +88,7 @@ export const Dialog = (props: DialogProps) => {
             title={t("buttons.close")}
             aria-label={t("buttons.close")}
           >
-            {useDevice().isMobile ? back : CloseIcon}
+            {useDevice().isMobile ? back : close}
           </button>
         </h2>
         <div className="Dialog__content">{props.children}</div>

src/components/DialogActionButton.scss

@@ -1,47 +0,0 @@
-.excalidraw {
-  .Dialog__action-button {
-    position: relative;
-    display: flex;
-    column-gap: 0.5rem;
-    align-items: center;
-    padding: 0.5rem 1.5rem;
-    border: 1px solid var(--default-border-color);
-    background-color: transparent;
-    height: 3rem;
-    border-radius: var(--border-radius-lg);
-    letter-spacing: 0.4px;
-    color: inherit;
-    font-family: inherit;
-    font-size: 0.875rem;
-    font-weight: 600;
-    user-select: none;
-
-    svg {
-      display: block;
-      width: 1rem;
-      height: 1rem;
-    }
-
-    &--danger {
-      background-color: var(--color-danger);
-      border-color: var(--color-danger);
-      color: #fff;
-    }
-
-    &--primary {
-      background-color: var(--color-primary);
-      border-color: var(--color-primary);
-      color: #fff;
-    }
-  }
-
-  &.theme--dark {
-    .Dialog__action-button--danger {
-      color: var(--color-gray-100);
-    }
-
-    .Dialog__action-button--primary {
-      color: var(--color-gray-100);
-    }
-  }
-}

src/components/DialogActionButton.tsx

@@ -1,46 +0,0 @@
-import clsx from "clsx";
-import { ReactNode } from "react";
-import "./DialogActionButton.scss";
-import Spinner from "./Spinner";
-
-interface DialogActionButtonProps {
-  label: string;
-  children?: ReactNode;
-  actionType?: "primary" | "danger";
-  isLoading?: boolean;
-}
-
-const DialogActionButton = ({
-  label,
-  onClick,
-  className,
-  children,
-  actionType,
-  type = "button",
-  isLoading,
-  ...rest
-}: DialogActionButtonProps & React.ButtonHTMLAttributes<HTMLButtonElement>) => {
-  const cs = actionType ? `Dialog__action-button--${actionType}` : "";
-
-  return (
-    <button
-      className={clsx("Dialog__action-button", cs, className)}
-      type={type}
-      aria-label={label}
-      onClick={onClick}
-      {...rest}
-    >
-      {children && (
-        <div style={isLoading ? { visibility: "hidden" } : {}}>{children}</div>
-      )}
-      <div style={isLoading ? { visibility: "hidden" } : {}}>{label}</div>
-      {isLoading && (
-        <div style={{ position: "absolute", inset: 0 }}>
-          <Spinner />
-        </div>
-      )}
-    </button>
-  );
-};
-
-export default DialogActionButton;

src/components/ExportDialog.scss

@@ -91,8 +91,6 @@
   }
 
   button.ExportDialog-imageExportButton {
-    border: 0;
-
     width: 5rem;
     height: 5rem;
     margin: 0 0.2em;

src/components/FixedSideContainer.scss

@@ -9,10 +9,9 @@
   }
 
   .FixedSideContainer_side_top {
-    left: 1rem;
+    left: var(--space-factor);
-    top: 1rem;
+    top: var(--space-factor);
-    right: 1rem;
+    right: var(--space-factor);
-    bottom: 1rem;
     z-index: 2;
   }
 

src/components/Footer.tsx

@@ -1,37 +1,31 @@
 import clsx from "clsx";
-import { ActionManager } from "../../actions/manager";
+import { ActionManager } from "../actions/manager";
-import { t } from "../../i18n";
+import { AppState, ExcalidrawProps } from "../types";
-import { AppState } from "../../types";
 import {
   ExitZenModeAction,
   FinalizeAction,
   UndoRedoActions,
   ZoomActions,
-} from "../Actions";
+} from "./Actions";
-import { useDevice } from "../App";
+import { useDevice } from "./App";
-import { WelcomeScreenHelpArrow } from "../icons";
+import { Island } from "./Island";
-import { Section } from "../Section";
+import { Section } from "./Section";
-import Stack from "../Stack";
+import Stack from "./Stack";
-import WelcomeScreenDecor from "../WelcomeScreenDecor";
-import FooterCenter from "./FooterCenter";
 
 const Footer = ({
   appState,
   actionManager,
+  renderCustomFooter,
   showExitZenModeBtn,
-  renderWelcomeScreen,
-  children,
 }: {
   appState: AppState;
   actionManager: ActionManager;
+  renderCustomFooter?: ExcalidrawProps["renderFooter"];
   showExitZenModeBtn: boolean;
-  renderWelcomeScreen: boolean;
-  children?: React.ReactNode;
 }) => {
   const device = useDevice();
   const showFinalize =
     !appState.viewModeEnabled && appState.multiElement && device.isTouchScreen;
-
   return (
     <footer
       role="contentinfo"
@@ -45,12 +39,14 @@ const Footer = ({
       >
         <Stack.Col gap={2}>
           <Section heading="canvasActions">
+            <Island padding={1}>
               <ZoomActions
                 renderAction={actionManager.renderAction}
                 zoom={appState.zoom}
               />
-
+            </Island>
             {!appState.viewModeEnabled && (
+              <>
                 <UndoRedoActions
                   renderAction={actionManager.renderAction}
                   className={clsx("zen-mode-transition", {
@@ -58,6 +54,16 @@ const Footer = ({
                       appState.zenModeEnabled,
                   })}
                 />
+
+                <div
+                  className={clsx("eraser-buttons zen-mode-transition", {
+                    "layer-ui__wrapper__footer-left--transition-left":
+                      appState.zenModeEnabled,
+                  })}
+                >
+                  {actionManager.renderAction("eraser", { size: "small" })}
+                </div>
+              </>
             )}
             {showFinalize && (
               <FinalizeAction
@@ -71,25 +77,24 @@ const Footer = ({
           </Section>
         </Stack.Col>
       </div>
-      <FooterCenter>{children}</FooterCenter>
+      <div
+        className={clsx(
+          "layer-ui__wrapper__footer-center zen-mode-transition",
+          {
+            "layer-ui__wrapper__footer-left--transition-bottom":
+              appState.zenModeEnabled,
+          },
+        )}
+      >
+        {renderCustomFooter?.(false, appState)}
+      </div>
       <div
         className={clsx("layer-ui__wrapper__footer-right zen-mode-transition", {
           "transition-right disable-pointerEvents": appState.zenModeEnabled,
         })}
       >
-        <div style={{ position: "relative" }}>
-          <WelcomeScreenDecor
-            shouldRender={renderWelcomeScreen && !appState.isLoading}
-          >
-            <div className="virgil WelcomeScreen-decor WelcomeScreen-decor--help-pointer">
-              <div>{t("welcomeScreen.helpHints")}</div>
-              {WelcomeScreenHelpArrow}
-            </div>
-          </WelcomeScreenDecor>
-
         {actionManager.renderAction("toggleShortcuts")}
       </div>
-      </div>
       <ExitZenModeAction
         actionManager={actionManager}
         showExitZenModeBtn={showExitZenModeBtn}
@@ -99,4 +104,3 @@ const Footer = ({
 };
 
 export default Footer;
-Footer.displayName = "Footer";

src/components/HelpDialog.scss

@@ -1,115 +1,56 @@
 @import "../css/variables.module";
 
 .excalidraw {
-  .HelpDialog {
+  .HelpDialog h3 {
-    .Modal__content {
+    border-bottom: 1px solid var(--button-gray-2);
-      max-width: 960px;
+    padding-bottom: 4px;
   }
 
-    h3 {
+  .HelpDialog--island {
-      margin: 1.5rem 0;
+    border: 1px solid var(--button-gray-2);
-      font-weight: bold;
+    margin-bottom: 16px;
-      font-size: 1.125rem;
   }
 
-    &__header {
+  .HelpDialog--island-title {
-      display: flex;
-      flex-wrap: wrap;
-      gap: 0.75rem;
-    }
-
-    &__btn {
-      display: flex;
-      column-gap: 0.5rem;
-      align-items: center;
-      border: 1px solid var(--default-border-color);
-      padding: 0.625rem 1rem;
-      border-radius: var(--border-radius-lg);
-      color: var(--text-primary-color);
-      font-weight: 600;
-      font-size: 0.75rem;
-      letter-spacing: 0.4px;
-
-      &:hover {
-        text-decoration: none;
-      }
-    }
-
-    &__link-icon {
-      line-height: 0;
-      svg {
-        width: 1rem;
-        height: 1rem;
-      }
-    }
-
-    &__islands-container {
-      display: grid;
-      @media screen and (min-width: 1024px) {
-        grid-template-columns: 1fr 1fr;
-      }
-      grid-column-gap: 1.5rem;
-      grid-row-gap: 2rem;
-    }
-
-    @media screen and (min-width: 1024px) {
-      &__island--tools {
-        grid-area: 1 / 1 / 2 / 2;
-      }
-      &__island--view {
-        grid-area: 2 / 1 / 3 / 2;
-      }
-      &__island--editor {
-        grid-area: 1 / 2 / 3 / 3;
-      }
-    }
-
-    &__island {
-      h4 {
-        font-size: 1rem;
-        font-weight: bold;
     margin: 0;
-        margin-bottom: 0.625rem;
+    padding: 4px;
+    background-color: var(--button-gray-1);
+    text-align: center;
   }
 
-      &-content {
+  .HelpDialog--shortcut {
-        border: 1px solid var(--dialog-border-color);
+    border-top: 1px solid var(--button-gray-2);
-        border-radius: var(--border-radius-lg);
-      }
   }
 
-    &__shortcut {
+  .HelpDialog--key {
-      border-bottom: 1px solid var(--dialog-border-color);
-      padding: 0.375rem 0.75rem;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      font-size: 0.875rem;
-      column-gap: 0.5rem;
-
-      &:last-child {
-        border-bottom: none;
-      }
-    }
-
-    &__key-container {
-      display: flex;
-      align-items: center;
-      column-gap: 0.25rem;
-      flex-shrink: 0;
-    }
-
-    &__key {
-      display: flex;
-      box-sizing: border-box;
-      font-size: 0.625rem;
-      background-color: var(--color-primary-light);
-      border-radius: var(--border-radius-md);
-      padding: 0.5rem;
     word-break: keep-all;
+    border: 1px solid var(--button-gray-2);
+    padding: 2px 8px;
+    margin: auto 4px;
+    background-color: var(--button-gray-1);
+    border-radius: 2px;
+    font-size: 0.8em;
+    min-height: 26px;
+    box-sizing: border-box;
+    display: flex;
     align-items: center;
     font-family: inherit;
-      line-height: 1;
   }
+
+  .HelpDialog--header {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-evenly;
+    margin-bottom: 32px;
+    padding-bottom: 16px;
+  }
+
+  .HelpDialog--btn {
+    border: 1px solid var(--link-color);
+    padding: 8px 32px;
+    border-radius: 4px;
+  }
+  .HelpDialog--btn:hover {
+    text-decoration: none;
   }
 }

src/components/HelpDialog.tsx

@@ -1,39 +1,35 @@
 import React from "react";
 import { t } from "../i18n";
-import { isDarwin, isWindows, KEYS } from "../keys";
+import { isDarwin, isWindows } from "../keys";
 import { Dialog } from "./Dialog";
 import { getShortcutKey } from "../utils";
 import "./HelpDialog.scss";
-import { ExternalLinkIcon } from "./icons";
 
 const Header = () => (
-  <div className="HelpDialog__header">
+  <div className="HelpDialog--header">
     <a
-      className="HelpDialog__btn"
+      className="HelpDialog--btn"
       href="https://github.com/excalidraw/excalidraw#documentation"
       target="_blank"
       rel="noopener noreferrer"
     >
       {t("helpDialog.documentation")}
-      <div className="HelpDialog__link-icon">{ExternalLinkIcon}</div>
     </a>
     <a
-      className="HelpDialog__btn"
+      className="HelpDialog--btn"
       href="https://blog.excalidraw.com"
       target="_blank"
       rel="noopener noreferrer"
     >
       {t("helpDialog.blog")}
-      <div className="HelpDialog__link-icon">{ExternalLinkIcon}</div>
     </a>
     <a
-      className="HelpDialog__btn"
+      className="HelpDialog--btn"
       href="https://github.com/excalidraw/excalidraw/issues"
       target="_blank"
       rel="noopener noreferrer"
     >
       {t("helpDialog.github")}
-      <div className="HelpDialog__link-icon">{ExternalLinkIcon}</div>
     </a>
   </div>
 );
@@ -41,61 +37,88 @@ const Header = () => (
 const Section = (props: { title: string; children: React.ReactNode }) => (
   <>
     <h3>{props.title}</h3>
-    <div className="HelpDialog__islands-container">{props.children}</div>
+    {props.children}
   </>
 );
 
+const Columns = (props: { children: React.ReactNode }) => (
+  <div
+    style={{
+      display: "flex",
+      flexDirection: "row",
+      flexWrap: "wrap",
+      justifyContent: "space-between",
+    }}
+  >
+    {props.children}
+  </div>
+);
+
+const Column = (props: { children: React.ReactNode }) => (
+  <div style={{ width: "49%" }}>{props.children}</div>
+);
+
 const ShortcutIsland = (props: {
   caption: string;
   children: React.ReactNode;
-  className?: string;
 }) => (
-  <div className={`HelpDialog__island ${props.className}`}>
+  <div className="HelpDialog--island">
-    <h4 className="HelpDialog__island-title">{props.caption}</h4>
+    <h3 className="HelpDialog--island-title">{props.caption}</h3>
-    <div className="HelpDialog__island-content">{props.children}</div>
+    {props.children}
   </div>
 );
 
-function* intersperse(as: JSX.Element[][], delim: string | null) {
+const Shortcut = (props: {
-  let first = true;
-  for (const x of as) {
-    if (!first) {
-      yield delim;
-    }
-    first = false;
-    yield x;
-  }
-}
-
-const Shortcut = ({
-  label,
-  shortcuts,
-  isOr = true,
-}: {
   label: string;
   shortcuts: string[];
-  isOr?: boolean;
+  isOr: boolean;
 }) => {
-  const splitShortcutKeys = shortcuts.map((shortcut) => {
-    const keys = shortcut.endsWith("++")
-      ? [...shortcut.slice(0, -2).split("+"), "+"]
-      : shortcut.split("+");
-
-    return keys.map((key) => <ShortcutKey key={key}>{key}</ShortcutKey>);
-  });
-
   return (
-    <div className="HelpDialog__shortcut">
+    <div className="HelpDialog--shortcut">
-      <div>{label}</div>
+      <div
-      <div className="HelpDialog__key-container">
+        style={{
-        {[...intersperse(splitShortcutKeys, isOr ? t("helpDialog.or") : null)]}
+          display: "flex",
+          margin: "0",
+          padding: "4px 8px",
+          alignItems: "center",
+        }}
+      >
+        <div
+          style={{
+            lineHeight: 1.4,
+          }}
+        >
+          {props.label}
+        </div>
+        <div
+          style={{
+            display: "flex",
+            flex: "0 0 auto",
+            justifyContent: "flex-end",
+            marginInlineStart: "auto",
+            minWidth: "30%",
+          }}
+        >
+          {props.shortcuts.map((shortcut, index) => (
+            <React.Fragment key={index}>
+              <ShortcutKey>{shortcut}</ShortcutKey>
+              {props.isOr &&
+                index !== props.shortcuts.length - 1 &&
+                t("helpDialog.or")}
+            </React.Fragment>
+          ))}
+        </div>
       </div>
     </div>
   );
 };
 
+Shortcut.defaultProps = {
+  isOr: true,
+};
+
 const ShortcutKey = (props: { children: React.ReactNode }) => (
-  <kbd className="HelpDialog__key" {...props} />
+  <kbd className="HelpDialog--key" {...props} />
 );
 
 export const HelpDialog = ({ onClose }: { onClose?: () => void }) => {
@@ -114,52 +137,37 @@ export const HelpDialog = ({ onClose }: { onClose?: () => void }) => {
       >
         <Header />
         <Section title={t("helpDialog.shortcuts")}>
-          <ShortcutIsland
+          <Columns>
-            className="HelpDialog__island--tools"
+            <Column>
-            caption={t("helpDialog.tools")}
+              <ShortcutIsland caption={t("helpDialog.tools")}>
-          >
                 <Shortcut
                   label={t("toolBar.selection")}
-              shortcuts={[KEYS.V, KEYS["1"]]}
+                  shortcuts={["V", "1"]}
                 />
                 <Shortcut
                   label={t("toolBar.rectangle")}
-              shortcuts={[KEYS.R, KEYS["2"]]}
+                  shortcuts={["R", "2"]}
-            />
-            <Shortcut
-              label={t("toolBar.diamond")}
-              shortcuts={[KEYS.D, KEYS["3"]]}
-            />
-            <Shortcut
-              label={t("toolBar.ellipse")}
-              shortcuts={[KEYS.O, KEYS["4"]]}
-            />
-            <Shortcut
-              label={t("toolBar.arrow")}
-              shortcuts={[KEYS.A, KEYS["5"]]}
-            />
-            <Shortcut
-              label={t("toolBar.line")}
-              shortcuts={[KEYS.P, KEYS["6"]]}
                 />
+                <Shortcut label={t("toolBar.diamond")} shortcuts={["D", "3"]} />
+                <Shortcut label={t("toolBar.ellipse")} shortcuts={["O", "4"]} />
+                <Shortcut label={t("toolBar.arrow")} shortcuts={["A", "5"]} />
+                <Shortcut label={t("toolBar.line")} shortcuts={["P", "6"]} />
                 <Shortcut
                   label={t("toolBar.freedraw")}
-              shortcuts={["Shift + P", KEYS["7"]]}
+                  shortcuts={["Shift + P", "X", "7"]}
                 />
-            <Shortcut
+                <Shortcut label={t("toolBar.text")} shortcuts={["T", "8"]} />
-              label={t("toolBar.text")}
+                <Shortcut label={t("toolBar.image")} shortcuts={["9"]} />
-              shortcuts={[KEYS.T, KEYS["8"]]}
+                <Shortcut label={t("toolBar.library")} shortcuts={["0"]} />
-            />
-            <Shortcut label={t("toolBar.image")} shortcuts={[KEYS["9"]]} />
                 <Shortcut
                   label={t("toolBar.eraser")}
-              shortcuts={[KEYS.E, KEYS["0"]]}
+                  shortcuts={[getShortcutKey("E")]}
                 />
                 <Shortcut
                   label={t("helpDialog.editSelectedShape")}
                   shortcuts={[
-                getShortcutKey("CtrlOrCmd+Enter"),
+                    getShortcutKey("Enter"),
-                getShortcutKey(`CtrlOrCmd + ${t("helpDialog.doubleClick")}`),
+                    t("helpDialog.doubleClick"),
                   ]}
                 />
                 <Shortcut
@@ -196,7 +204,7 @@ export const HelpDialog = ({ onClose }: { onClose?: () => void }) => {
                   ]}
                   isOr={false}
                 />
-            <Shortcut label={t("toolBar.lock")} shortcuts={[KEYS.Q]} />
+                <Shortcut label={t("toolBar.lock")} shortcuts={["Q"]} />
                 <Shortcut
                   label={t("helpDialog.preventBinding")}
                   shortcuts={[getShortcutKey("CtrlOrCmd")]}
@@ -206,10 +214,7 @@ export const HelpDialog = ({ onClose }: { onClose?: () => void }) => {
                   shortcuts={[getShortcutKey("CtrlOrCmd+K")]}
                 />
               </ShortcutIsland>
-          <ShortcutIsland
+              <ShortcutIsland caption={t("helpDialog.view")}>
-            className="HelpDialog__island--view"
-            caption={t("helpDialog.view")}
-          >
                 <Shortcut
                   label={t("buttons.zoomIn")}
                   shortcuts={[getShortcutKey("CtrlOrCmd++")]}
@@ -230,14 +235,6 @@ export const HelpDialog = ({ onClose }: { onClose?: () => void }) => {
                   label={t("helpDialog.zoomToSelection")}
                   shortcuts={["Shift+2"]}
                 />
-            <Shortcut
-              label={t("helpDialog.movePageUpDown")}
-              shortcuts={["PgUp/PgDn"]}
-            />
-            <Shortcut
-              label={t("helpDialog.movePageLeftRight")}
-              shortcuts={["Shift+PgUp/PgDn"]}
-            />
                 <Shortcut label={t("buttons.fullScreen")} shortcuts={["F"]} />
                 <Shortcut
                   label={t("buttons.zenMode")}
@@ -260,10 +257,9 @@ export const HelpDialog = ({ onClose }: { onClose?: () => void }) => {
                   shortcuts={[getShortcutKey("Alt+/")]}
                 />
               </ShortcutIsland>
-          <ShortcutIsland
+            </Column>
-            className="HelpDialog__island--editor"
+            <Column>
-            caption={t("helpDialog.editor")}
+              <ShortcutIsland caption={t("helpDialog.editor")}>
-          >
                 <Shortcut
                   label={t("labels.selectAll")}
                   shortcuts={[getShortcutKey("CtrlOrCmd+A")]}
@@ -274,11 +270,15 @@ export const HelpDialog = ({ onClose }: { onClose?: () => void }) => {
                 />
                 <Shortcut
                   label={t("helpDialog.deepSelect")}
-              shortcuts={[getShortcutKey(`CtrlOrCmd+${t("helpDialog.click")}`)]}
+                  shortcuts={[
+                    getShortcutKey(`CtrlOrCmd+${t("helpDialog.click")}`),
+                  ]}
                 />
                 <Shortcut
                   label={t("helpDialog.deepBoxSelect")}
-              shortcuts={[getShortcutKey(`CtrlOrCmd+${t("helpDialog.drag")}`)]}
+                  shortcuts={[
+                    getShortcutKey(`CtrlOrCmd+${t("helpDialog.drag")}`),
+                  ]}
                 />
                 <Shortcut
                   label={t("labels.moveCanvas")}
@@ -300,10 +300,6 @@ export const HelpDialog = ({ onClose }: { onClose?: () => void }) => {
                   label={t("labels.paste")}
                   shortcuts={[getShortcutKey("CtrlOrCmd+V")]}
                 />
-            <Shortcut
-              label={t("labels.pasteAsPlaintext")}
-              shortcuts={[getShortcutKey("CtrlOrCmd+Shift+V")]}
-            />
                 <Shortcut
                   label={t("labels.copyAsPng")}
                   shortcuts={[getShortcutKey("Shift+Alt+C")]}
@@ -318,7 +314,7 @@ export const HelpDialog = ({ onClose }: { onClose?: () => void }) => {
                 />
                 <Shortcut
                   label={t("labels.delete")}
-              shortcuts={[getShortcutKey("Delete")]}
+                  shortcuts={[getShortcutKey("Del")]}
                 />
                 <Shortcut
                   label={t("labels.sendToBack")}
@@ -419,6 +415,8 @@ export const HelpDialog = ({ onClose }: { onClose?: () => void }) => {
                   shortcuts={[getShortcutKey("CtrlOrCmd+Shift+>")]}
                 />
               </ShortcutIsland>
+            </Column>
+          </Columns>
         </Section>
       </Dialog>
     </>

src/components/HelpIcon.tsx

@@ -1,13 +1,13 @@
-import { HelpIcon } from "./icons";
+import { questionCircle } from "../components/icons";
 
-type HelpButtonProps = {
+type HelpIconProps = {
   title?: string;
   name?: string;
   id?: string;
   onClick?(): void;
 };
 
-export const HelpButton = (props: HelpButtonProps) => (
+export const HelpIcon = (props: HelpIconProps) => (
   <button
     className="help-icon"
     onClick={props.onClick}
@@ -15,6 +15,6 @@ export const HelpButton = (props: HelpButtonProps) => (
     title={`${props.title} — ?`}
     aria-label={props.title}
   >
-    {HelpIcon}
+    {questionCircle}
   </button>
 );

src/components/HintViewer.scss

@@ -14,24 +14,20 @@ $wide-viewport-width: 1000px;
     top: 100%;
     max-width: 100%;
     width: 100%;
-    margin-top: 0.5rem;
+    margin-top: 6px;
     text-align: center;
-    color: var(--color-gray-40);
+    color: $oc-gray-6;
-    font-size: 0.75rem;
+    font-size: 0.8rem;
 
     @include isMobile {
       position: static;
-      padding-right: 2rem;
+      padding-right: 2em;
     }
 
     > span {
-      padding: 0.25rem;
+      padding: 0.2rem 0.4rem;
-    }
+      background-color: var(--overlay-bg-color);
-  }
+      border-radius: 4px;
-
-  &.theme--dark {
-    .HintViewer {
-      color: var(--color-gray-60);
     }
   }
 }

src/components/IconPicker.scss

@@ -10,8 +10,7 @@
   .picker {
     background: var(--popup-bg-color);
     border: 0 solid transparentize($oc-white, 0.75);
-    // ˇˇ yeah, i dunno, open to suggestions here :D
+    box-shadow: transparentize($oc-black, 0.75) 0 1px 4px;
-    box-shadow: rgb(0 0 0 / 25%) 2px 2px 4px 2px;
     border-radius: 4px;
     position: absolute;
   }
@@ -47,6 +46,7 @@
       margin: 0;
       width: 36px;
       height: 18px;
+      opacity: 0.6;
       pointer-events: none;
     }
   }

src/components/IconPicker.tsx

@@ -4,7 +4,6 @@ import { Popover } from "./Popover";
 import "./IconPicker.scss";
 import { isArrowKey, KEYS } from "../keys";
 import { getLanguage } from "../i18n";
-import clsx from "clsx";
 
 function Picker<T>({
   options,
@@ -103,9 +102,7 @@ function Picker<T>({
       <div className="picker-content" ref={rGallery}>
         {options.map((option, i) => (
           <button
-            className={clsx("picker-option", {
+            className="picker-option"
-              active: value === option.value,
-            })}
             onClick={(event) => {
               (event.currentTarget as HTMLButtonElement).focus();
               onChange(option.value);
@@ -153,7 +150,7 @@ export function IconPicker<T>({
   const isRTL = getLanguage().rtl;
 
   return (
-    <div>
+    <label className={"picker-container"}>
       <button
         name={group}
         className={isActive ? "active" : ""}
@@ -187,6 +184,6 @@ export function IconPicker<T>({
           </>
         ) : null}
       </React.Suspense>
-    </div>
+    </label>
   );
 }

src/components/ImageExportDialog.tsx

@@ -1,14 +1,18 @@
 import React, { useEffect, useRef, useState } from "react";
+import { render, unmountComponentAtNode } from "react-dom";
 import { probablySupportsClipboardBlob } from "../clipboard";
 import { canvasToBlob } from "../data/blob";
 import { NonDeletedExcalidrawElement } from "../element/types";
+import { CanvasError } from "../errors";
 import { t } from "../i18n";
+import { useDevice } from "./App";
 import { getSelectedElements, isSomeElementSelected } from "../scene";
 import { exportToCanvas } from "../scene/export";
 import { AppState, BinaryFiles } from "../types";
 import { Dialog } from "./Dialog";
-import { clipboard } from "./icons";
+import { clipboard, exportImage } from "./icons";
 import Stack from "./Stack";
+import { ToolButton } from "./ToolButton";
 import "./ExportDialog.scss";
 import OpenColor from "open-color";
 import { CheckboxItem } from "./CheckboxItem";
@@ -31,6 +35,19 @@ export const ErrorCanvasPreview = () => {
   );
 };
 
+const renderPreview = (
+  content: HTMLCanvasElement | Error,
+  previewNode: HTMLDivElement,
+) => {
+  unmountComponentAtNode(previewNode);
+  previewNode.innerHTML = "";
+  if (content instanceof HTMLCanvasElement) {
+    previewNode.appendChild(content);
+  } else {
+    render(<ErrorCanvasPreview />, previewNode);
+  }
+};
+
 export type ExportCB = (
   elements: readonly NonDeletedExcalidrawElement[],
   scale?: number,
@@ -84,7 +101,6 @@ const ImageExportModal = ({
   const [exportSelected, setExportSelected] = useState(someElementIsSelected);
   const previewRef = useRef<HTMLDivElement>(null);
   const { exportBackground, viewBackgroundColor } = appState;
-  const [renderError, setRenderError] = useState<Error | null>(null);
 
   const exportedElements = exportSelected
     ? getSelectedElements(elements, appState, true)
@@ -105,16 +121,15 @@ const ImageExportModal = ({
       exportPadding,
     })
       .then((canvas) => {
-        setRenderError(null);
         // 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(() => {
-          previewNode.replaceChildren(canvas);
+          renderPreview(canvas, previewNode);
         });
       })
       .catch((error) => {
         console.error(error);
-        setRenderError(error);
+        renderPreview(new CanvasError(), previewNode);
       });
   }, [
     appState,
@@ -127,9 +142,7 @@ const ImageExportModal = ({
 
   return (
     <div className="ExportDialog">
-      <div className="ExportDialog__preview" ref={previewRef}>
+      <div className="ExportDialog__preview" ref={previewRef} />
-        {renderError && <ErrorCanvasPreview />}
-      </div>
       {supportsContextFilters &&
         actionManager.renderAction("exportWithDarkMode")}
       <div style={{ display: "grid", gridTemplateColumns: "1fr" }}>
@@ -208,7 +221,6 @@ const ImageExportModal = ({
 export const ImageExportDialog = ({
   elements,
   appState,
-  setAppState,
   files,
   exportPadding = DEFAULT_EXPORT_PADDING,
   actionManager,
@@ -217,7 +229,6 @@ export const ImageExportDialog = ({
   onExportToClipboard,
 }: {
   appState: AppState;
-  setAppState: React.Component<any, AppState>["setState"];
   elements: readonly NonDeletedExcalidrawElement[];
   files: BinaryFiles;
   exportPadding?: number;
@@ -226,13 +237,26 @@ export const ImageExportDialog = ({
   onExportToSvg: ExportCB;
   onExportToClipboard: ExportCB;
 }) => {
+  const [modalIsShown, setModalIsShown] = useState(false);
+
   const handleClose = React.useCallback(() => {
-    setAppState({ openDialog: null });
+    setModalIsShown(false);
-  }, [setAppState]);
+  }, []);
 
   return (
     <>
-      {appState.openDialog === "imageExport" && (
+      <ToolButton
+        onClick={() => {
+          setModalIsShown(true);
+        }}
+        data-testid="image-export-button"
+        icon={exportImage}
+        type="button"
+        aria-label={t("buttons.exportImage")}
+        showAriaLabel={useDevice().isMobile}
+        title={t("buttons.exportImage")}
+      />
+      {modalIsShown && (
         <Dialog onCloseRequest={handleClose} title={t("buttons.exportImage")}>
           <ImageExportModal
             elements={elements}

src/components/Island.scss

@@ -1,7 +1,6 @@
 .excalidraw {
   .Island {
     --padding: 0;
-    box-sizing: border-box;
     background-color: var(--island-bg-color);
     box-shadow: var(--shadow-island);
     border-radius: var(--border-radius-lg);

src/components/JSONExportDialog.tsx

@@ -1,10 +1,10 @@
 import React, { useState } from "react";
 import { NonDeletedExcalidrawElement } from "../element/types";
 import { t } from "../i18n";
-
+import { useDevice } from "./App";
 import { AppState, ExportOpts, BinaryFiles } from "../types";
 import { Dialog } from "./Dialog";
-import { ExportIcon, exportToFileIcon, LinkIcon } from "./icons";
+import { exportFile, exportToFileIcon, link } from "./icons";
 import { ToolButton } from "./ToolButton";
 import { actionSaveFileToDisk } from "../actions/actionExport";
 import { Card } from "./Card";
@@ -14,7 +14,6 @@ import { nativeFileSystemSupported } from "../data/filesystem";
 import { trackEvent } from "../analytics";
 import { ActionManager } from "../actions/manager";
 import { getFrame } from "../utils";
-import MenuItem from "./MenuItem";
 
 export type ExportCB = (
   elements: readonly NonDeletedExcalidrawElement[],
@@ -64,7 +63,7 @@ const JSONExportModal = ({
         )}
         {onExportToBackend && (
           <Card color="pink">
-            <div className="Card-icon">{LinkIcon}</div>
+            <div className="Card-icon">{link}</div>
             <h2>{t("exportDialog.link_title")}</h2>
             <div className="Card-details">{t("exportDialog.link_details")}</div>
             <ToolButton
@@ -110,13 +109,16 @@ export const JSONExportDialog = ({
 
   return (
     <>
-      <MenuItem
+      <ToolButton
-        icon={ExportIcon}
-        label={t("buttons.export")}
         onClick={() => {
           setModalIsShown(true);
         }}
-        dataTestId="json-export-button"
+        data-testid="json-export-button"
+        icon={exportFile}
+        type="button"
+        aria-label={t("buttons.export")}
+        showAriaLabel={useDevice().isMobile}
+        title={t("buttons.export")}
       />
       {modalIsShown && (
         <Dialog onCloseRequest={handleClose} title={t("buttons.export")}>

src/components/LayerUI.scss

@@ -16,10 +16,8 @@
     height: 100%;
     pointer-events: none;
     z-index: var(--zIndex-layerUI);
-
     &__top-right {
       display: flex;
-      gap: 0.75rem;
     }
 
     &__footer {
@@ -50,6 +48,13 @@
         transform: translate(-999px, 0);
       }
 
+      :root[dir="ltr"] &.layer-ui__wrapper__footer-left--transition-left {
+        transform: translate(-76px, 0);
+      }
+      :root[dir="rtl"] &.layer-ui__wrapper__footer-left--transition-left {
+        transform: translate(76px, 0);
+      }
+
       &.layer-ui__wrapper__footer-left--transition-bottom {
         transform: translate(0, 92px);
       }
@@ -85,10 +90,6 @@
       & > * {
         pointer-events: all;
       }
-
-      display: flex;
-      width: 100%;
-      justify-content: flex-start;
     }
     .layer-ui__wrapper__footer-left,
     .layer-ui__wrapper__footer-right,
@@ -96,9 +97,14 @@
       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

@@ -8,15 +8,10 @@ import { NonDeletedExcalidrawElement } from "../element/types";
 import { Language, t } from "../i18n";
 import { calculateScrollCenter } from "../scene";
 import { ExportType } from "../scene/types";
-import {
+import { AppProps, AppState, ExcalidrawProps, BinaryFiles } from "../types";
-  AppProps,
+import { muteFSAbortError } from "../utils";
-  AppState,
-  ExcalidrawProps,
-  BinaryFiles,
-  UIChildrenComponents,
-} from "../types";
-import { muteFSAbortError, ReactChildrenToObject } from "../utils";
 import { SelectedShapeActions, ShapesSwitcher } from "./Actions";
+import { BackgroundPickerAndDarkModeToggle } from "./BackgroundPickerAndDarkModeToggle";
 import CollabButton from "./CollabButton";
 import { ErrorDialog } from "./ErrorDialog";
 import { ExportCB, ImageExportDialog } from "./ImageExportDialog";
@@ -41,26 +36,13 @@ import "./LayerUI.scss";
 import "./Toolbar.scss";
 import { PenModeButton } from "./PenModeButton";
 import { trackEvent } from "../analytics";
-import { isMenuOpenAtom, useDevice } from "../components/App";
+import { useDevice } from "../components/App";
 import { Stats } from "./Stats";
 import { actionToggleStats } from "../actions/actionToggleStats";
-import Footer from "./footer/Footer";
+import Footer from "./Footer";
-import {
-  ExportImageIcon,
-  HamburgerMenuIcon,
-  WelcomeScreenMenuArrow,
-  WelcomeScreenTopToolbarArrow,
-} from "./icons";
-import { MenuLinks, Separator } from "./MenuUtils";
-import { useOutsideClickHook } from "../hooks/useOutsideClick";
-import WelcomeScreen from "./WelcomeScreen";
 import { hostSidebarCountersAtom } from "./Sidebar/Sidebar";
 import { jotaiScope } from "../jotai";
 import { useAtom } from "jotai";
-import { LanguageList } from "../excalidraw-app/components/LanguageList";
-import WelcomeScreenDecor from "./WelcomeScreenDecor";
-import { getShortcutFromShortcutName } from "../actions/shortcuts";
-import MenuItem from "./MenuItem";
 
 interface LayerUIProps {
   actionManager: ActionManager;
@@ -77,6 +59,7 @@ interface LayerUIProps {
   langCode: Language["code"];
   isCollaborating: boolean;
   renderTopRightUI?: ExcalidrawProps["renderTopRightUI"];
+  renderCustomFooter?: ExcalidrawProps["renderFooter"];
   renderCustomStats?: ExcalidrawProps["renderCustomStats"];
   renderCustomSidebar?: ExcalidrawProps["renderSidebar"];
   libraryReturnUrl: ExcalidrawProps["libraryReturnUrl"];
@@ -85,10 +68,7 @@ interface LayerUIProps {
   library: Library;
   id: string;
   onImageAction: (data: { insertOnCanvasDirectly: boolean }) => void;
-  renderWelcomeScreen: boolean;
-  children?: React.ReactNode;
 }
-
 const LayerUI = ({
   actionManager,
   appState,
@@ -103,7 +83,7 @@ const LayerUI = ({
   showExitZenModeBtn,
   isCollaborating,
   renderTopRightUI,
-
+  renderCustomFooter,
   renderCustomStats,
   renderCustomSidebar,
   libraryReturnUrl,
@@ -112,14 +92,9 @@ const LayerUI = ({
   library,
   id,
   onImageAction,
-  renderWelcomeScreen,
-  children,
 }: LayerUIProps) => {
   const device = useDevice();
 
-  const childrenComponents =
-    ReactChildrenToObject<UIChildrenComponents>(children);
-
   const renderJSONExportDialog = () => {
     if (!UIOptions.canvasActions.export) {
       return null;
@@ -176,7 +151,6 @@ const LayerUI = ({
       <ImageExportDialog
         elements={elements}
         appState={appState}
-        setAppState={setAppState}
         files={files}
         actionManager={actionManager}
         onExportToPng={createExporter("png")}
@@ -186,61 +160,50 @@ const LayerUI = ({
     );
   };
 
-  const [isMenuOpen, setIsMenuOpen] = useAtom(isMenuOpenAtom);
+  const Separator = () => {
-  const menuRef = useOutsideClickHook(() => setIsMenuOpen(false));
+    return <div style={{ width: ".625em" }} />;
+  };
 
-  const renderCanvasActions = () => (
+  const renderViewModeCanvasActions = () => {
-    <div style={{ position: "relative" }}>
+    return (
-      <WelcomeScreenDecor
+      <Section
-        shouldRender={renderWelcomeScreen && !appState.isLoading}
+        heading="canvasActions"
-      >
+        className={clsx("zen-mode-transition", {
-        <div className="virgil WelcomeScreen-decor WelcomeScreen-decor--menu-pointer">
-          {WelcomeScreenMenuArrow}
-          <div>{t("welcomeScreen.menuHints")}</div>
-        </div>
-      </WelcomeScreenDecor>
-
-      <button
-        data-prevent-outside-click
-        className={clsx("menu-button", "zen-mode-transition", {
           "transition-left": appState.zenModeEnabled,
         })}
-        onClick={() => setIsMenuOpen(!isMenuOpen)}
-        type="button"
-        data-testid="menu-button"
       >
-        {HamburgerMenuIcon}
-      </button>
-
-      {isMenuOpen && (
-        <div
-          ref={menuRef}
-          style={{ position: "absolute", top: "100%", marginTop: ".25rem" }}
-        >
-          <Section heading="canvasActions">
         {/* the zIndex ensures this menu has higher stacking order,
          see https://github.com/excalidraw/excalidraw/pull/1445 */}
-            <Island
+        <Island padding={2} style={{ zIndex: 1 }}>
-              className="menu-container"
+          <Stack.Col gap={4}>
-              padding={2}
+            <Stack.Row gap={1} justifyContent="space-between">
-              style={{ zIndex: 1 }}
-            >
-              {!appState.viewModeEnabled &&
-                actionManager.renderAction("loadScene")}
-              {/* // TODO barnabasmolnar/editor-redesign  */}
-              {/* is this fine here? */}
-              {appState.fileHandle &&
-                actionManager.renderAction("saveToActiveFile")}
               {renderJSONExportDialog()}
-              {UIOptions.canvasActions.saveAsImage && (
+              {renderImageExportDialog()}
-                <MenuItem
+            </Stack.Row>
-                  label={t("buttons.exportImage")}
+          </Stack.Col>
-                  icon={ExportImageIcon}
+        </Island>
-                  dataTestId="image-export-button"
+      </Section>
-                  onClick={() => setAppState({ openDialog: "imageExport" })}
+    );
-                  shortcut={getShortcutFromShortcutName("imageExport")}
+  };
-                />
+
-              )}
+  const renderCanvasActions = () => (
+    <Section
+      heading="canvasActions"
+      className={clsx("zen-mode-transition", {
+        "transition-left": appState.zenModeEnabled,
+      })}
+    >
+      {/* the zIndex ensures this menu has higher stacking order,
+         see https://github.com/excalidraw/excalidraw/pull/1445 */}
+      <Island padding={2} style={{ zIndex: 1 }}>
+        <Stack.Col gap={4}>
+          <Stack.Row gap={1} justifyContent="space-between">
+            {actionManager.renderAction("clearCanvas")}
+            <Separator />
+            {actionManager.renderAction("loadScene")}
+            {renderJSONExportDialog()}
+            {renderImageExportDialog()}
+            <Separator />
             {onCollabButtonClick && (
               <CollabButton
                 isCollaborating={isCollaborating}
@@ -248,45 +211,20 @@ const LayerUI = ({
                 onClick={onCollabButtonClick}
               />
             )}
-              {actionManager.renderAction("toggleShortcuts", undefined, true)}
+          </Stack.Row>
-              {!appState.viewModeEnabled &&
+          <BackgroundPickerAndDarkModeToggle actionManager={actionManager} />
-                actionManager.renderAction("clearCanvas")}
+          {appState.fileHandle && (
-              <Separator />
+            <>{actionManager.renderAction("saveToActiveFile")}</>
-              <MenuLinks />
-              <Separator />
-              <div
-                style={{
-                  display: "flex",
-                  flexDirection: "column",
-                  rowGap: ".5rem",
-                }}
-              >
-                <div>{actionManager.renderAction("toggleTheme")}</div>
-                <div style={{ padding: "0 0.625rem" }}>
-                  <LanguageList style={{ width: "100%" }} />
-                </div>
-                {!appState.viewModeEnabled && (
-                  <div>
-                    <div style={{ fontSize: ".75rem", marginBottom: ".5rem" }}>
-                      {t("labels.canvasBackground")}
-                    </div>
-                    <div style={{ padding: "0 0.625rem" }}>
-                      {actionManager.renderAction("changeViewBackgroundColor")}
-                    </div>
-                  </div>
           )}
-              </div>
+        </Stack.Col>
       </Island>
     </Section>
-        </div>
-      )}
-    </div>
   );
 
   const renderSelectedShapeActions = () => (
     <Section
       heading="selectedShapeActions"
-      className={clsx("selected-shape-actions zen-mode-transition", {
+      className={clsx("zen-mode-transition", {
         "transition-left": appState.zenModeEnabled,
       })}
     >
@@ -294,9 +232,10 @@ const LayerUI = ({
         className={CLASSES.SHAPE_ACTIONS_MENU}
         padding={2}
         style={{
-          // we want to make sure this doesn't overflow so subtracting the
+          // we want to make sure this doesn't overflow so subtracting 200
-          // approximate height of hamburgerMenu + footer
+          // which is approximately height of zoom footer and top left menu items with some buffer
-          maxHeight: `${appState.height - 166}px`,
+          // if active file name is displayed, subtracting 248 to account for its height
+          maxHeight: `${appState.height - (appState.fileHandle ? 248 : 200)}px`,
         }}
       >
         <SelectedShapeActions
@@ -316,34 +255,21 @@ const LayerUI = ({
 
     return (
       <FixedSideContainer side="top">
-        {renderWelcomeScreen && !appState.isLoading && (
-          <WelcomeScreen appState={appState} actionManager={actionManager} />
-        )}
         <div className="App-menu App-menu_top">
           <Stack.Col
-            gap={6}
+            gap={4}
-            className={clsx("App-menu_top__left", {
+            className={clsx({
               "disable-pointerEvents": appState.zenModeEnabled,
             })}
           >
-            {renderCanvasActions()}
+            {appState.viewModeEnabled
+              ? renderViewModeCanvasActions()
+              : renderCanvasActions()}
             {shouldRenderSelectedShapeActions && renderSelectedShapeActions()}
           </Stack.Col>
           {!appState.viewModeEnabled && (
-            <Section heading="shapes" className="shapes-section">
+            <Section heading="shapes">
               {(heading: React.ReactNode) => (
-                <div style={{ position: "relative" }}>
-                  <WelcomeScreenDecor
-                    shouldRender={renderWelcomeScreen && !appState.isLoading}
-                  >
-                    <div className="virgil WelcomeScreen-decor WelcomeScreen-decor--top-toolbar-pointer">
-                      <div className="WelcomeScreen-decor--top-toolbar-pointer__label">
-                        {t("welcomeScreen.toolbarHints")}
-                      </div>
-                      {WelcomeScreenTopToolbarArrow}
-                    </div>
-                  </WelcomeScreenDecor>
-
                 <Stack.Col gap={4} align="start">
                   <Stack.Row
                     gap={1}
@@ -351,6 +277,19 @@ const LayerUI = ({
                       "zen-mode": appState.zenModeEnabled,
                     })}
                   >
+                    <PenModeButton
+                      zenModeEnabled={appState.zenModeEnabled}
+                      checked={appState.penMode}
+                      onChange={onPenModeToggle}
+                      title={t("toolBar.penMode")}
+                      penDetected={appState.penDetected}
+                    />
+                    <LockButton
+                      zenModeEnabled={appState.zenModeEnabled}
+                      checked={appState.activeTool.locked}
+                      onChange={() => onLockToggle()}
+                      title={t("toolBar.lock")}
+                    />
                     <Island
                       padding={1}
                       className={clsx("App-toolbar", {
@@ -365,21 +304,6 @@ const LayerUI = ({
                       />
                       {heading}
                       <Stack.Row gap={1}>
-                          <PenModeButton
-                            zenModeEnabled={appState.zenModeEnabled}
-                            checked={appState.penMode}
-                            onChange={onPenModeToggle}
-                            title={t("toolBar.penMode")}
-                            penDetected={appState.penDetected}
-                          />
-                          <LockButton
-                            zenModeEnabled={appState.zenModeEnabled}
-                            checked={appState.activeTool.locked}
-                            onChange={() => onLockToggle()}
-                            title={t("toolBar.lock")}
-                          />
-                          <div className="App-toolbar__divider"></div>
-
                         <ShapesSwitcher
                           appState={appState}
                           canvas={canvas}
@@ -391,14 +315,14 @@ const LayerUI = ({
                             });
                           }}
                         />
-                          {/* {actionManager.renderAction("eraser", {
-                          // size: "small",
-                        })} */}
                       </Stack.Row>
                     </Island>
+                    <LibraryButton
+                      appState={appState}
+                      setAppState={setAppState}
+                    />
                   </Stack.Row>
                 </Stack.Col>
-                </div>
               )}
             </Section>
           )}
@@ -414,18 +338,7 @@ const LayerUI = ({
               collaborators={appState.collaborators}
               actionManager={actionManager}
             />
-            {onCollabButtonClick && (
-              <CollabButton
-                isInHamburgerMenu={false}
-                isCollaborating={isCollaborating}
-                collaboratorCount={appState.collaborators.size}
-                onClick={onCollabButtonClick}
-              />
-            )}
             {renderTopRightUI?.(device.isMobile, appState)}
-            {!appState.viewModeEnabled && (
-              <LibraryButton appState={appState} setAppState={setAppState} />
-            )}
           </div>
         </div>
       </FixedSideContainer>
@@ -458,14 +371,13 @@ const LayerUI = ({
           onClose={() => setAppState({ errorMessage: null })}
         />
       )}
-      {appState.openDialog === "help" && (
+      {appState.showHelpDialog && (
         <HelpDialog
           onClose={() => {
-            setAppState({ openDialog: null });
+            setAppState({ showHelpDialog: false });
           }}
         />
       )}
-      {renderImageExportDialog()}
       {appState.pasteDialog.shown && (
         <PasteChartDialog
           setAppState={setAppState}
@@ -480,7 +392,6 @@ const LayerUI = ({
       )}
       {device.isMobile && (
         <MobileMenu
-          renderWelcomeScreen={renderWelcomeScreen}
           appState={appState}
           elements={elements}
           actionManager={actionManager}
@@ -492,6 +403,7 @@ const LayerUI = ({
           onPenModeToggle={onPenModeToggle}
           canvas={canvas}
           isCollaborating={isCollaborating}
+          renderCustomFooter={renderCustomFooter}
           onImageAction={onImageAction}
           renderTopRightUI={renderTopRightUI}
           renderCustomStats={renderCustomStats}
@@ -521,14 +433,11 @@ const LayerUI = ({
           >
             {renderFixedSideContainer()}
             <Footer
-              renderWelcomeScreen={renderWelcomeScreen}
               appState={appState}
               actionManager={actionManager}
+              renderCustomFooter={renderCustomFooter}
               showExitZenModeBtn={showExitZenModeBtn}
-            >
+            />
-              {childrenComponents.FooterCenter}
-            </Footer>
-
             {appState.showStats && (
               <Stats
                 appState={appState}
@@ -575,6 +484,7 @@ const areEqual = (prev: LayerUIProps, next: LayerUIProps) => {
   const keys = Object.keys(prevAppState) as (keyof Partial<AppState>)[];
 
   return (
+    prev.renderCustomFooter === next.renderCustomFooter &&
     prev.renderTopRightUI === next.renderTopRightUI &&
     prev.renderCustomStats === next.renderCustomStats &&
     prev.renderCustomSidebar === next.renderCustomSidebar &&

src/components/LibraryButton.scss

@@ -1,32 +0,0 @@
-@import "../css/variables.module";
-
-.library-button {
-  @include outlineButtonStyles;
-
-  background-color: var(--island-bg-color);
-
-  width: auto;
-  height: var(--lg-button-size);
-
-  display: flex;
-  align-items: center;
-  gap: 0.5rem;
-
-  line-height: 0;
-
-  font-size: 0.75rem;
-  letter-spacing: 0.4px;
-
-  svg {
-    width: var(--lg-icon-size);
-    height: var(--lg-icon-size);
-  }
-
-  &__label {
-    display: none;
-
-    @media screen and (min-width: 1024px) {
-      display: block;
-    }
-  }
-}

src/components/LibraryButton.tsx

@@ -1,11 +1,19 @@
 import React from "react";
+import clsx from "clsx";
 import { t } from "../i18n";
 import { AppState } from "../types";
 import { capitalizeString } from "../utils";
 import { trackEvent } from "../analytics";
 import { useDevice } from "./App";
-import "./LibraryButton.scss";
+
-import { LibraryIcon } from "./icons";
+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;
@@ -13,16 +21,17 @@ export const LibraryButton: React.FC<{
   isMobile?: boolean;
 }> = ({ appState, setAppState, isMobile }) => {
   const device = useDevice();
-  const showLabel = !isMobile;
-
-  // TODO barnabasmolnar/redesign
-  // not great, toolbar jumps in a jarring manner
-  if (appState.isSidebarDocked && appState.openSidebar === "library") {
-    return null;
-  }
-
   return (
-    <label title={`${capitalizeString(t("toolBar.library"))}`}>
+    <label
+      className={clsx(
+        "ToolIcon ToolIcon_type_floating ToolIcon__library",
+        `ToolIcon_size_medium`,
+        {
+          "is-mobile": isMobile,
+        },
+      )}
+      title={`${capitalizeString(t("toolBar.library"))} — 0`}
+    >
       <input
         className="ToolIcon_type_checkbox"
         type="checkbox"
@@ -46,12 +55,7 @@ export const LibraryButton: React.FC<{
         aria-label={capitalizeString(t("toolBar.library"))}
         aria-keyshortcuts="0"
       />
-      <div className="library-button">
+      <div className="ToolIcon__icon">{LIBRARY_ICON}</div>
-        <div>{LibraryIcon}</div>
-        {showLabel && (
-          <div className="library-button__label">{t("toolBar.library")}</div>
-        )}
-      </div>
     </label>
   );
 };

src/components/LibraryMenu.scss

@@ -35,32 +35,103 @@
     }
   }
 
-  .library-actions-counter {
+  .library-actions {
-    background-color: var(--color-primary);
+    width: 100%;
-    color: var(--color-primary-light);
-    font-weight: bold;
     display: flex;
+    margin-right: auto;
     align-items: center;
-    justify-content: center;
+
-    border-radius: 50%;
+    button .library-actions-counter {
-    width: 1rem;
-    height: 1rem;
       position: absolute;
-    bottom: -0.25rem;
+      right: 2px;
-    right: -0.25rem;
+      bottom: 2px;
-    font-size: 0.625rem;
+      border-radius: 50%;
-    pointer-events: none;
+      width: 1em;
+      height: 1em;
+      padding: 1px;
+      font-size: 0.7rem;
+      background: #fff;
+    }
+
+    &--remove {
+      background-color: $oc-red-7;
+      &:hover {
+        background-color: $oc-red-8;
+      }
+      &:active {
+        background-color: $oc-red-9;
+      }
+      svg {
+        color: $oc-white;
+      }
+      .library-actions-counter {
+        color: $oc-red-7;
+      }
+    }
+
+    &--export {
+      background-color: $oc-lime-5;
+
+      &:hover {
+        background-color: $oc-lime-7;
+      }
+
+      &:active {
+        background-color: $oc-lime-8;
+      }
+      svg {
+        color: $oc-white;
+      }
+      .library-actions-counter {
+        color: $oc-lime-5;
+      }
+    }
+
+    &--publish {
+      background-color: $oc-cyan-6;
+      &:hover {
+        background-color: $oc-cyan-7;
+      }
+      &:active {
+        background-color: $oc-cyan-9;
+      }
+      svg {
+        color: $oc-white;
+      }
+      label {
+        margin-left: -0.2em;
+        margin-right: 1.1em;
+        color: $oc-white;
+        font-size: 0.86em;
+      }
+      .library-actions-counter {
+        color: $oc-cyan-6;
+      }
+    }
+
+    &--load {
+      background-color: $oc-blue-6;
+      &:hover {
+        background-color: $oc-blue-7;
+      }
+      &:active {
+        background-color: $oc-blue-9;
+      }
+      svg {
+        color: $oc-white;
+      }
+    }
   }
 
   .layer-ui__library-message {
-    padding: 2rem;
+    padding: 2em 4em;
     min-width: 200px;
     display: flex;
     flex-direction: column;
     align-items: center;
-    flex-grow: 1;
+    .Spinner {
-    justify-content: center;
+      margin-bottom: 1em;
-
+    }
     span {
       font-size: 0.8em;
     }
@@ -88,10 +159,11 @@
   }
 
   .library-menu-browse-button {
-    margin: 1rem auto;
+    width: 80%;
-
+    min-height: 22px;
-    padding: 0.875rem 1rem;
+    margin: 0 auto;
-
+    margin-top: 1rem;
+    padding: 10px;
     display: flex;
     align-items: center;
     justify-content: center;
@@ -104,10 +176,6 @@
     text-align: center;
     white-space: nowrap;
     text-decoration: none !important;
-
-    font-weight: 600;
-    font-size: 0.75rem;
-
     &:hover {
       background-color: var(--color-primary-darker);
     }
@@ -116,12 +184,6 @@
     }
   }
 
-  &.theme--dark {
-    .library-menu-browse-button {
-      color: var(--color-gray-100);
-    }
-  }
-
   .library-menu-browse-button--mobile {
     min-height: 22px;
     margin-left: auto;

src/components/LibraryMenu.tsx

@@ -16,7 +16,7 @@ import { LibraryItems, LibraryItem, AppState, ExcalidrawProps } from "../types";
 
 import "./LibraryMenu.scss";
 import LibraryMenuItems from "./LibraryMenuItems";
-import { EVENT } from "../constants";
+import { EVENT, VERSIONS } from "../constants";
 import { KEYS } from "../keys";
 import { trackEvent } from "../analytics";
 import { useAtom } from "jotai";
@@ -31,7 +31,6 @@ import { Sidebar } from "./Sidebar/Sidebar";
 import { getSelectedElements } from "../scene";
 import { NonDeletedExcalidrawElement } from "../element/types";
 import { LibraryMenuHeader } from "./LibraryMenuHeaderContent";
-import LibraryMenuBrowseButton from "./LibraryMenuBrowseButton";
 
 const useOnClickOutside = (
   ref: RefObject<HTMLElement>,
@@ -95,6 +94,9 @@ export const LibraryMenuContent = ({
   selectedItems: LibraryItem["id"][];
   onSelectItems: (id: LibraryItem["id"][]) => void;
 }) => {
+  const referrer =
+    libraryReturnUrl || window.location.origin + window.location.pathname;
+
   const [libraryItemsData] = useAtom(libraryItemsAtom, jotaiScope);
 
   const addToLibrary = useCallback(
@@ -129,18 +131,13 @@ export const LibraryMenuContent = ({
     return (
       <LibraryMenuWrapper>
         <div className="layer-ui__library-message">
-          <div>
           <Spinner size="2em" />
           <span>{t("labels.libraryLoadingMessage")}</span>
         </div>
-        </div>
       </LibraryMenuWrapper>
     );
   }
 
-  const showBtn =
-    libraryItemsData.libraryItems.length > 0 || pendingElements.length > 0;
-
   return (
     <LibraryMenuWrapper>
       <LibraryMenuItems
@@ -153,17 +150,18 @@ export const LibraryMenuContent = ({
         pendingElements={pendingElements}
         selectedItems={selectedItems}
         onSelectItems={onSelectItems}
-        id={id}
-        libraryReturnUrl={libraryReturnUrl}
-        theme={appState.theme}
       />
-      {showBtn && (
+      <a
-        <LibraryMenuBrowseButton
+        className="library-menu-browse-button"
-          id={id}
+        href={`${process.env.REACT_APP_LIBRARY_URL}?target=${
-          libraryReturnUrl={libraryReturnUrl}
+          window.name || "_blank"
-          theme={appState.theme}
+        }&referrer=${referrer}&useHash=true&token=${id}&theme=${
-        />
+          appState.theme
-      )}
+        }&version=${VERSIONS.excalidrawLibrary}`}
+        target="_excalidraw_libraries"
+      >
+        {t("labels.libraries")}
+      </a>
     </LibraryMenuWrapper>
   );
 };
@@ -267,7 +265,6 @@ export const LibraryMenu: React.FC<{
       // is colled correctly
       key="library"
       className="layer-ui__library-sidebar"
-      initialDockedState={appState.isSidebarDocked}
       onDock={(docked) => {
         trackEvent(
           "library",

src/components/LibraryMenuBrowseButton.tsx

@@ -1,31 +0,0 @@
-import { VERSIONS } from "../constants";
-import { t } from "../i18n";
-import { AppState, ExcalidrawProps } from "../types";
-
-const LibraryMenuBrowseButton = ({
-  theme,
-  id,
-  libraryReturnUrl,
-}: {
-  libraryReturnUrl: ExcalidrawProps["libraryReturnUrl"];
-  theme: AppState["theme"];
-  id: string;
-}) => {
-  const referrer =
-    libraryReturnUrl || window.location.origin + window.location.pathname;
-  return (
-    <a
-      className="library-menu-browse-button"
-      href={`${process.env.REACT_APP_LIBRARY_URL}?target=${
-        window.name || "_blank"
-      }&referrer=${referrer}&useHash=true&token=${id}&theme=${theme}&version=${
-        VERSIONS.excalidrawLibrary
-      }`}
-      target="_excalidraw_libraries"
-    >
-      {t("labels.libraries")}
-    </a>
-  );
-};
-
-export default LibraryMenuBrowseButton;

src/components/LibraryMenuHeaderContent.tsx

@@ -3,14 +3,9 @@ import { saveLibraryAsJSON } from "../data/json";
 import Library, { libraryItemsAtom } from "../data/library";
 import { t } from "../i18n";
 import { AppState, LibraryItem, LibraryItems } from "../types";
-import {
+import { exportToFileIcon, load, publishIcon, trash } from "./icons";
-  DotsIcon,
-  ExportIcon,
-  LoadIcon,
-  publishIcon,
-  TrashIcon,
-} from "./icons";
 import { ToolButton } from "./ToolButton";
+import { Tooltip } from "./Tooltip";
 import { fileOpen } from "../data/filesystem";
 import { muteFSAbortError } from "../utils";
 import { useAtom } from "jotai";
@@ -18,9 +13,6 @@ import { jotaiScope } from "../jotai";
 import ConfirmDialog from "./ConfirmDialog";
 import PublishLibrary from "./PublishLibrary";
 import { Dialog } from "./Dialog";
-import { useOutsideClickHook } from "../hooks/useOutsideClick";
-import MenuItem from "./MenuItem";
-import { isDropdownOpenAtom } from "./App";
 
 const getSelectedItems = (
   libraryItems: LibraryItems,
@@ -173,37 +165,8 @@ export const LibraryMenuHeader: React.FC<{
       });
   };
 
-  const [isDropdownOpen, setIsDropdownOpen] = useAtom(isDropdownOpenAtom);
-  const dropdownRef = useOutsideClickHook(() => setIsDropdownOpen(false));
-
   return (
-    <div style={{ position: "relative" }}>
+    <div className="library-actions">
-      <button
-        type="button"
-        className="Sidebar__dropdown-btn"
-        data-prevent-outside-click
-        onClick={() => setIsDropdownOpen(!isDropdownOpen)}
-      >
-        {DotsIcon}
-      </button>
-
-      {selectedItems.length > 0 && (
-        <div className="library-actions-counter">{selectedItems.length}</div>
-      )}
-
-      {isDropdownOpen && (
-        <div
-          className="Sidebar__dropdown-content menu-container"
-          ref={dropdownRef}
-        >
-          {!itemsSelected && (
-            <MenuItem
-              label={t("buttons.load")}
-              icon={LoadIcon}
-              dataTestId="lib-dropdown--load"
-              onClick={onLibraryImport}
-            />
-          )}
       {showRemoveLibAlert && renderRemoveLibAlert()}
       {showPublishLibraryDialog && (
         <PublishLibrary
@@ -226,31 +189,69 @@ export const LibraryMenuHeader: React.FC<{
         />
       )}
       {publishLibSuccess && renderPublishSuccess()}
+      {!itemsSelected && (
+        <ToolButton
+          key="import"
+          type="button"
+          title={t("buttons.load")}
+          aria-label={t("buttons.load")}
+          icon={load}
+          onClick={onLibraryImport}
+          className="library-actions--load"
+        />
+      )}
       {!!items.length && (
         <>
-              <MenuItem
+          <ToolButton
-                label={t("buttons.export")}
+            key="export"
-                icon={ExportIcon}
+            type="button"
+            title={t("buttons.export")}
+            aria-label={t("buttons.export")}
+            icon={exportToFileIcon}
             onClick={onLibraryExport}
-                dataTestId="lib-dropdown--export"
+            className="library-actions--export"
-              />
+          >
-              <MenuItem
+            {selectedItems.length > 0 && (
-                label={resetLabel}
+              <span className="library-actions-counter">
-                icon={TrashIcon}
+                {selectedItems.length}
+              </span>
+            )}
+          </ToolButton>
+          <ToolButton
+            key="reset"
+            type="button"
+            title={resetLabel}
+            aria-label={resetLabel}
+            icon={trash}
             onClick={() => setShowRemoveLibAlert(true)}
-                dataTestId="lib-dropdown--remove"
+            className="library-actions--remove"
-              />
+          >
+            {selectedItems.length > 0 && (
+              <span className="library-actions-counter">
+                {selectedItems.length}
+              </span>
+            )}
+          </ToolButton>
         </>
       )}
       {itemsSelected && (
-            <MenuItem
+        <Tooltip label={t("hints.publishLibrary")}>
+          <ToolButton
+            type="button"
+            aria-label={t("buttons.publishLibrary")}
             label={t("buttons.publishLibrary")}
             icon={publishIcon}
-              dataTestId="lib-dropdown--publish"
+            className="library-actions--publish"
             onClick={() => setShowPublishLibraryDialog(true)}
-            />
+          >
+            <label>{t("buttons.publishLibrary")}</label>
+            {selectedItems.length > 0 && (
+              <span className="library-actions-counter">
+                {selectedItems.length}
+              </span>
             )}
-        </div>
+          </ToolButton>
+        </Tooltip>
       )}
     </div>
   );

src/components/LibraryMenuItems.scss

@@ -1,70 +1,18 @@
 @import "open-color/open-color";
 
 .excalidraw {
-  --container-padding-y: 1.5rem;
-  --container-padding-x: 0.75rem;
-
-  .library-menu-items__no-items {
-    text-align: center;
-    color: var(--color-gray-70);
-    line-height: 1.5;
-    font-size: 0.875rem;
-    width: 100%;
-
-    &__label {
-      color: var(--color-primary);
-      font-weight: bold;
-      font-size: 1.125rem;
-      margin-bottom: 0.75rem;
-    }
-  }
-
-  &.theme--dark {
-    .library-menu-items__no-items {
-      color: var(--color-gray-40);
-    }
-  }
-
   .library-menu-items-container {
     display: flex;
-    flex-grow: 1;
-    flex-shrink: 1;
-    flex-basis: 0;
-    overflow-y: auto;
     flex-direction: column;
     height: 100%;
-    justify-content: center;
-    margin: 0;
-    border-bottom: 1px solid var(--sidebar-border-color);
-
-    position: relative;
-
-    &__row {
-      display: grid;
-      grid-template-columns: repeat(4, 1fr);
-      gap: 1rem;
-    }
 
     &__items {
-      row-gap: 0.5rem;
-      padding: var(--container-padding-y) var(--container-padding-x);
       flex: 1;
       overflow-y: auto;
       overflow-x: hidden;
       margin-bottom: 1rem;
     }
 
-    &__header {
-      color: var(--color-primary);
-      font-size: 1.125rem;
-      font-weight: bold;
-      margin-bottom: 0.75rem;
-
-      &--excal {
-        margin-top: 2.5rem;
-      }
-    }
-
     .separator {
       width: 100%;
       display: flex;

src/components/LibraryMenuItems.tsx

@@ -2,7 +2,7 @@ import React, { useState } from "react";
 import { serializeLibraryAsJSON } from "../data/json";
 import { ExcalidrawElement, NonDeleted } from "../element/types";
 import { t } from "../i18n";
-import { AppState, ExcalidrawProps, LibraryItem, LibraryItems } from "../types";
+import { LibraryItem, LibraryItems } from "../types";
 import { arrayToMap, chunk } from "../utils";
 import { LibraryUnit } from "./LibraryUnit";
 import Stack from "./Stack";
@@ -10,8 +10,6 @@ import Stack from "./Stack";
 import "./LibraryMenuItems.scss";
 import { MIME_TYPES } from "../constants";
 import Spinner from "./Spinner";
-import LibraryMenuBrowseButton from "./LibraryMenuBrowseButton";
-import clsx from "clsx";
 
 const CELLS_PER_ROW = 4;
 
@@ -23,9 +21,6 @@ const LibraryMenuItems = ({
   pendingElements,
   selectedItems,
   onSelectItems,
-  theme,
-  id,
-  libraryReturnUrl,
 }: {
   isLoading: boolean;
   libraryItems: LibraryItems;
@@ -34,9 +29,6 @@ const LibraryMenuItems = ({
   onAddToLibrary: (elements: LibraryItem["elements"]) => void;
   selectedItems: LibraryItem["id"][];
   onSelectItems: (id: LibraryItem["id"][]) => void;
-  libraryReturnUrl: ExcalidrawProps["libraryReturnUrl"];
-  theme: AppState["theme"];
-  id: string;
 }) => {
   const [lastSelectedItem, setLastSelectedItem] = useState<
     LibraryItem["id"] | null
@@ -175,11 +167,7 @@ const LibraryMenuItems = ({
         );
       }
       return (
-        <Stack.Row
+        <Stack.Row align="center" gap={1} key={index}>
-          align="center"
-          key={index}
-          className="library-menu-items-container__row"
-        >
           {rowItems}
         </Stack.Row>
       );
@@ -193,21 +181,19 @@ const LibraryMenuItems = ({
     (item) => item.status === "published",
   );
 
-  const showBtn =
-    !libraryItems.length &&
-    !unpublishedItems.length &&
-    !publishedItems.length &&
-    !pendingElements.length;
-
   return (
     <div
       className="library-menu-items-container"
       style={
-        pendingElements.length ||
+        publishedItems.length || unpublishedItems.length
-        unpublishedItems.length ||
+          ? {
-        publishedItems.length
+              flex: "1 1 0",
-          ? { justifyContent: "flex-start" }
+              overflowY: "auto",
-          : {}
+            }
+          : {
+              marginBottom: "2rem",
+              flex: 0,
+            }
       }
     >
       <Stack.Col
@@ -220,37 +206,49 @@ const LibraryMenuItems = ({
         }}
       >
         <>
-          <div>
+          <div className="separator">
             {(pendingElements.length > 0 ||
               unpublishedItems.length > 0 ||
               publishedItems.length > 0) && (
-              <div className="library-menu-items-container__header">
+              <div>{t("labels.personalLib")}</div>
-                {t("labels.personalLib")}
-              </div>
             )}
             {isLoading && (
               <div
                 style={{
-                  position: "absolute",
+                  marginLeft: "auto",
-                  top: "var(--container-padding-y)",
+                  marginRight: "1rem",
-                  right: "var(--container-padding-x)",
+                  display: "flex",
-                  transform: "translateY(50%)",
+                  alignItems: "center",
+                  fontWeight: "normal",
                 }}
               >
+                <div style={{ transform: "translateY(2px)" }}>
                   <Spinner />
                 </div>
+              </div>
             )}
           </div>
           {!pendingElements.length && !unpublishedItems.length ? (
-            <div className="library-menu-items__no-items">
             <div
-                className={clsx({
+              style={{
-                  "library-menu-items__no-items__label": showBtn,
+                height: 65,
-                })}
+                display: "flex",
+                flexDirection: "column",
+                alignItems: "center",
+                justifyContent: "center",
+                width: "100%",
+                fontSize: ".9rem",
+              }}
             >
               {t("library.noItems")}
-              </div>
+              <div
-              <div className="library-menu-items__no-items__hint">
+                style={{
+                  margin: ".6rem 0",
+                  fontSize: ".8em",
+                  width: "70%",
+                  textAlign: "center",
+                }}
+              >
                 {publishedItems.length > 0
                   ? t("library.hint_emptyPrivateLibrary")
                   : t("library.hint_emptyLibrary")}
@@ -271,9 +269,7 @@ const LibraryMenuItems = ({
           {(publishedItems.length > 0 ||
             pendingElements.length > 0 ||
             unpublishedItems.length > 0) && (
-            <div className="library-menu-items-container__header library-menu-items-container__header--excal">
+            <div className="separator">{t("labels.excalidrawLib")}</div>
-              {t("labels.excalidrawLib")}
-            </div>
           )}
           {publishedItems.length > 0 ? (
             renderLibrarySection(publishedItems)
@@ -293,14 +289,6 @@ const LibraryMenuItems = ({
             </div>
           ) : null}
         </>
-
-        {showBtn && (
-          <LibraryMenuBrowseButton
-            id={id}
-            libraryReturnUrl={libraryReturnUrl}
-            theme={theme}
-          />
-        )}
       </Stack.Col>
     </div>
   );

src/components/LibraryUnit.scss

@@ -7,18 +7,17 @@
     display: flex;
     justify-content: center;
     position: relative;
-    width: 55px;
+    width: 63px;
-    height: 55px;
+    height: 63px; // match width
-    box-sizing: border-box;
-    border-radius: var(--border-radius-lg);
 
     &--hover {
-      border-color: var(--color-primary);
+      box-shadow: inset 0px 0px 0px 2px $oc-blue-5;
+      border-color: $oc-blue-5;
     }
 
     &--selected {
-      border-color: var(--color-primary);
+      box-shadow: inset 0px 0px 0px 2px $oc-blue-8;
-      border-width: 1px;
+      border-color: $oc-blue-8;
     }
   }
 
@@ -60,34 +59,20 @@
 
   .library-unit__checkbox {
     position: absolute;
-    top: 0.125rem;
+    left: 2.3rem;
-    right: 0.125rem;
+    bottom: 2.3rem;
-    margin: 0;
 
     .Checkbox-box {
-      margin: 0;
+      width: 13px;
-      width: 1rem;
+      height: 13px;
-      height: 1rem;
+      border-radius: 2px;
-      border-radius: 4px;
+      margin: 0.5em 0.5em 0.2em 0.2em;
-      background-color: var(--color-primary-light);
+      background-color: $oc-blue-1;
-      border: 1px solid var(--color-primary);
-      box-shadow: none !important;
-      padding: 2px;
     }
 
     &.Checkbox:hover {
       .Checkbox-box {
-        background-color: var(--color-primary-light);
+        background-color: $oc-blue-2;
-      }
-    }
-
-    &.is-checked {
-      .Checkbox-box {
-        background-color: var(--color-primary) !important;
-
-        svg {
-          color: var(--color-primary-light);
-        }
       }
     }
   }
@@ -100,29 +85,25 @@
   .library-unit__adder {
     transform: scale(1);
     animation: library-unit__adder-animation 1s ease-in infinite;
+  }
 
+  .library-unit__adder {
     position: absolute;
-    width: 1.5rem;
+    left: 40%;
-    height: 1.5rem;
+    top: 40%;
-    background-color: var(--color-primary);
+    width: 2rem;
-    border-radius: var(--border-radius-md);
+    height: 2rem;
-
+    margin-left: -10px;
-    display: flex;
+    margin-top: -10px;
-    justify-content: center;
-    align-items: center;
-
     pointer-events: none;
-
-    svg {
-      color: var(--color-primary-light);
-      width: 1rem;
-      height: 1rem;
   }
+  .library-unit:hover .library-unit__adder {
+    fill: $oc-blue-7;
   }
-
   .library-unit:active .library-unit__adder {
     animation: none;
     transform: scale(0.8);
+    fill: $oc-black;
   }
 
   .library-unit__active {

src/components/LibraryUnit.tsx

@@ -6,7 +6,19 @@ import { exportToSvg } from "../scene/export";
 import { LibraryItem } from "../types";
 import "./LibraryUnit.scss";
 import { CheckboxItem } from "./CheckboxItem";
-import { PlusIcon } from "./icons";
+
+const PLUS_ICON = (
+  <svg viewBox="0 0 1792 1792">
+    <path
+      d="M1600 736v192c0 26.667-9.33 49.333-28 68-18.67 18.67-41.33 28-68 28h-416v416c0 26.67-9.33 49.33-28 68s-41.33 28-68 28H800c-26.667 0-49.333-9.33-68-28s-28-41.33-28-68v-416H288c-26.667 0-49.333-9.33-68-28-18.667-18.667-28-41.333-28-68V736c0-26.667 9.333-49.333 28-68s41.333-28 68-28h416V224c0-26.667 9.333-49.333 28-68s41.333-28 68-28h192c26.67 0 49.33 9.333 68 28s28 41.333 28 68v416h416c26.67 0 49.33 9.333 68 28s28 41.333 28 68Z"
+      style={{
+        stroke: "#fff",
+        strokeWidth: 140,
+      }}
+      transform="translate(0 64)"
+    />
+  </svg>
+);
 
 export const LibraryUnit = ({
   id,
@@ -44,7 +56,6 @@ export const LibraryUnit = ({
         },
         null,
       );
-      svg.querySelector(".style-fonts")?.remove();
       node.innerHTML = svg.outerHTML;
     })();
 
@@ -56,7 +67,7 @@ export const LibraryUnit = ({
   const [isHovered, setIsHovered] = useState(false);
   const isMobile = useDevice().isMobile;
   const adder = isPending && (
-    <div className="library-unit__adder">{PlusIcon}</div>
+    <div className="library-unit__adder">{PLUS_ICON}</div>
   );
 
   return (

src/components/LockButton.tsx

@@ -1,8 +1,8 @@
 import "./ToolIcon.scss";
 
+import React from "react";
 import clsx from "clsx";
 import { ToolButtonSize } from "./ToolButton";
-import { LockedIcon, UnlockedIcon } from "./icons";
 
 type LockIconProps = {
   title?: string;
@@ -16,15 +16,34 @@ type LockIconProps = {
 const DEFAULT_SIZE: ToolButtonSize = "medium";
 
 const ICONS = {
-  CHECKED: LockedIcon,
+  CHECKED: (
-  UNCHECKED: UnlockedIcon,
+    <svg
+      width="1792"
+      height="1792"
+      viewBox="0 0 1792 1792"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path d="M640 768h512v-192q0-106-75-181t-181-75-181 75-75 181v192zm832 96v576q0 40-28 68t-68 28h-960q-40 0-68-28t-28-68v-576q0-40 28-68t68-28h32v-192q0-184 132-316t316-132 316 132 132 316v192h32q40 0 68 28t28 68z" />
+    </svg>
+  ),
+  UNCHECKED: (
+    <svg
+      width="1792"
+      height="1792"
+      viewBox="0 0 1792 1792"
+      xmlns="http://www.w3.org/2000/svg"
+      className="unlocked-icon rtl-mirror"
+    >
+      <path d="M1728 576v256q0 26-19 45t-45 19h-64q-26 0-45-19t-19-45v-256q0-106-75-181t-181-75-181 75-75 181v192h96q40 0 68 28t28 68v576q0 40-28 68t-68 28h-960q-40 0-68-28t-28-68v-576q0-40 28-68t68-28h672v-192q0-185 131.5-316.5t316.5-131.5 316.5 131.5 131.5 316.5z" />
+    </svg>
+  ),
 };
 
 export const LockButton = (props: LockIconProps) => {
   return (
     <label
       className={clsx(
-        "ToolIcon ToolIcon__lock",
+        "ToolIcon ToolIcon__lock ToolIcon_type_floating",
         `ToolIcon_size_${DEFAULT_SIZE}`,
         {
           "is-mobile": props.isMobile,
@@ -39,7 +58,6 @@ export const LockButton = (props: LockIconProps) => {
         onChange={props.onChange}
         checked={props.checked}
         aria-label={props.title}
-        data-testid="toolbar-lock"
       />
       <div className="ToolIcon__icon">
         {props.checked ? ICONS.CHECKED : ICONS.UNCHECKED}

src/components/Menu.scss

@@ -1,85 +0,0 @@
-@import "../css/variables.module";
-
-.excalidraw {
-  .menu-container {
-    background-color: #fff !important;
-    max-height: calc(100vh - 150px);
-    overflow-y: auto;
-  }
-
-  .menu-button {
-    @include outlineButtonStyles;
-    background-color: var(--island-bg-color);
-    width: var(--lg-button-size);
-    height: var(--lg-button-size);
-
-    svg {
-      width: var(--lg-icon-size);
-      height: var(--lg-icon-size);
-    }
-  }
-
-  .menu-item {
-    display: flex;
-    background-color: transparent;
-    border: 0;
-    align-items: center;
-    padding: 0 0.625rem;
-    height: 2rem;
-    column-gap: 0.625rem;
-    font-size: 0.875rem;
-    color: var(--color-gray-100);
-    cursor: pointer;
-    border-radius: var(--border-radius-md);
-    width: 100%;
-    box-sizing: border-box;
-    font-weight: normal;
-    font-family: inherit;
-
-    @media screen and (min-width: 1921px) {
-      height: 2.25rem;
-    }
-
-    &__text {
-      text-overflow: ellipsis;
-      overflow: hidden;
-      white-space: nowrap;
-    }
-
-    &__shortcut {
-      margin-inline-start: auto;
-      opacity: 0.5;
-    }
-
-    &:hover {
-      background-color: var(--button-hover);
-      text-decoration: none;
-    }
-
-    svg {
-      width: 1rem;
-      height: 1rem;
-      display: block;
-    }
-
-    &.active-collab {
-      background-color: #ecfdf5;
-      color: #064e3c;
-    }
-  }
-
-  &.theme--dark {
-    .menu-item {
-      color: var(--color-gray-40);
-
-      &.active-collab {
-        background-color: #064e3c;
-        color: #ecfdf5;
-      }
-    }
-
-    .menu-container {
-      background-color: var(--color-gray-90) !important;
-    }
-  }
-}

src/components/MenuItem.tsx

@@ -1,37 +0,0 @@
-import clsx from "clsx";
-import "./Menu.scss";
-
-interface MenuProps {
-  icon: JSX.Element;
-  onClick: () => void;
-  label: string;
-  dataTestId: string;
-  shortcut?: string;
-  isCollaborating?: boolean;
-}
-
-const MenuItem = ({
-  icon,
-  onClick,
-  label,
-  dataTestId,
-  shortcut,
-  isCollaborating,
-}: MenuProps) => {
-  return (
-    <button
-      className={clsx("menu-item", { "active-collab": isCollaborating })}
-      aria-label={label}
-      onClick={onClick}
-      data-testid={dataTestId}
-      title={label}
-      type="button"
-    >
-      <div className="menu-item__icon">{icon}</div>
-      <div className="menu-item__text">{label}</div>
-      {shortcut && <div className="menu-item__shortcut">{shortcut}</div>}
-    </button>
-  );
-};
-
-export default MenuItem;

src/components/MenuUtils.tsx

@@ -1,53 +0,0 @@
-import { GithubIcon, DiscordIcon, PlusPromoIcon, TwitterIcon } from "./icons";
-
-export const MenuLinks = () => (
-  <>
-    <a
-      href="https://plus.excalidraw.com/plus?utm_source=excalidraw&utm_medium=app&utm_content=hamburger"
-      target="_blank"
-      rel="noreferrer"
-      className="menu-item"
-      style={{ color: "var(--color-promo)" }}
-    >
-      <div className="menu-item__icon">{PlusPromoIcon}</div>
-      <div className="menu-item__text">Excalidraw+</div>
-    </a>
-    <a
-      className="menu-item"
-      href="https://github.com/excalidraw/excalidraw"
-      target="_blank"
-      rel="noopener noreferrer"
-    >
-      <div className="menu-item__icon">{GithubIcon}</div>
-      <div className="menu-item__text">GitHub</div>
-    </a>
-    <a
-      className="menu-item"
-      target="_blank"
-      href="https://discord.gg/UexuTaE"
-      rel="noopener noreferrer"
-    >
-      <div className="menu-item__icon">{DiscordIcon}</div>
-      <div className="menu-item__text">Discord</div>
-    </a>
-    <a
-      className="menu-item"
-      target="_blank"
-      href="https://twitter.com/excalidraw"
-      rel="noopener noreferrer"
-    >
-      <div className="menu-item__icon">{TwitterIcon}</div>
-      <div className="menu-item__text">Twitter</div>
-    </a>
-  </>
-);
-
-export const Separator = () => (
-  <div
-    style={{
-      height: "1px",
-      backgroundColor: "var(--default-border-color)",
-      margin: ".5rem 0",
-    }}
-  />
-);

src/components/MobileMenu.tsx

@@ -8,21 +8,18 @@ import { NonDeletedExcalidrawElement } from "../element/types";
 import { FixedSideContainer } from "./FixedSideContainer";
 import { Island } from "./Island";
 import { HintViewer } from "./HintViewer";
-import { calculateScrollCenter } from "../scene";
+import { calculateScrollCenter, getSelectedElements } from "../scene";
 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 { UserList } from "./UserList";
+import { BackgroundPickerAndDarkModeToggle } from "./BackgroundPickerAndDarkModeToggle";
 import { LibraryButton } from "./LibraryButton";
 import { PenModeButton } from "./PenModeButton";
 import { Stats } from "./Stats";
 import { actionToggleStats } from "../actions";
-import { MenuLinks, Separator } from "./MenuUtils";
-import WelcomeScreen from "./WelcomeScreen";
-import MenuItem from "./MenuItem";
-import { ExportImageIcon } from "./icons";
 
 type MobileMenuProps = {
   appState: AppState;
@@ -36,7 +33,10 @@ type MobileMenuProps = {
   onPenModeToggle: () => void;
   canvas: HTMLCanvasElement | null;
   isCollaborating: boolean;
-
+  renderCustomFooter?: (
+    isMobile: boolean,
+    appState: AppState,
+  ) => JSX.Element | null;
   onImageAction: (data: { insertOnCanvasDirectly: boolean }) => void;
   renderTopRightUI?: (
     isMobile: boolean,
@@ -45,7 +45,6 @@ type MobileMenuProps = {
   renderCustomStats?: ExcalidrawProps["renderCustomStats"];
   renderSidebars: () => JSX.Element | null;
   device: Device;
-  renderWelcomeScreen?: boolean;
 };
 
 export const MobileMenu = ({
@@ -60,40 +59,23 @@ export const MobileMenu = ({
   onPenModeToggle,
   canvas,
   isCollaborating,
+  renderCustomFooter,
   onImageAction,
   renderTopRightUI,
   renderCustomStats,
   renderSidebars,
   device,
-  renderWelcomeScreen,
 }: MobileMenuProps) => {
   const renderToolbar = () => {
     return (
       <FixedSideContainer side="top" className="App-top-bar">
-        {renderWelcomeScreen && !appState.isLoading && (
-          <WelcomeScreen appState={appState} actionManager={actionManager} />
-        )}
         <Section heading="shapes">
           {(heading: React.ReactNode) => (
             <Stack.Col gap={4} align="center">
               <Stack.Row gap={1} className="App-toolbar-container">
-                <Island padding={1} className="App-toolbar App-toolbar--mobile">
+                <Island padding={1} className="App-toolbar">
                   {heading}
                   <Stack.Row gap={1}>
-                    {/* <PenModeButton
-                      checked={appState.penMode}
-                      onChange={onPenModeToggle}
-                      title={t("toolBar.penMode")}
-                      isMobile
-                      penDetected={appState.penDetected}
-                    />
-                    <LockButton
-                      checked={appState.activeTool.locked}
-                      onChange={onLockToggle}
-                      title={t("toolBar.lock")}
-                      isMobile
-                    />
-                    <div className="App-toolbar__divider"></div> */}
                     <ShapesSwitcher
                       appState={appState}
                       canvas={canvas}
@@ -108,29 +90,24 @@ export const MobileMenu = ({
                   </Stack.Row>
                 </Island>
                 {renderTopRightUI && renderTopRightUI(true, appState)}
-                <div className="mobile-misc-tools-container">
-                  <PenModeButton
-                    checked={appState.penMode}
-                    onChange={onPenModeToggle}
-                    title={t("toolBar.penMode")}
-                    isMobile
-                    penDetected={appState.penDetected}
-                    // penDetected={true}
-                  />
                 <LockButton
                   checked={appState.activeTool.locked}
                   onChange={onLockToggle}
                   title={t("toolBar.lock")}
                   isMobile
                 />
-                  {!appState.viewModeEnabled && (
                 <LibraryButton
                   appState={appState}
                   setAppState={setAppState}
                   isMobile
                 />
-                  )}
+                <PenModeButton
-                </div>
+                  checked={appState.penMode}
+                  onChange={onPenModeToggle}
+                  title={t("toolBar.penMode")}
+                  isMobile
+                  penDetected={appState.penDetected}
+                />
               </Stack.Row>
             </Stack.Col>
           )}
@@ -146,6 +123,11 @@ export const MobileMenu = ({
   };
 
   const renderAppToolbar = () => {
+    // Render eraser conditionally in mobile
+    const showEraser =
+      !appState.editingElement &&
+      getSelectedElements(elements, appState).length === 0;
+
     if (appState.viewModeEnabled) {
       return (
         <div className="App-toolbar-content">
@@ -158,9 +140,12 @@ export const MobileMenu = ({
       <div className="App-toolbar-content">
         {actionManager.renderAction("toggleCanvasMenu")}
         {actionManager.renderAction("toggleEditMenu")}
+
         {actionManager.renderAction("undo")}
         {actionManager.renderAction("redo")}
-        {actionManager.renderAction(
+        {showEraser
+          ? actionManager.renderAction("eraser")
+          : actionManager.renderAction(
               appState.multiElement ? "finalize" : "duplicateSelection",
             )}
         {actionManager.renderAction("deleteSelectedElements")}
@@ -173,27 +158,16 @@ export const MobileMenu = ({
       return (
         <>
           {renderJSONExportDialog()}
-          <MenuItem
-            label={t("buttons.exportImage")}
-            icon={ExportImageIcon}
-            dataTestId="image-export-button"
-            onClick={() => setAppState({ openDialog: "imageExport" })}
-          />
           {renderImageExportDialog()}
         </>
       );
     }
     return (
       <>
-        {!appState.viewModeEnabled && actionManager.renderAction("loadScene")}
+        {actionManager.renderAction("clearCanvas")}
+        {actionManager.renderAction("loadScene")}
         {renderJSONExportDialog()}
         {renderImageExportDialog()}
-        <MenuItem
-          label={t("buttons.exportImage")}
-          icon={ExportImageIcon}
-          dataTestId="image-export-button"
-          onClick={() => setAppState({ openDialog: "imageExport" })}
-        />
         {onCollabButtonClick && (
           <CollabButton
             isCollaborating={isCollaborating}
@@ -201,22 +175,7 @@ export const MobileMenu = ({
             onClick={onCollabButtonClick}
           />
         )}
-        {actionManager.renderAction("toggleShortcuts", undefined, true)}
+        {<BackgroundPickerAndDarkModeToggle actionManager={actionManager} />}
-        {!appState.viewModeEnabled && actionManager.renderAction("clearCanvas")}
-        <Separator />
-        <MenuLinks />
-        <Separator />
-        {!appState.viewModeEnabled && (
-          <div style={{ marginBottom: ".5rem" }}>
-            <div style={{ fontSize: ".75rem", marginBottom: ".5rem" }}>
-              {t("labels.canvasBackground")}
-            </div>
-            <div style={{ padding: "0 0.625rem" }}>
-              {actionManager.renderAction("changeViewBackgroundColor")}
-            </div>
-          </div>
-        )}
-        {actionManager.renderAction("toggleTheme")}
       </>
     );
   };
@@ -247,8 +206,9 @@ export const MobileMenu = ({
           {appState.openMenu === "canvas" ? (
             <Section className="App-mobile-menu" heading="canvasActions">
               <div className="panelColumn">
-                <Stack.Col gap={2}>
+                <Stack.Col gap={4}>
                   {renderCanvasActions()}
+                  {renderCustomFooter?.(true, appState)}
                   {appState.collaborators.size > 0 && (
                     <fieldset>
                       <legend>{t("labels.collaborators")}</legend>