purify getDefaultAppState by removing name

.env.production

@@ -1 +1 @@
-REACT_APP_GOOGLE_ANALYTICS_ID=UA-387204-13
+REACT_APP_INCLUDE_GTAG=true

.github/workflows/build-docker.yml

@@ -6,7 +6,7 @@ on:
       - master
 
 jobs:
-  build:
+  build-docker:
     runs-on: ubuntu-latest
 
     steps:

.github/workflows/build-packages.yml

@@ -13,10 +13,10 @@ jobs:
     steps:
       - uses: actions/checkout@v1
 
-      - name: Setup Node.js 14.x
+      - name: Setup Node.js 12.x
         uses: actions/setup-node@v1
         with:
-          node-version: 14.x
+          node-version: 12.x
 
       - name: Install dependencies
         run: |

.github/workflows/cancel.yml

@@ -1,14 +0,0 @@
-name: Cancel previous runs
-
-on: push
-
-jobs:
-  cancel:
-    runs-on: ubuntu-latest
-
-    timeout-minutes: 3
-    steps:
-      - uses: styfle/cancel-workflow-action@0.6.0
-        with:
-          workflow_id: 400555, 400556, 905313, 1451724, 1710116, 3185001, 3438604
-          access_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/lint.yml

@@ -1,6 +1,10 @@
 name: Lint
 
-on: push
+on:
+  push:
+    branches:
+      - master
+  pull_request:
 
 jobs:
   lint:
@@ -9,10 +13,10 @@ jobs:
     steps:
       - uses: actions/checkout@v1
 
-      - name: Setup Node.js 14.x
+      - name: Setup Node.js 12.x
         uses: actions/setup-node@v1
         with:
-          node-version: 14.x
+          node-version: 12.x
 
       - name: Install and lint
         run: |
@@ -20,3 +24,5 @@ jobs:
           npm run test:other
           npm run test:code
           npm run test:typecheck
+        env:
+          CI: true

.github/workflows/locales-coverage.yml

@@ -14,18 +14,18 @@ jobs:
         with:
           token: ${{ secrets.PUSH_TRANSLATIONS_COVERAGE_PAT }}
 
-      - name: Setup Node.js 14.x
+      - name: Setup Node.js 12.x
         uses: actions/setup-node@v1
         with:
-          node-version: 14.x
+          node-version: 12.x
 
       - name: Create report file
         run: |
           npm run locales-coverage
           FILE_CHANGED=$(git diff src/locales/percentages.json)
           if [ ! -z "${FILE_CHANGED}" ]; then
-            git config --global user.name 'Excalidraw Bot'
-            git config --global user.email 'bot@excalidraw.com'
+            git config --global user.name 'Kostas Bariotis'
+            git config --global user.email 'konmpar@gmail.com'
             git add src/locales/percentages.json
             git commit -am "Auto commit: Calculate translation coverage"
             git push
@@ -43,5 +43,5 @@ jobs:
         uses: kt3k/update-pr-description@v1.0.1
         with:
           pr_body: ${{ steps.getCommentBody.outputs.body }}
-          pr_title: "chore: Update translations from Crowdin"
+          pr_title: "chore: New Crowdin updates"
           github_token: ${{ secrets.PUSH_TRANSLATIONS_COVERAGE_PAT }}

.github/workflows/semantic-pr-title.yml

@@ -10,8 +10,7 @@ on:
 jobs:
   main:
     runs-on: ubuntu-latest
-
     steps:
-      - uses: amannn/action-semantic-pull-request@v3.0.0
+      - uses: amannn/action-semantic-pull-request@v2.1.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/sentry-production.yml

@@ -8,14 +8,13 @@ on:
 jobs:
   release:
     runs-on: ubuntu-latest
-
     steps:
       - uses: actions/checkout@v1.0.0
 
-      - name: Setup Node.js 14.x
+      - name: Setup Node.js 12.x
         uses: actions/setup-node@v1
         with:
-          node-version: 14.x
+          node-version: 12.x
 
       - name: Install and build
         run: |

.github/workflows/test.yml

@@ -1,6 +1,10 @@
 name: Tests
 
-on: push
+on:
+  push:
+    branches:
+      - master
+  pull_request:
 
 jobs:
   test:
@@ -9,12 +13,14 @@ jobs:
     steps:
       - uses: actions/checkout@v1
 
-      - name: Setup Node.js 14.x
+      - name: Setup Node.js 12.x
         uses: actions/setup-node@v1
         with:
-          node-version: 14.x
+          node-version: 12.x
 
       - name: Install and test
         run: |
           npm ci
           npm run test:app
+        env:
+          CI: true

.prettierrc

@@ -1,4 +1,3 @@
 {
-  "proseWrap": "never",
   "trailingComma": "all"
 }

CONTRIBUTING.md

@@ -8,7 +8,8 @@
 1. Run `npm install` to install dependencies
 1. Create a branch for your PR with `git checkout -b your-branch-name`
 
-> To keep `master` branch pointing to remote repository and make pull requests from branches on your fork. To do this, run:
+> To keep `master` branch pointing to remote repository and make
+> pull requests from branches on your fork. To do this, run:
 >
 > ```sh
 > git remote add upstream https://github.com/excalidraw/excalidraw.git
@@ -24,41 +25,3 @@
 1. Tap on `Fork Sandbox`
 1. Write your code
 1. Commit and PR automatically
-
-## Pull Request Guidelines
-
-Don't worry if you get any of the below wrong, or if you don't know how. We'll gladly help out.
-
-### Title
-
-Make sure the title starts with a semantic prefix:
-
-- **feat**: A new feature
-- **fix**: A bug fix
-- **improvement**: An improvement to a current feature
-- **docs**: Documentation only changes
-- **style**: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)
-- **refactor**: A code change that neither fixes a bug nor adds a feature
-- **perf**: A code change that improves performance
-- **test**: Adding missing tests or correcting existing tests
-- **build**: Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm)
-- **ci**: Changes to our CI configuration files and scripts (example scopes: Travis, Circle, BrowserStack, SauceLabs)
-- **chore**: Other changes that don't modify src or test files
-- **revert**: Reverts a previous commit
-
-### Changelog
-
-Add a brief description of your pull request to the changelog located here: [`src/packages/excalidraw/CHANGELOG.md`](src/packages/excalidraw/CHANGELOG.md)
-
-Notes:
-
-- Make sure to prepend to the section corresponding with the semantic prefix you selected in the title
-- Link to your pull request - this will require updating the CHANGELOG _after_ creating the pull request
-
-### Testing
-
-Once you submit your pull request it will automatically be tested. Be sure to check the results of the test and fix any issues that arise.
-
-It's also a good idea to consider if your change should include additional tests. This is highly recommended for new features or bug-fixes. For example, it's good practice to create a test for each bug you fix which ensures that we don't regress the code in the future.
-
-Finally - always manually test your changes using the convenient staging environment deployed for each pull request. As much as local development attempts to replicate production, there can still be subtle differences in behavior. For larger features consider testing your change in multiple browsers as well.

Dockerfile

@@ -5,6 +5,7 @@ WORKDIR /opt/node_app
 COPY package.json package-lock.json ./
 RUN npm i --no-optional
 
+ARG REACT_APP_INCLUDE_GTAG=false
 ARG NODE_ENV=production
 
 COPY . .

README.md

@@ -1,8 +1,8 @@
 <div align="center" style="display:flex;flex-direction:column;">
   <a href="https://excalidraw.com">
-    <img width="540" src="./public/og-image-sm.png" alt="Excalidraw logo: Sketch handrawn like diagrams." />
+    <img src="./public/og-image.png" alt="Excalidraw logo: Sketch handrawn like diagrams." />
   </a>
-  <h3>Virtual whiteboard for sketching hand-drawn like diagrams.<br>Collaborative and end to end encrypted.</h3>
+  <h3>Virtual whiteboard for sketching hand-drawn like diagrams.</h3>
   <p>
     <a href="https://twitter.com/Excalidraw">
       <img alt="Follow Excalidraw on Twitter" src="https://img.shields.io/twitter/follow/excalidraw.svg?label=follow+excalidraw&style=social&logo=twitter">
@@ -10,6 +10,9 @@
     <a target="_blank" href="https://crowdin.com/project/excalidraw">
       <img src="https://badges.crowdin.net/excalidraw/localized.svg">
     </a>
+    <a target="_blank" href="https://hub.docker.com/r/excalidraw/excalidraw">
+      <img src="https://img.shields.io/docker/pulls/excalidraw/excalidraw">
+    </a>
   </p>
 </div>
 
@@ -17,51 +20,13 @@
 
 Go to [excalidraw.com](https://excalidraw.com) to start sketching.
 
-Read the latest news and updates on our [blog](https://blog.excalidraw.com). A good start is to see all the updates of [One Year of Excalidraw](https://blog.excalidraw.com/one-year-of-excalidraw/).
-
-## Documentation
-
-### Shortcuts
-
-You can almost do anything with shortcuts. Click on the help icon on the bottom right corner to see them all.
-
-### Curved lines and arrows
-
-Choose line or arrow and click click click instead of drag.
-
-### Charts
-
-You can easily create charts by copy pasting data from Excel or just plain comma separated text.
-
-### Translating
-
-To translate Excalidraw into other languages, please visit [our Crowdin page](https://crowdin.com/project/excalidraw). To add a new language, [open an issue](https://github.com/excalidraw/excalidraw/issues/new) so we can get things set up on our end first.
-
-Translations will be available on the app if they exceed a certain threshold of completion (currently 85%).
-
-### Create a collaboration session manually
-
-In order to create a session manually you just need to generate a link of this form:
-
-```
-https://excalidraw.com/#room=[0-9a-f]{20},[a-zA-Z0-9_-]{22}
-```
-
-#### Example
-
-```
-https://excalidraw.com/#room=91bd46ae3aa84dff9d20,pfLqgEoY1c2ioq8LmGwsFA
-```
-
-The first set of digits is the room. This is visible from the server that’s going to dispatch messages to everyone that knows this number.
-
-The second set of digits is the encryption key. The Excalidraw server doesn’t know about it. This is what all the participants use to encrypt/decrypt the messages.
+Read our [blog](https://blog.excalidraw.com) and follow the [guides](https://howto.excalidraw.com) to learn more about Excalidraw and how to use it effectively.
 
 ## Shape libraries
 
 Find a growing list of libraries containing assets for your drawings at [libraries.excalidraw.com](https://libraries.excalidraw.com).
 
-## Developement
+## Run the code
 
 ### Code Sandbox
 
@@ -98,7 +63,7 @@ You can use docker-compose to work on excalidraw locally if you don't want to se
 docker-compose up --build -d
 ```
 
-### Self hosting
+## Self hosting
 
 We publish a Docker image with the Excalidraw client at [excalidraw/excalidraw](https://hub.docker.com/r/excalidraw/excalidraw). You can use it to self host your own client under your own domain, on Kubernetes, AWS ECS, etc.
 
@@ -117,11 +82,57 @@ We are working towards providing a full-fledged solution for self hosting your o
 
 Pull requests are welcome. For major changes, please [open an issue](https://github.com/excalidraw/excalidraw/issues/new) first to discuss what you would like to change.
 
-## Notable used tools
+## Translating
 
-- [Create React App](https://github.com/facebook/create-react-app)
+To translate Excalidraw into other languages, please visit [our Crowdin page](https://crowdin.com/project/excalidraw). To add a new language, [open an issue](https://github.com/excalidraw/excalidraw/issues/new) so we can get things set up on our end first.
+
+Translations will be available on the app if they exceed a certain threshold of completion (currently 85%).
+
+## Excalidraw is built using these awesome tools
+
+- [React](https://reactjs.org)
 - [Rough.js](https://roughjs.com)
 - [TypeScript](https://www.typescriptlang.org)
 - [Vercel](https://vercel.com)
 
 And the main source of inspiration for starting the project is the awesome [Zwibbler](https://zwibbler.com/demo/) app.
+
+## Testimonials
+
+<a href="https://twitter.com/Lissy_Sykes/status/1213813117177729026"><img width="398" src="https://user-images.githubusercontent.com/197597/71783813-dbf8a600-2fa0-11ea-9c0d-bb3cc45969e6.png"></a>
+<a href="https://twitter.com/dan_abramov/status/1213762494428262400"><img width="398" src="https://user-images.githubusercontent.com/197597/71783990-4d395880-2fa3-11ea-9ad7-186138db5003.png"></a>
+
+<a href="https://twitter.com/kyehohenberger/status/1214288572037025792"><img width="423" src="https://user-images.githubusercontent.com/197597/71851802-34f13880-308c-11ea-9416-191099e6349c.png"></a>
+<a href="https://twitter.com/lucasazzola/status/1215126440330416128"><img width="429" src="https://user-images.githubusercontent.com/197597/72039003-48e99580-3258-11ea-8daa-85dd055f2a82.png">
+
+<a href="https://twitter.com/jordwalke/status/1214858186789806080"><img width="434" src="https://user-images.githubusercontent.com/197597/72036874-07a1b780-3251-11ea-99e8-6bafd93483a0.png"></a>
+
+## Contributors
+
+### Code Contributors
+
+This project exists thanks to all the people who contribute. [[Contribute](CONTRIBUTING.md)].
+<a href="https://github.com/excalidraw/excalidraw/graphs/contributors"><img src="https://opencollective.com/excalidraw/contributors.svg?width=890&button=false" /></a>
+
+### Financial Contributors
+
+Become a financial contributor and help us sustain our community. [[Contribute](https://opencollective.com/excalidraw/contribute)]
+
+#### Individuals
+
+<a href="https://opencollective.com/excalidraw"><img src="https://opencollective.com/excalidraw/individuals.svg?width=890"></a>
+
+#### Organizations
+
+Support this project with your organization. Your logo will show up here with a link to your website. [[Contribute](https://opencollective.com/excalidraw/contribute)]
+
+<a href="https://opencollective.com/excalidraw/organization/0/website"><img src="https://opencollective.com/excalidraw/organization/0/avatar.svg"></a>
+<a href="https://opencollective.com/excalidraw/organization/1/website"><img src="https://opencollective.com/excalidraw/organization/1/avatar.svg"></a>
+<a href="https://opencollective.com/excalidraw/organization/2/website"><img src="https://opencollective.com/excalidraw/organization/2/avatar.svg"></a>
+<a href="https://opencollective.com/excalidraw/organization/3/website"><img src="https://opencollective.com/excalidraw/organization/3/avatar.svg"></a>
+<a href="https://opencollective.com/excalidraw/organization/4/website"><img src="https://opencollective.com/excalidraw/organization/4/avatar.svg"></a>
+<a href="https://opencollective.com/excalidraw/organization/5/website"><img src="https://opencollective.com/excalidraw/organization/5/avatar.svg"></a>
+<a href="https://opencollective.com/excalidraw/organization/6/website"><img src="https://opencollective.com/excalidraw/organization/6/avatar.svg"></a>
+<a href="https://opencollective.com/excalidraw/organization/7/website"><img src="https://opencollective.com/excalidraw/organization/7/avatar.svg"></a>
+<a href="https://opencollective.com/excalidraw/organization/8/website"><img src="https://opencollective.com/excalidraw/organization/8/avatar.svg"></a>
+<a href="https://opencollective.com/excalidraw/organization/9/website"><img src="https://opencollective.com/excalidraw/organization/9/avatar.svg"></a>

analytics.md

@@ -0,0 +1,64 @@
+| Excalidraw              | Category | Name                               | Label                           | Value     |
+| ----------------------- | -------- | ---------------------------------- | ------------------------------- | --------- |
+| Shape / Selection       | shape    | selection, rectangle, diamond, etc | `toolbar` or `shortcut`         |
+| Text on double click    | shape    | text                               | `double-click`                  |
+| Lock selection          | shape    | lock                               | `on` or `off`                   |
+| Clear canvas            | action   | clear canvas                       |
+| Zoom in                 | action   | zoom                               | in                              | `zoom`    |
+| Zoom out                | action   | zoom                               | out                             | `zoom`    |
+| Zoom fit                | action   | zoom                               | fit                             | `zoom`    |
+| Zoom reset              | action   | zoom                               | reset                           | `zoom`    |
+| Scroll back to content  | action   | scroll to content                  |
+| Load file               | io       | load                               | `MIME type`                     |
+| Import from URL         | io       | import                             |
+| Save                    | io       | save                               |
+| Save as                 | io       | save as                            |
+| Export to backend       | io       | export                             | backend                         |
+| Export as SVG           | io       | export                             | `svg` or `clipboard-svg`        |
+| Export to PNG           | io       | export                             | `png` or `clipboard-png`        |
+| Canvas color            | change   | canvas color                       | `color`                         |
+| Background color        | change   | background color                   | `color`                         |
+| Stroke color            | change   | stroke color                       | `color`                         |
+| Stroke width            | change   | stroke                             | width                           | `width`   |
+| Stroke style            | change   | style                              | `solid` or `dashed` or `dotted` |
+| Stroke sloppiness       | change   | stroke                             | sloppiness                      | `value`   |
+| Fill                    | change   | fill                               | `value`                         |
+| Edge                    | change   | edge                               | `value`                         |
+| Opacity                 | change   | opacity                            | value                           | `opacity` |
+| Project name            | change   | title                              |
+| Theme                   | change   | theme                              | `light` or `dark`               |
+| Change language         | change   | language                           | `language`                      |
+| Send to back            | layer    | move                               | `back`                          |
+| Send backward           | layer    | move                               | `down`                          |
+| Bring to front          | layer    | move                               | `front`                         |
+| Bring forward           | layer    | move                               | `up`                            |
+| Align left              | align    | align                              | `left`                          |
+| Align right             | align    | align                              | `right`                         |
+| Align top               | align    | align                              | `top`                           |
+| Align bottom            | align    | align                              | `bottom`                        |
+| Center horizontally     | align    | horizontally                       | `center`                        |
+| Center vertically       | align    | vertically                         | `center`                        |
+| Distribute horizontally | align    | distribute                         | `horizontally`                  |
+| Distribute vertically   | align    | distribute                         | `vertically`                    |
+| Start session           | share    | session start                      |
+| Join session            | share    | session join                       |
+| Start end               | share    | session end                        |
+| Copy room link          | share    | copy link                          |
+| Go to collaborator      | share    | go to collaborator                 |
+| Change name             | share    | name                               |
+| Add to library          | library  | add                                |
+| Remove from library     | library  | remove                             |
+| Load library            | library  | load                               |
+| Save library            | library  | save                               |
+| Import library          | library  | import                             |
+| Shortcuts dialog        | dialog   | shortcuts                          |
+| Collaboration dialog    | dialog   | collaboration                      |
+| Export dialog           | dialog   | export                             |
+| Library dialog          | dialog   | library                            |
+| E2EE shield             | exit     | e2ee shield                        |
+| GitHub corner           | exit     | github                             |
+| Excalidraw blog         | exit     | blog                               |
+| Excalidraw guides       | exit     | guides                             |
+| File issues             | exit     | issues                             |
+| First load              | load     | first load                         |
+| Load from stroage       | load     | storage                            | size                            | `bytes`   |

now.json

@@ -21,5 +21,12 @@
         }
       ]
     }
+  ],
+  "redirects": [
+    {
+      "source": "/([^.]+)",
+      "destination": "/",
+      "statusCode": 301
+    }
   ]
 }

package.json

@@ -19,22 +19,23 @@
     ]
   },
   "dependencies": {
-    "@sentry/browser": "6.0.3",
-    "@sentry/integrations": "6.0.3",
-    "@testing-library/jest-dom": "5.11.9",
-    "@testing-library/react": "11.2.3",
-    "@types/jest": "26.0.20",
+    "@sentry/browser": "5.29.2",
+    "@sentry/integrations": "5.29.2",
+    "@testing-library/jest-dom": "5.11.8",
+    "@testing-library/react": "11.2.2",
+    "@types/jest": "26.0.19",
+    "@types/nanoid": "2.1.0",
     "@types/react": "17.0.0",
     "@types/react-dom": "17.0.0",
-    "@types/socket.io-client": "1.4.35",
-    "browser-fs-access": "0.13.0",
+    "@types/socket.io-client": "1.4.34",
+    "browser-nativefs": "0.12.0",
     "clsx": "1.1.1",
-    "firebase": "8.2.5",
+    "firebase": "8.2.1",
     "i18next-browser-languagedetector": "6.0.1",
     "lodash.throttle": "4.1.1",
-    "nanoid": "3.1.20",
+    "nanoid": "2.1.11",
     "node-sass": "4.14.1",
-    "open-color": "1.8.0",
+    "open-color": "1.7.0",
     "pako": "1.0.11",
     "png-chunk-text": "1.0.0",
     "png-chunks-encode": "1.0.0",
@@ -51,10 +52,10 @@
   "devDependencies": {
     "@types/lodash.throttle": "4.1.6",
     "@types/pako": "1.0.1",
-    "eslint-config-prettier": "7.2.0",
-    "eslint-plugin-prettier": "3.3.1",
-    "firebase-tools": "9.2.2",
-    "husky": "4.3.8",
+    "eslint-config-prettier": "7.1.0",
+    "eslint-plugin-prettier": "3.3.0",
+    "firebase-tools": "9.1.0",
+    "husky": "4.3.6",
     "jest-canvas-mock": "2.3.0",
     "lint-staged": "10.5.3",
     "pepjs": "0.5.3",
@@ -72,7 +73,7 @@
   },
   "jest": {
     "transformIgnorePatterns": [
-      "node_modules/(?!(roughjs|points-on-curve|path-data-parser|points-on-path|browser-fs-access)/)"
+      "node_modules/(?!(roughjs|points-on-curve|path-data-parser|points-on-path|browser-nativefs)/)"
     ],
     "resetMocks": false
   },
@@ -80,8 +81,8 @@
   "private": true,
   "scripts": {
     "build-node": "node ./scripts/build-node.js",
-    "build:app:docker": "REACT_APP_DISABLE_SENTRY=true react-scripts build",
-    "build:app": "REACT_APP_GIT_SHA=$VERCEL_GIT_COMMIT_SHA react-scripts build",
+    "build:app:docker": "REACT_APP_INCLUDE_GTAG=false REACT_APP_DISABLE_SENTRY=true react-scripts build",
+    "build:app": "REACT_APP_INCLUDE_GTAG=true REACT_APP_GIT_SHA=$NOW_GITHUB_COMMIT_SHA react-scripts build",
     "build:version": "node ./scripts/build-version.js",
     "build": "npm run build:app && npm run build:version",
     "eject": "react-scripts eject",

public/index.html

@@ -86,10 +86,10 @@
 
     <link rel="stylesheet" href="fonts.css" type="text/css" />
 
-    <% if (process.env.REACT_APP_GOOGLE_ANALYTICS_ID) { %>
+    <% if (process.env.REACT_APP_INCLUDE_GTAG === 'true') { %>
     <script
       async
-      src="https://www.googletagmanager.com/gtag/js?id=%REACT_APP_GOOGLE_ANALYTICS_ID%"
+      src="https://www.googletagmanager.com/gtag/js?id=UA-387204-13"
     ></script>
     <script>
       window.dataLayer = window.dataLayer || [];
@@ -97,7 +97,7 @@
         dataLayer.push(arguments);
       }
       gtag("js", new Date());
-      gtag("config", "%REACT_APP_GOOGLE_ANALYTICS_ID%");
+      gtag("config", "UA-387204-13");
     </script>
     <% } %>
 

scripts/build-version.js

@@ -5,40 +5,23 @@ const path = require("path");
 const versionFile = path.join("build", "version.json");
 const indexFile = path.join("build", "index.html");
 
-const versionDate = (date) => date.toISOString().replace(".000", "");
+const zero = (digit) => `0${digit}`.slice(-2);
 
-const commitHash = () => {
-  try {
-    return require("child_process")
-      .execSync("git rev-parse --short HEAD")
-      .toString()
-      .trim();
-  } catch {
-    return "none";
-  }
+const versionDate = (date) => {
+  const date_ = `${date.getFullYear()}-${zero(date.getMonth() + 1)}-${zero(
+    date.getDate(),
+  )}`;
+  const time = `${zero(date.getHours())}-${zero(date.getMinutes())}-${zero(
+    date.getSeconds(),
+  )}`;
+  return `${date_}-${time}`;
 };
 
-const commitDate = (hash) => {
-  try {
-    const unix = require("child_process")
-      .execSync(`git show -s --format=%ct ${hash}`)
-      .toString()
-      .trim();
-    const date = new Date(parseInt(unix) * 1000);
-    return versionDate(date);
-  } catch {
-    return versionDate(new Date());
-  }
-};
-
-const getFullVersion = () => {
-  const hash = commitHash();
-  return `${commitDate(hash)}-${hash}`;
-};
+const now = new Date();
 
 const data = JSON.stringify(
   {
-    version: getFullVersion(),
+    version: versionDate(now),
   },
   undefined,
   2,
@@ -51,7 +34,7 @@ fs.readFile(indexFile, "utf8", (error, data) => {
   if (error) {
     return console.error(error);
   }
-  const result = data.replace(/{version}/g, getFullVersion());
+  const result = data.replace(/{version}/g, versionDate(now));
 
   fs.writeFile(indexFile, result, "utf8", (error) => {
     if (error) {

scripts/locales-coverage-description.js

@@ -4,27 +4,25 @@ const THRESSHOLD = 85;
 
 const crowdinMap = {
   "ar-SA": "en-ar",
+  "el-GR": "en-el",
+  "fi-FI": "en-fi",
+  "ja-JP": "en-ja",
   "bg-BG": "en-bg",
   "ca-ES": "en-ca",
   "de-DE": "en-de",
-  "el-GR": "en-el",
   "es-ES": "en-es",
   "fa-IR": "en-fa",
-  "fi-FI": "en-fi",
   "fr-FR": "en-fr",
   "he-IL": "en-he",
   "hi-IN": "en-hi",
   "hu-HU": "en-hu",
   "id-ID": "en-id",
   "it-IT": "en-it",
-  "ja-JP": "en-ja",
-  "kab-KAB": "en-kab",
   "ko-KR": "en-ko",
   "my-MM": "en-my",
   "nb-NO": "en-nb",
   "nl-NL": "en-nl",
   "nn-NO": "en-nnno",
-  "pa-IN": "en-pain",
   "pl-PL": "en-pl",
   "pt-BR": "en-ptbr",
   "pt-PT": "en-pt",
@@ -41,7 +39,7 @@ const crowdinMap = {
 const flags = {
   "ar-SA": "🇸🇦",
   "bg-BG": "🇧🇬",
-  "ca-ES": "🏳",
+  "ca-ES": "🇪🇸",
   "de-DE": "🇩🇪",
   "el-GR": "🇬🇷",
   "es-ES": "🇪🇸",
@@ -54,13 +52,11 @@ const flags = {
   "id-ID": "🇮🇩",
   "it-IT": "🇮🇹",
   "ja-JP": "🇯🇵",
-  "kab-KAB": "🏳",
   "ko-KR": "🇰🇷",
   "my-MM": "🇲🇲",
   "nb-NO": "🇳🇴",
   "nl-NL": "🇳🇱",
   "nn-NO": "🇳🇴",
-  "pa-IN": "🇮🇳",
   "pl-PL": "🇵🇱",
   "pt-BR": "🇧🇷",
   "pt-PT": "🇵🇹",
@@ -77,7 +73,7 @@ const flags = {
 const languages = {
   "ar-SA": "العربية",
   "bg-BG": "Български",
-  "ca-ES": "Català",
+  "ca-ES": "Catalan",
   "de-DE": "Deutsch",
   "el-GR": "Ελληνικά",
   "es-ES": "Español",
@@ -90,13 +86,11 @@ const languages = {
   "id-ID": "Bahasa Indonesia",
   "it-IT": "Italiano",
   "ja-JP": "日本語",
-  "kab-KAB": "Taqbaylit",
   "ko-KR": "한국어",
   "my-MM": "Burmese",
   "nb-NO": "Norsk bokmål",
   "nl-NL": "Nederlands",
   "nn-NO": "Norsk nynorsk",
-  "pa-IN": "ਪੰਜਾਬੀ",
   "pl-PL": "Polski",
   "pt-BR": "Português Brasileiro",
   "pt-PT": "Português",
@@ -140,7 +134,7 @@ const printRow = (id, locale, coverage) => {
   } else {
     result += `${boldIf(language, isOver)} | `;
   }
-  result += `${coverage === 100 ? "💯" : boldIf(coverage, isOver)} |`;
+  result += `${coverage === 100 ? "✅" : boldIf(coverage, isOver)} |`;
   return result;
 };
 

src/actions/actionAddToLibrary.ts

@@ -3,6 +3,7 @@ import { getSelectedElements } from "../scene";
 import { getNonDeletedElements } from "../element";
 import { deepCopyElement } from "../element/newElement";
 import { Library } from "../data/library";
+import { EVENT_LIBRARY, trackEvent } from "../analytics";
 
 export const actionAddToLibrary = register({
   name: "addToLibrary",
@@ -15,7 +16,9 @@ export const actionAddToLibrary = register({
     Library.loadLibrary().then((items) => {
       Library.saveLibrary([...items, selectedElements.map(deepCopyElement)]);
     });
+    trackEvent(EVENT_LIBRARY, "add");
     return false;
   },
+  contextMenuOrder: 6,
   contextItemLabel: "labels.addToLibrary",
 });

src/actions/actionAlign.tsx

@@ -1,5 +1,7 @@
 import React from "react";
-import { alignElements, Alignment } from "../align";
+import { KEYS } from "../keys";
+import { t } from "../i18n";
+import { register } from "./register";
 import {
   AlignBottomIcon,
   AlignLeftIcon,
@@ -8,15 +10,14 @@ import {
   CenterHorizontallyIcon,
   CenterVerticallyIcon,
 } from "../components/icons";
-import { ToolButton } from "../components/ToolButton";
-import { getElementMap, getNonDeletedElements } from "../element";
-import { ExcalidrawElement } from "../element/types";
-import { t } from "../i18n";
-import { KEYS } from "../keys";
 import { getSelectedElements, isSomeElementSelected } from "../scene";
+import { getElementMap, getNonDeletedElements } from "../element";
+import { ToolButton } from "../components/ToolButton";
+import { ExcalidrawElement } from "../element/types";
 import { AppState } from "../types";
+import { alignElements, Alignment } from "../align";
 import { getShortcutKey } from "../utils";
-import { register } from "./register";
+import { trackEvent, EVENT_ALIGN } from "../analytics";
 
 const enableActionGroup = (
   elements: readonly ExcalidrawElement[],
@@ -43,6 +44,7 @@ const alignSelectedElements = (
 export const actionAlignTop = register({
   name: "alignTop",
   perform: (elements, appState) => {
+    trackEvent(EVENT_ALIGN, "align", "top");
     return {
       appState,
       elements: alignSelectedElements(elements, appState, {
@@ -72,6 +74,7 @@ export const actionAlignTop = register({
 export const actionAlignBottom = register({
   name: "alignBottom",
   perform: (elements, appState) => {
+    trackEvent(EVENT_ALIGN, "align", "bottom");
     return {
       appState,
       elements: alignSelectedElements(elements, appState, {
@@ -101,6 +104,7 @@ export const actionAlignBottom = register({
 export const actionAlignLeft = register({
   name: "alignLeft",
   perform: (elements, appState) => {
+    trackEvent(EVENT_ALIGN, "align", "left");
     return {
       appState,
       elements: alignSelectedElements(elements, appState, {
@@ -130,6 +134,7 @@ export const actionAlignLeft = register({
 export const actionAlignRight = register({
   name: "alignRight",
   perform: (elements, appState) => {
+    trackEvent(EVENT_ALIGN, "align", "right");
     return {
       appState,
       elements: alignSelectedElements(elements, appState, {
@@ -159,6 +164,7 @@ export const actionAlignRight = register({
 export const actionAlignVerticallyCentered = register({
   name: "alignVerticallyCentered",
   perform: (elements, appState) => {
+    trackEvent(EVENT_ALIGN, "vertically", "center");
     return {
       appState,
       elements: alignSelectedElements(elements, appState, {
@@ -184,6 +190,7 @@ export const actionAlignVerticallyCentered = register({
 export const actionAlignHorizontallyCentered = register({
   name: "alignHorizontallyCentered",
   perform: (elements, appState) => {
+    trackEvent(EVENT_ALIGN, "horizontally", "center");
     return {
       appState,
       elements: alignSelectedElements(elements, appState, {

src/actions/actionCanvas.tsx

@@ -1,9 +1,10 @@
 import React from "react";
+import { EVENT_ACTION, EVENT_CHANGE, trackEvent } from "../analytics";
 import { getDefaultAppState } from "../appState";
+import colors from "../colors";
 import { ColorPicker } from "../components/ColorPicker";
 import { resetZoom, trash, zoomIn, zoomOut } from "../components/icons";
 import { ToolButton } from "../components/ToolButton";
-import { GRID_SIZE, ZOOM_STEP } from "../constants";
 import { getCommonBounds, getNonDeletedElements } from "../element";
 import { newElementWith } from "../element/mutateElement";
 import { ExcalidrawElement } from "../element/types";
@@ -14,12 +15,21 @@ import { getNormalizedZoom, getSelectedElements } from "../scene";
 import { centerScrollOn } from "../scene/scroll";
 import { getNewZoom } from "../scene/zoom";
 import { AppState, NormalizedZoomValue } from "../types";
-import { getShortcutKey } from "../utils";
+import { getNewSceneName, getShortcutKey } from "../utils";
 import { register } from "./register";
 
 export const actionChangeViewBackgroundColor = register({
   name: "changeViewBackgroundColor",
   perform: (_, appState, value) => {
+    if (value !== appState.viewBackgroundColor) {
+      trackEvent(
+        EVENT_CHANGE,
+        "canvas color",
+        colors.canvasBackground.includes(value)
+          ? `${value} (picker ${colors.canvasBackground.indexOf(value)})`
+          : value,
+      );
+    }
     return {
       appState: { ...appState, viewBackgroundColor: value },
       commitToHistory: true,
@@ -42,17 +52,19 @@ export const actionChangeViewBackgroundColor = register({
 export const actionClearCanvas = register({
   name: "clearCanvas",
   perform: (elements, appState: AppState) => {
+    trackEvent(EVENT_ACTION, "clear canvas");
     return {
       elements: elements.map((element) =>
         newElementWith(element, { isDeleted: true }),
       ),
       appState: {
         ...getDefaultAppState(),
+        name: getNewSceneName(),
         appearance: appState.appearance,
         elementLocked: appState.elementLocked,
         exportBackground: appState.exportBackground,
         exportEmbedScene: appState.exportEmbedScene,
-        gridSize: appState.gridSize || GRID_SIZE,
+        gridSize: appState.gridSize,
         shouldAddWatermark: appState.shouldAddWatermark,
         showStats: appState.showStats,
         pasteDialog: appState.pasteDialog,
@@ -76,6 +88,8 @@ export const actionClearCanvas = register({
   ),
 });
 
+const ZOOM_STEP = 0.1;
+
 export const actionZoomIn = register({
   name: "zoomIn",
   perform: (_elements, appState) => {
@@ -85,6 +99,7 @@ export const actionZoomIn = register({
       { left: appState.offsetLeft, top: appState.offsetTop },
       { x: appState.width / 2, y: appState.height / 2 },
     );
+    trackEvent(EVENT_ACTION, "zoom", "in", zoom.value * 100);
     return {
       appState: {
         ...appState,
@@ -119,6 +134,7 @@ export const actionZoomOut = register({
       { x: appState.width / 2, y: appState.height / 2 },
     );
 
+    trackEvent(EVENT_ACTION, "zoom", "out", zoom.value * 100);
     return {
       appState: {
         ...appState,
@@ -146,6 +162,7 @@ export const actionZoomOut = register({
 export const actionResetZoom = register({
   name: "resetZoom",
   perform: (_elements, appState) => {
+    trackEvent(EVENT_ACTION, "zoom", "reset", 100);
     return {
       appState: {
         ...appState,
@@ -218,10 +235,12 @@ const zoomToFitElements = (
     left: appState.offsetLeft,
     top: appState.offsetTop,
   });
+  const action = zoomToSelection ? "selection" : "fit";
 
   const [x1, y1, x2, y2] = commonBounds;
   const centerX = (x1 + x2) / 2;
   const centerY = (y1 + y2) / 2;
+  trackEvent(EVENT_ACTION, "zoom", action, newZoom.value * 100);
   return {
     appState: {
       ...appState,

src/actions/actionClipboard.tsx

@@ -1,114 +0,0 @@
-import { CODES, KEYS } from "../keys";
-import { register } from "./register";
-import { copyToClipboard } from "../clipboard";
-import { actionDeleteSelected } from "./actionDeleteSelected";
-import { getSelectedElements } from "../scene/selection";
-import { exportCanvas } from "../data/index";
-import { getNonDeletedElements } from "../element";
-import { t } from "../i18n";
-
-export const actionCopy = register({
-  name: "copy",
-  perform: (elements, appState) => {
-    copyToClipboard(getNonDeletedElements(elements), appState);
-
-    return {
-      commitToHistory: false,
-    };
-  },
-  contextItemLabel: "labels.copy",
-  keyTest: (event) => event[KEYS.CTRL_OR_CMD] && event.code === CODES.C,
-});
-
-export const actionCut = register({
-  name: "cut",
-  perform: (elements, appState, data, app) => {
-    actionCopy.perform(elements, appState, data, app);
-    return actionDeleteSelected.perform(elements, appState, data, app);
-  },
-  contextItemLabel: "labels.cut",
-  keyTest: (event) => event[KEYS.CTRL_OR_CMD] && event.code === CODES.X,
-});
-
-export const actionCopyAsSvg = register({
-  name: "copyAsSvg",
-  perform: async (elements, appState, _data, app) => {
-    if (!app.canvas) {
-      return {
-        commitToHistory: false,
-      };
-    }
-    const selectedElements = getSelectedElements(
-      getNonDeletedElements(elements),
-      appState,
-    );
-    try {
-      await exportCanvas(
-        "clipboard-svg",
-        selectedElements.length
-          ? selectedElements
-          : getNonDeletedElements(elements),
-        appState,
-        app.canvas,
-        appState,
-      );
-      return {
-        commitToHistory: false,
-      };
-    } catch (error) {
-      console.error(error);
-      return {
-        appState: {
-          ...appState,
-          errorMessage: error.message,
-        },
-        commitToHistory: false,
-      };
-    }
-  },
-  contextItemLabel: "labels.copyAsSvg",
-});
-
-export const actionCopyAsPng = register({
-  name: "copyAsPng",
-  perform: async (elements, appState, _data, app) => {
-    if (!app.canvas) {
-      return {
-        commitToHistory: false,
-      };
-    }
-    const selectedElements = getSelectedElements(
-      getNonDeletedElements(elements),
-      appState,
-    );
-    try {
-      await exportCanvas(
-        "clipboard",
-        selectedElements.length
-          ? selectedElements
-          : getNonDeletedElements(elements),
-        appState,
-        app.canvas,
-        appState,
-      );
-      return {
-        appState: {
-          ...appState,
-          toastMessage: t("toast.copyToClipboardAsPng"),
-        },
-        commitToHistory: false,
-      };
-    } catch (error) {
-      console.error(error);
-      return {
-        appState: {
-          ...appState,
-          errorMessage: error.message,
-        },
-        commitToHistory: false,
-      };
-    }
-  },
-  contextItemLabel: "labels.copyAsPng",
-  keyTest: (event) => event.code === CODES.C && event.altKey && event.shiftKey,
-});

src/actions/actionDeleteSelected.tsx

@@ -136,6 +136,7 @@ export const actionDeleteSelected = register({
     };
   },
   contextItemLabel: "labels.delete",
+  contextMenuOrder: 999999,
   keyTest: (event) => event.key === KEYS.BACKSPACE || event.key === KEYS.DELETE,
   PanelComponent: ({ elements, appState, updateData }) => (
     <ToolButton

src/actions/actionDistribute.tsx

@@ -1,18 +1,19 @@
 import React from "react";
+import { CODES } from "../keys";
+import { t } from "../i18n";
+import { register } from "./register";
 import {
   DistributeHorizontallyIcon,
   DistributeVerticallyIcon,
 } from "../components/icons";
-import { ToolButton } from "../components/ToolButton";
-import { distributeElements, Distribution } from "../disitrubte";
-import { getElementMap, getNonDeletedElements } from "../element";
-import { ExcalidrawElement } from "../element/types";
-import { t } from "../i18n";
-import { CODES } from "../keys";
 import { getSelectedElements, isSomeElementSelected } from "../scene";
+import { getElementMap, getNonDeletedElements } from "../element";
+import { ToolButton } from "../components/ToolButton";
+import { ExcalidrawElement } from "../element/types";
 import { AppState } from "../types";
+import { distributeElements, Distribution } from "../disitrubte";
 import { getShortcutKey } from "../utils";
-import { register } from "./register";
+import { EVENT_ALIGN, trackEvent } from "../analytics";
 
 const enableActionGroup = (
   elements: readonly ExcalidrawElement[],
@@ -39,6 +40,7 @@ const distributeSelectedElements = (
 export const distributeHorizontally = register({
   name: "distributeHorizontally",
   perform: (elements, appState) => {
+    trackEvent(EVENT_ALIGN, "distribute", "horizontally");
     return {
       appState,
       elements: distributeSelectedElements(elements, appState, {
@@ -67,6 +69,7 @@ export const distributeHorizontally = register({
 export const distributeVertically = register({
   name: "distributeVertically",
   perform: (elements, appState) => {
+    trackEvent(EVENT_ALIGN, "distribute", "vertically");
     return {
       appState,
       elements: distributeSelectedElements(elements, appState, {

src/actions/actionExport.tsx

@@ -1,26 +1,29 @@
 import React from "react";
-import { trackEvent } from "../analytics";
-import { load, questionCircle, save, saveAs } from "../components/icons";
+import { EVENT_CHANGE, EVENT_IO, trackEvent } from "../analytics";
+import { load, save, saveAs } from "../components/icons";
 import { ProjectName } from "../components/ProjectName";
 import { ToolButton } from "../components/ToolButton";
-import "../components/ToolIcon.scss";
 import { Tooltip } from "../components/Tooltip";
+import { questionCircle } from "../components/icons";
 import { loadFromJSON, saveAsJSON } from "../data";
 import { t } from "../i18n";
 import useIsMobile from "../is-mobile";
 import { KEYS } from "../keys";
+import { muteFSAbortError } from "../utils";
 import { register } from "./register";
+import "../components/ToolIcon.scss";
+import { SCENE_NAME_FALLBACK } from "../constants";
 
 export const actionChangeProjectName = register({
   name: "changeProjectName",
   perform: (_elements, appState, value) => {
-    trackEvent("change", "title");
+    trackEvent(EVENT_CHANGE, "title");
     return { appState: { ...appState, name: value }, commitToHistory: false };
   },
   PanelComponent: ({ appState, updateData }) => (
     <ProjectName
       label={t("labels.fileTitle")}
-      value={appState.name || "Unnamed"}
+      value={appState.name || SCENE_NAME_FALLBACK}
       onChange={(name: string) => updateData(name)}
     />
   ),
@@ -98,6 +101,7 @@ export const actionSaveScene = register({
   perform: async (elements, appState, value) => {
     try {
       const { fileHandle } = await saveAsJSON(elements, appState);
+      trackEvent(EVENT_IO, "save");
       return { commitToHistory: false, appState: { ...appState, fileHandle } };
     } catch (error) {
       if (error?.name !== "AbortError") {
@@ -128,6 +132,7 @@ export const actionSaveAsScene = register({
         ...appState,
         fileHandle: null,
       });
+      trackEvent(EVENT_IO, "save as");
       return { commitToHistory: false, appState: { ...appState, fileHandle } };
     } catch (error) {
       if (error?.name !== "AbortError") {
@@ -155,29 +160,18 @@ export const actionSaveAsScene = register({
 
 export const actionLoadScene = register({
   name: "loadScene",
-  perform: async (elements, appState) => {
-    try {
-      const {
-        elements: loadedElements,
-        appState: loadedAppState,
-      } = await loadFromJSON(appState);
-      return {
-        elements: loadedElements,
-        appState: loadedAppState,
-        commitToHistory: true,
-      };
-    } catch (error) {
-      if (error?.name === "AbortError") {
-        return false;
-      }
-      return {
-        elements,
-        appState: { ...appState, errorMessage: error.message },
-        commitToHistory: false,
-      };
-    }
-  },
-  keyTest: (event) => event[KEYS.CTRL_OR_CMD] && event.key === KEYS.O,
+  perform: (
+    elements,
+    appState,
+    { elements: loadedElements, appState: loadedAppState, error },
+  ) => ({
+    elements: loadedElements,
+    appState: {
+      ...loadedAppState,
+      errorMessage: error,
+    },
+    commitToHistory: true,
+  }),
   PanelComponent: ({ updateData, appState }) => (
     <ToolButton
       type="button"
@@ -185,7 +179,16 @@ export const actionLoadScene = register({
       title={t("buttons.load")}
       aria-label={t("buttons.load")}
       showAriaLabel={useIsMobile()}
-      onClick={updateData}
+      onClick={() => {
+        loadFromJSON(appState)
+          .then(({ elements, appState }) => {
+            updateData({ elements, appState });
+          })
+          .catch(muteFSAbortError)
+          .catch((error) => {
+            updateData({ error: error.message });
+          });
+      }}
     />
   ),
 });

src/actions/actionFinalize.tsx

@@ -118,14 +118,11 @@ export const actionFinalize = register({
         );
       }
 
-      if (!appState.elementLocked && appState.elementType !== "draw") {
+      if (!appState.elementLocked) {
         appState.selectedElementIds[multiPointElement.id] = true;
       }
     }
-    if (
-      (!appState.elementLocked && appState.elementType !== "draw") ||
-      !multiPointElement
-    ) {
+    if (!appState.elementLocked || !multiPointElement) {
       resetCursor();
     }
     return {
@@ -133,8 +130,7 @@ export const actionFinalize = register({
       appState: {
         ...appState,
         elementType:
-          (appState.elementLocked || appState.elementType === "draw") &&
-          multiPointElement
+          appState.elementLocked && multiPointElement
             ? appState.elementType
             : "selection",
         draggingElement: null,
@@ -143,9 +139,7 @@ export const actionFinalize = register({
         startBoundElement: null,
         suggestedBindings: [],
         selectedElementIds:
-          multiPointElement &&
-          !appState.elementLocked &&
-          appState.elementType !== "draw"
+          multiPointElement && !appState.elementLocked
             ? {
                 ...appState.selectedElementIds,
                 [multiPointElement.id]: true,

src/actions/actionGroup.tsx

@@ -125,6 +125,7 @@ export const actionGroup = register({
       commitToHistory: true,
     };
   },
+  contextMenuOrder: 4,
   contextItemLabel: "labels.group",
   contextItemPredicate: (elements, appState) =>
     enableActionGroup(elements, appState),
@@ -173,6 +174,7 @@ export const actionUngroup = register({
   },
   keyTest: (event) =>
     event.shiftKey && event[KEYS.CTRL_OR_CMD] && event.code === CODES.G,
+  contextMenuOrder: 5,
   contextItemLabel: "labels.ungroup",
   contextItemPredicate: (elements, appState) =>
     getSelectedGroupIds(appState).length > 0,

src/actions/actionHistory.tsx

@@ -6,7 +6,7 @@ import { t } from "../i18n";
 import { SceneHistory, HistoryEntry } from "../history";
 import { ExcalidrawElement } from "../element/types";
 import { AppState } from "../types";
-import { isWindows, KEYS } from "../keys";
+import { KEYS } from "../keys";
 import { getElementMap } from "../element";
 import { newElementWith } from "../element/mutateElement";
 import { fixBindingsAfterDeletion } from "../element/binding";
@@ -59,16 +59,16 @@ const writeData = (
   return { commitToHistory };
 };
 
+const testUndo = (shift: boolean) => (event: KeyboardEvent) =>
+  event[KEYS.CTRL_OR_CMD] && /z/i.test(event.key) && event.shiftKey === shift;
+
 type ActionCreator = (history: SceneHistory) => Action;
 
 export const createUndoAction: ActionCreator = (history) => ({
   name: "undo",
   perform: (elements, appState) =>
     writeData(elements, appState, () => history.undoOnce()),
-  keyTest: (event) =>
-    event[KEYS.CTRL_OR_CMD] &&
-    event.key.toLowerCase() === KEYS.Z &&
-    !event.shiftKey,
+  keyTest: testUndo(false),
   PanelComponent: ({ updateData }) => (
     <ToolButton
       type="button"
@@ -84,11 +84,7 @@ export const createRedoAction: ActionCreator = (history) => ({
   name: "redo",
   perform: (elements, appState) =>
     writeData(elements, appState, () => history.redoOnce()),
-  keyTest: (event) =>
-    (event[KEYS.CTRL_OR_CMD] &&
-      event.shiftKey &&
-      event.key.toLowerCase() === KEYS.Z) ||
-    (isWindows && event.ctrlKey && !event.shiftKey && event.key === KEYS.Y),
+  keyTest: testUndo(true),
   PanelComponent: ({ updateData }) => (
     <ToolButton
       type="button"

src/actions/actionMenu.tsx

@@ -7,6 +7,7 @@ import { register } from "./register";
 import { allowFullScreen, exitFullScreen, isFullScreen } from "../utils";
 import { CODES, KEYS } from "../keys";
 import { HelpIcon } from "../components/HelpIcon";
+import { EVENT_DIALOG, trackEvent } from "../analytics";
 
 export const actionToggleCanvasMenu = register({
   name: "toggleCanvasMenu",
@@ -71,16 +72,17 @@ export const actionFullScreen = register({
 export const actionShortcuts = register({
   name: "toggleShortcuts",
   perform: (_elements, appState) => {
+    trackEvent(EVENT_DIALOG, "shortcuts");
     return {
       appState: {
         ...appState,
-        showHelpDialog: !appState.showHelpDialog,
+        showShortcutsDialog: true,
       },
       commitToHistory: false,
     };
   },
   PanelComponent: ({ updateData }) => (
-    <HelpIcon title={t("helpDialog.title")} onClick={updateData} />
+    <HelpIcon title={t("shortcutsDialog.title")} onClick={updateData} />
   ),
   keyTest: (event) => event.key === KEYS.QUESTION_MARK,
 });

src/actions/actionNavigate.tsx

@@ -1,14 +1,16 @@
 import React from "react";
-import { getClientColors, getClientInitials } from "../clients";
 import { Avatar } from "../components/Avatar";
-import { centerScrollOn } from "../scene/scroll";
-import { Collaborator } from "../types";
 import { register } from "./register";
+import { getClientColors, getClientInitials } from "../clients";
+import { Collaborator } from "../types";
+import { centerScrollOn } from "../scene/scroll";
+import { EVENT_SHARE, trackEvent } from "../analytics";
 
 export const actionGoToCollaborator = register({
   name: "goToCollaborator",
   perform: (_elements, appState, value) => {
     const point = value as Collaborator["pointer"];
+    trackEvent(EVENT_SHARE, "go to collaborator");
     if (!point) {
       return { appState, commitToHistory: false };
     }

src/actions/actionProperties.tsx

@@ -1,53 +1,56 @@
 import React from "react";
-import { AppState } from "../../src/types";
-import { ButtonIconSelect } from "../components/ButtonIconSelect";
+import { getLanguage } from "../i18n";
+import {
+  ExcalidrawElement,
+  ExcalidrawTextElement,
+  TextAlign,
+  FontFamily,
+  ExcalidrawLinearElement,
+  Arrowhead,
+} from "../element/types";
+import {
+  getCommonAttributeOfSelectedElements,
+  isSomeElementSelected,
+  getTargetElements,
+  canChangeSharpness,
+  canHaveArrowheads,
+} from "../scene";
 import { ButtonSelect } from "../components/ButtonSelect";
-import { ColorPicker } from "../components/ColorPicker";
+import { ButtonIconSelect } from "../components/ButtonIconSelect";
 import { IconPicker } from "../components/IconPicker";
 import {
+  isTextElement,
+  redrawTextBoundingBox,
+  getNonDeletedElements,
+} from "../element";
+import { isLinearElement, isLinearElementType } from "../element/typeChecks";
+import { ColorPicker } from "../components/ColorPicker";
+import { AppState } from "../../src/types";
+import { t } from "../i18n";
+import { register } from "./register";
+import { newElementWith } from "../element/mutateElement";
+import { DEFAULT_FONT_SIZE, DEFAULT_FONT_FAMILY } from "../constants";
+import { randomInteger } from "../random";
+import {
+  FillHachureIcon,
+  FillCrossHatchIcon,
+  FillSolidIcon,
+  StrokeWidthIcon,
+  StrokeStyleSolidIcon,
+  StrokeStyleDashedIcon,
+  StrokeStyleDottedIcon,
+  EdgeSharpIcon,
+  EdgeRoundIcon,
+  SloppinessArchitectIcon,
+  SloppinessArtistIcon,
+  SloppinessCartoonistIcon,
   ArrowheadArrowIcon,
   ArrowheadBarIcon,
   ArrowheadDotIcon,
   ArrowheadNoneIcon,
-  EdgeRoundIcon,
-  EdgeSharpIcon,
-  FillCrossHatchIcon,
-  FillHachureIcon,
-  FillSolidIcon,
-  SloppinessArchitectIcon,
-  SloppinessArtistIcon,
-  SloppinessCartoonistIcon,
-  StrokeStyleDashedIcon,
-  StrokeStyleDottedIcon,
-  StrokeStyleSolidIcon,
-  StrokeWidthIcon,
 } from "../components/icons";
-import { DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE } from "../constants";
-import {
-  getNonDeletedElements,
-  isTextElement,
-  redrawTextBoundingBox,
-} from "../element";
-import { newElementWith } from "../element/mutateElement";
-import { isLinearElement, isLinearElementType } from "../element/typeChecks";
-import {
-  Arrowhead,
-  ExcalidrawElement,
-  ExcalidrawLinearElement,
-  ExcalidrawTextElement,
-  FontFamily,
-  TextAlign,
-} from "../element/types";
-import { getLanguage, t } from "../i18n";
-import { randomInteger } from "../random";
-import {
-  canChangeSharpness,
-  canHaveArrowheads,
-  getCommonAttributeOfSelectedElements,
-  getTargetElements,
-  isSomeElementSelected,
-} from "../scene";
-import { register } from "./register";
+import { EVENT_CHANGE, trackEvent } from "../analytics";
+import colors from "../colors";
 
 const changeProperty = (
   elements: readonly ExcalidrawElement[],
@@ -89,6 +92,15 @@ const getFormValue = function <T>(
 export const actionChangeStrokeColor = register({
   name: "changeStrokeColor",
   perform: (elements, appState, value) => {
+    if (value !== appState.currentItemStrokeColor) {
+      trackEvent(
+        EVENT_CHANGE,
+        "stroke color",
+        colors.elementStroke.includes(value)
+          ? `${value} (picker ${colors.elementStroke.indexOf(value)})`
+          : value,
+      );
+    }
     return {
       elements: changeProperty(elements, appState, (el) =>
         newElementWith(el, {
@@ -120,6 +132,16 @@ export const actionChangeStrokeColor = register({
 export const actionChangeBackgroundColor = register({
   name: "changeBackgroundColor",
   perform: (elements, appState, value) => {
+    if (value !== appState.currentItemBackgroundColor) {
+      trackEvent(
+        EVENT_CHANGE,
+        "background color",
+        colors.elementBackground.includes(value)
+          ? `${value} (picker ${colors.elementBackground.indexOf(value)})`
+          : value,
+      );
+    }
+
     return {
       elements: changeProperty(elements, appState, (el) =>
         newElementWith(el, {
@@ -151,6 +173,7 @@ export const actionChangeBackgroundColor = register({
 export const actionChangeFillStyle = register({
   name: "changeFillStyle",
   perform: (elements, appState, value) => {
+    trackEvent(EVENT_CHANGE, "fill", value);
     return {
       elements: changeProperty(elements, appState, (el) =>
         newElementWith(el, {
@@ -200,6 +223,7 @@ export const actionChangeFillStyle = register({
 export const actionChangeStrokeWidth = register({
   name: "changeStrokeWidth",
   perform: (elements, appState, value) => {
+    trackEvent(EVENT_CHANGE, "stroke", "width", value);
     return {
       elements: changeProperty(elements, appState, (el) =>
         newElementWith(el, {
@@ -262,6 +286,7 @@ export const actionChangeStrokeWidth = register({
 export const actionChangeSloppiness = register({
   name: "changeSloppiness",
   perform: (elements, appState, value) => {
+    trackEvent(EVENT_CHANGE, "stroke", "sloppiness", value);
     return {
       elements: changeProperty(elements, appState, (el) =>
         newElementWith(el, {
@@ -310,6 +335,7 @@ export const actionChangeSloppiness = register({
 export const actionChangeStrokeStyle = register({
   name: "changeStrokeStyle",
   perform: (elements, appState, value) => {
+    trackEvent(EVENT_CHANGE, "style", value);
     return {
       elements: changeProperty(elements, appState, (el) =>
         newElementWith(el, {
@@ -357,6 +383,7 @@ export const actionChangeStrokeStyle = register({
 export const actionChangeOpacity = register({
   name: "changeOpacity",
   perform: (elements, appState, value) => {
+    trackEvent(EVENT_CHANGE, "opacity", "value", value);
     return {
       elements: changeProperty(elements, appState, (el) =>
         newElementWith(el, {
@@ -553,6 +580,7 @@ export const actionChangeSharpness = register({
     const shouldUpdateForLinearElements = targetElements.length
       ? targetElements.every(isLinearElement)
       : isLinearElementType(appState.elementType);
+    trackEvent(EVENT_CHANGE, "edge", value);
     return {
       elements: changeProperty(elements, appState, (el) =>
         newElementWith(el, {
@@ -614,6 +642,12 @@ export const actionChangeArrowhead = register({
     return {
       elements: changeProperty(elements, appState, (el) => {
         if (isLinearElement(el)) {
+          trackEvent(
+            EVENT_CHANGE,
+            `arrowhead ${value.position}`,
+            value.type || "none",
+          );
+
           const { position, type } = value;
 
           if (position === "start") {

src/actions/actionStyles.ts

@@ -4,7 +4,6 @@ import {
   redrawTextBoundingBox,
 } from "../element";
 import { CODES, KEYS } from "../keys";
-import { t } from "../i18n";
 import { register } from "./register";
 import { mutateElement, newElementWith } from "../element/mutateElement";
 import {
@@ -24,16 +23,13 @@ export const actionCopyStyles = register({
       copiedStyles = JSON.stringify(element);
     }
     return {
-      appState: {
-        ...appState,
-        toastMessage: t("toast.copyStyles"),
-      },
       commitToHistory: false,
     };
   },
   contextItemLabel: "labels.copyStyles",
   keyTest: (event) =>
     event[KEYS.CTRL_OR_CMD] && event.altKey && event.code === CODES.C,
+  contextMenuOrder: 0,
 });
 
 export const actionPasteStyles = register({
@@ -73,4 +69,5 @@ export const actionPasteStyles = register({
   contextItemLabel: "labels.pasteStyles",
   keyTest: (event) =>
     event[KEYS.CTRL_OR_CMD] && event.altKey && event.code === CODES.V,
+  contextMenuOrder: 1,
 });

src/actions/actionToggleGridMode.tsx

@@ -1,21 +0,0 @@
-import { trackEvent } from "../analytics";
-import { CODES, KEYS } from "../keys";
-import { AppState } from "../types";
-import { register } from "./register";
-
-export const actionToggleGridMode = register({
-  name: "gridMode",
-  perform(elements, appState) {
-    trackEvent("view", "mode", "grid");
-    return {
-      appState: {
-        ...appState,
-        showGrid: !appState.showGrid,
-      },
-      commitToHistory: false,
-    };
-  },
-  checked: (appState: AppState) => appState.showGrid,
-  contextItemLabel: "labels.gridMode",
-  keyTest: (event) => event[KEYS.CTRL_OR_CMD] && event.code === CODES.QUOTE,
-});

src/actions/actionToggleStats.tsx

@@ -1,16 +0,0 @@
-import { register } from "./register";
-
-export const actionToggleStats = register({
-  name: "stats",
-  perform(elements, appState) {
-    return {
-      appState: {
-        ...appState,
-        showStats: !this.checked!(appState),
-      },
-      commitToHistory: false,
-    };
-  },
-  checked: (appState) => appState.showStats,
-  contextItemLabel: "stats.title",
-});

src/actions/actionToggleViewMode.tsx

@@ -1,22 +0,0 @@
-import { CODES, KEYS } from "../keys";
-import { register } from "./register";
-import { trackEvent } from "../analytics";
-
-export const actionToggleViewMode = register({
-  name: "viewMode",
-  perform(elements, appState) {
-    trackEvent("view", "mode", "view");
-    return {
-      appState: {
-        ...appState,
-        viewModeEnabled: !this.checked!(appState),
-        selectedElementIds: {},
-      },
-      commitToHistory: false,
-    };
-  },
-  checked: (appState) => appState.viewModeEnabled,
-  contextItemLabel: "labels.viewMode",
-  keyTest: (event) =>
-    !event[KEYS.CTRL_OR_CMD] && event.altKey && event.code === CODES.R,
-});

src/actions/actionToggleZenMode.tsx

@@ -1,22 +0,0 @@
-import { CODES, KEYS } from "../keys";
-import { register } from "./register";
-import { trackEvent } from "../analytics";
-
-export const actionToggleZenMode = register({
-  name: "zenMode",
-  perform(elements, appState) {
-    trackEvent("view", "mode", "zen");
-
-    return {
-      appState: {
-        ...appState,
-        zenModeEnabled: !this.checked!(appState),
-      },
-      commitToHistory: false,
-    };
-  },
-  checked: (appState) => appState.zenModeEnabled,
-  contextItemLabel: "buttons.zenMode",
-  keyTest: (event) =>
-    !event[KEYS.CTRL_OR_CMD] && event.altKey && event.code === CODES.Z,
-});

src/actions/index.ts

@@ -65,15 +65,3 @@ export {
   distributeHorizontally,
   distributeVertically,
 } from "./actionDistribute";
-
-export {
-  actionCopy,
-  actionCut,
-  actionCopyAsPng,
-  actionCopyAsSvg,
-} from "./actionClipboard";
-
-export { actionToggleGridMode } from "./actionToggleGridMode";
-export { actionToggleZenMode } from "./actionToggleZenMode";
-
-export { actionToggleStats } from "./actionToggleStats";

src/actions/manager.tsx

@@ -3,15 +3,14 @@ import {
   Action,
   ActionsManagerInterface,
   UpdaterFn,
+  ActionFilterFn,
   ActionName,
   ActionResult,
 } from "./types";
 import { ExcalidrawElement } from "../element/types";
-import { AppState, ExcalidrawProps } from "../types";
-
-// This is the <App> component, but for now we don't care about anything but its
-// `canvas` state.
-type App = { canvas: HTMLCanvasElement | null; props: ExcalidrawProps };
+import { AppState } from "../types";
+import { t } from "../i18n";
+import { ShortcutName } from "./shortcuts";
 
 export class ActionManager implements ActionsManagerInterface {
   actions = {} as ActionsManagerInterface["actions"];
@@ -19,14 +18,13 @@ export class ActionManager implements ActionsManagerInterface {
   updater: (actionResult: ActionResult | Promise<ActionResult>) => void;
 
   getAppState: () => Readonly<AppState>;
+
   getElementsIncludingDeleted: () => readonly ExcalidrawElement[];
-  app: App;
 
   constructor(
     updater: UpdaterFn,
     getAppState: () => AppState,
     getElementsIncludingDeleted: () => readonly ExcalidrawElement[],
-    app: App,
   ) {
     this.updater = (actionResult) => {
       if (actionResult && "then" in actionResult) {
@@ -39,7 +37,6 @@ export class ActionManager implements ActionsManagerInterface {
     };
     this.getAppState = getAppState;
     this.getElementsIncludingDeleted = getElementsIncludingDeleted;
-    this.app = app;
   }
 
   registerAction(action: Action) {
@@ -66,12 +63,6 @@ export class ActionManager implements ActionsManagerInterface {
     if (data.length === 0) {
       return false;
     }
-    const { viewModeEnabled } = this.getAppState();
-    if (viewModeEnabled) {
-      if (data[0].name !== "viewMode") {
-        return false;
-      }
-    }
 
     event.preventDefault();
     this.updater(
@@ -79,7 +70,6 @@ export class ActionManager implements ActionsManagerInterface {
         this.getElementsIncludingDeleted(),
         this.getAppState(),
         null,
-        this.app,
       ),
     );
     return true;
@@ -91,11 +81,43 @@ export class ActionManager implements ActionsManagerInterface {
         this.getElementsIncludingDeleted(),
         this.getAppState(),
         null,
-        this.app,
       ),
     );
   }
 
+  getContextMenuItems(actionFilter: ActionFilterFn = (action) => action) {
+    return Object.values(this.actions)
+      .filter(actionFilter)
+      .filter((action) => "contextItemLabel" in action)
+      .filter((action) =>
+        action.contextItemPredicate
+          ? action.contextItemPredicate(
+              this.getElementsIncludingDeleted(),
+              this.getAppState(),
+            )
+          : true,
+      )
+      .sort(
+        (a, b) =>
+          (a.contextMenuOrder !== undefined ? a.contextMenuOrder : 999) -
+          (b.contextMenuOrder !== undefined ? b.contextMenuOrder : 999),
+      )
+      .map((action) => ({
+        // take last bit of the label  "labels.<shortcutName>"
+        shortcutName: action.contextItemLabel?.split(".").pop() as ShortcutName,
+        label: action.contextItemLabel ? t(action.contextItemLabel) : "",
+        action: () => {
+          this.updater(
+            action.perform(
+              this.getElementsIncludingDeleted(),
+              this.getAppState(),
+              null,
+            ),
+          );
+        },
+      }));
+  }
+
   // Id is an attribute that we can use to pass in data like keys.
   // This is needed for dynamically generated action components
   // like the user list. We can use this key to extract more
@@ -110,7 +132,6 @@ export class ActionManager implements ActionsManagerInterface {
             this.getElementsIncludingDeleted(),
             this.getAppState(),
             formState,
-            this.app,
           ),
         );
       };

src/actions/shortcuts.ts

@@ -9,7 +9,7 @@ export type ShortcutName =
   | "copyStyles"
   | "pasteStyles"
   | "selectAll"
-  | "deleteSelectedElements"
+  | "delete"
   | "duplicateSelection"
   | "sendBackward"
   | "bringForward"
@@ -20,10 +20,8 @@ export type ShortcutName =
   | "group"
   | "ungroup"
   | "gridMode"
-  | "zenMode"
   | "stats"
-  | "addToLibrary"
-  | "viewMode";
+  | "addToLibrary";
 
 const shortcutMap: Record<ShortcutName, string[]> = {
   cut: [getShortcutKey("CtrlOrCmd+X")],
@@ -32,10 +30,10 @@ const shortcutMap: Record<ShortcutName, string[]> = {
   copyStyles: [getShortcutKey("CtrlOrCmd+Alt+C")],
   pasteStyles: [getShortcutKey("CtrlOrCmd+Alt+V")],
   selectAll: [getShortcutKey("CtrlOrCmd+A")],
-  deleteSelectedElements: [getShortcutKey("Del")],
+  delete: [getShortcutKey("Del")],
   duplicateSelection: [
     getShortcutKey("CtrlOrCmd+D"),
-    getShortcutKey(`Alt+${t("helpDialog.drag")}`),
+    getShortcutKey(`Alt+${t("shortcutsDialog.drag")}`),
   ],
   sendBackward: [getShortcutKey("CtrlOrCmd+[")],
   bringForward: [getShortcutKey("CtrlOrCmd+]")],
@@ -54,10 +52,8 @@ const shortcutMap: Record<ShortcutName, string[]> = {
   group: [getShortcutKey("CtrlOrCmd+G")],
   ungroup: [getShortcutKey("CtrlOrCmd+Shift+G")],
   gridMode: [getShortcutKey("CtrlOrCmd+'")],
-  zenMode: [getShortcutKey("Alt+Z")],
   stats: [],
   addToLibrary: [],
-  viewMode: [getShortcutKey("Alt+R")],
 };
 
 export const getShortcutFromShortcutName = (name: ShortcutName) => {

src/actions/types.ts

@@ -16,18 +16,12 @@ type ActionFn = (
   elements: readonly ExcalidrawElement[],
   appState: Readonly<AppState>,
   formData: any,
-  app: { canvas: HTMLCanvasElement | null },
 ) => ActionResult | Promise<ActionResult>;
 
 export type UpdaterFn = (res: ActionResult) => void;
 export type ActionFilterFn = (action: Action) => void;
 
 export type ActionName =
-  | "copy"
-  | "cut"
-  | "paste"
-  | "copyAsPng"
-  | "copyAsSvg"
   | "sendBackward"
   | "bringForward"
   | "sendToBack"
@@ -35,9 +29,6 @@ export type ActionName =
   | "copyStyles"
   | "selectAll"
   | "pasteStyles"
-  | "gridMode"
-  | "zenMode"
-  | "stats"
   | "changeStrokeColor"
   | "changeBackgroundColor"
   | "changeFillStyle"
@@ -84,8 +75,7 @@ export type ActionName =
   | "alignVerticallyCentered"
   | "alignHorizontallyCentered"
   | "distributeHorizontally"
-  | "distributeVertically"
-  | "viewMode";
+  | "distributeVertically";
 
 export interface Action {
   name: ActionName;
@@ -103,16 +93,19 @@ export interface Action {
     elements: readonly ExcalidrawElement[],
   ) => boolean;
   contextItemLabel?: string;
+  contextMenuOrder?: number;
   contextItemPredicate?: (
     elements: readonly ExcalidrawElement[],
     appState: AppState,
   ) => boolean;
-  checked?: (appState: Readonly<AppState>) => boolean;
 }
 
 export interface ActionsManagerInterface {
   actions: Record<ActionName, Action>;
   registerAction: (action: Action) => void;
   handleKeyDown: (event: KeyboardEvent) => boolean;
+  getContextMenuItems: (
+    actionFilter: ActionFilterFn,
+  ) => { label: string; action: () => void }[];
   renderAction: (name: ActionName) => React.ReactElement | null;
 }

src/analytics.ts

@@ -1,8 +1,18 @@
+export const EVENT_ACTION = "action";
+export const EVENT_ALIGN = "align";
+export const EVENT_CHANGE = "change";
+export const EVENT_DIALOG = "dialog";
+export const EVENT_EXIT = "exit";
+export const EVENT_IO = "io";
+export const EVENT_LAYER = "layer";
+export const EVENT_LIBRARY = "library";
+export const EVENT_LOAD = "load";
+export const EVENT_SHAPE = "shape";
+export const EVENT_SHARE = "share";
+export const EVENT_MAGIC = "magic";
+
 export const trackEvent =
-  typeof process !== "undefined" &&
-  process.env?.REACT_APP_GOOGLE_ANALYTICS_ID &&
-  typeof window !== "undefined" &&
-  window.gtag
+  typeof window !== "undefined" && window.gtag
     ? (category: string, name: string, label?: string, value?: number) => {
         window.gtag("event", name, {
           event_category: category,
@@ -10,9 +20,8 @@ export const trackEvent =
           value,
         });
       }
-    : typeof process !== "undefined" && process.env?.JEST_WORKER_ID
+    : typeof process !== "undefined" && process?.env?.JEST_WORKER_ID
     ? (category: string, name: string, label?: string, value?: number) => {}
     : (category: string, name: string, label?: string, value?: number) => {
-        // Uncomment the next line to track locally
-        // console.info("Track Event", category, name, label, value);
+        console.info("Track Event", category, name, label, value);
       };

src/appState.ts

@@ -2,17 +2,20 @@ import oc from "open-color";
 import {
   DEFAULT_FONT_FAMILY,
   DEFAULT_FONT_SIZE,
+  SCENE_NAME_FALLBACK,
   DEFAULT_TEXT_ALIGN,
-  GRID_SIZE,
 } from "./constants";
-import { t } from "./i18n";
-import { AppState, NormalizedZoomValue } from "./types";
-import { getDateTime } from "./utils";
+import { AppState, FlooredNumber, NormalizedZoomValue } from "./types";
 
-export const getDefaultAppState = (): Omit<
-  AppState,
-  "offsetTop" | "offsetLeft"
-> => {
+type DefaultAppState = Omit<AppState, "offsetTop" | "offsetLeft" | "name"> & {
+  /**
+   * You should override this with current appState.name, or whatever is
+   * applicable at a given place where you get default appState.
+   */
+  name: undefined;
+};
+
+export const getDefaultAppState = (): DefaultAppState => {
   return {
     appearance: "light",
     collaborators: new Map(),
@@ -42,7 +45,7 @@ export const getDefaultAppState = (): Omit<
     exportBackground: true,
     exportEmbedScene: false,
     fileHandle: null,
-    gridSize: GRID_SIZE,
+    gridSize: null,
     height: window.innerHeight,
     isBindingEnabled: true,
     isLibraryOpen: false,
@@ -51,30 +54,31 @@ export const getDefaultAppState = (): Omit<
     isRotating: false,
     lastPointerDownWith: "mouse",
     multiElement: null,
-    name: `${t("labels.untitled")}-${getDateTime()}`,
+    // for safety (because TS mostly doesn't distinguish optional types and
+    //  undefined values), we set `name` to the fallback name, but we cast it to
+    // `undefined` so that TS forces us to explicitly specify it wherever
+    // possible
+    name: (SCENE_NAME_FALLBACK as unknown) as undefined,
     openMenu: null,
     pasteDialog: { shown: false, data: null },
     previousSelectedElementIds: {},
     resizingElement: null,
     scrolledOutside: false,
-    scrollX: 0,
-    scrollY: 0,
+    scrollX: 0 as FlooredNumber,
+    scrollY: 0 as FlooredNumber,
     selectedElementIds: {},
     selectedGroupIds: {},
     selectionElement: null,
     shouldAddWatermark: false,
     shouldCacheIgnoreZoom: false,
-    showGrid: false,
-    showHelpDialog: false,
+    showShortcutsDialog: false,
     showStats: false,
     startBoundElement: null,
     suggestedBindings: [],
-    toastMessage: null,
     viewBackgroundColor: oc.white,
     width: window.innerWidth,
     zenModeEnabled: false,
     zoom: { value: 1 as NormalizedZoomValue, translation: { x: 0, y: 0 } },
-    viewModeEnabled: false,
   };
 };
 
@@ -122,7 +126,6 @@ const APP_STATE_STORAGE_CONF = (<
   exportEmbedScene: { browser: true, export: false },
   fileHandle: { browser: false, export: false },
   gridSize: { browser: true, export: true },
-  showGrid: { browser: true, export: false },
   height: { browser: false, export: false },
   isBindingEnabled: { browser: false, export: false },
   isLibraryOpen: { browser: false, export: false },
@@ -146,16 +149,14 @@ const APP_STATE_STORAGE_CONF = (<
   selectionElement: { browser: false, export: false },
   shouldAddWatermark: { browser: true, export: false },
   shouldCacheIgnoreZoom: { browser: true, export: false },
-  showHelpDialog: { browser: false, export: false },
+  showShortcutsDialog: { browser: false, export: false },
   showStats: { browser: true, export: false },
   startBoundElement: { browser: false, export: false },
   suggestedBindings: { browser: false, export: false },
-  toastMessage: { browser: false, export: false },
   viewBackgroundColor: { browser: true, export: true },
   width: { browser: false, export: false },
   zenModeEnabled: { browser: true, export: false },
   zoom: { browser: true, export: false },
-  viewModeEnabled: { browser: false, export: false },
 });
 
 const _clearAppStateForStorage = <ExportType extends "export" | "browser">(

src/charts.ts

@@ -1,3 +1,4 @@
+import { EVENT_MAGIC, trackEvent } from "./analytics";
 import colors from "./colors";
 import { DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE, ENV } from "./constants";
 import { newElement, newLinearElement, newTextElement } from "./element";
@@ -472,6 +473,7 @@ export const renderSpreadsheet = (
   x: number,
   y: number,
 ): ChartElements => {
+  trackEvent(EVENT_MAGIC, "chart", chartType, spreadsheet.values.length);
   if (chartType === "line") {
     return chartTypeLine(spreadsheet, x, y);
   }

src/components/Actions.tsx

@@ -1,22 +1,23 @@
 import React from "react";
-import { ActionManager } from "../actions/manager";
-import { getNonDeletedElements } from "../element";
+import { AppState, Zoom } from "../types";
 import { ExcalidrawElement } from "../element/types";
-import { t } from "../i18n";
-import useIsMobile from "../is-mobile";
+import { ActionManager } from "../actions/manager";
 import {
-  canChangeSharpness,
-  canHaveArrowheads,
-  getTargetElements,
   hasBackground,
   hasStroke,
+  canChangeSharpness,
   hasText,
+  canHaveArrowheads,
+  getTargetElements,
 } from "../scene";
+import { t } from "../i18n";
 import { SHAPES } from "../shapes";
-import { AppState, Zoom } from "../types";
+import { ToolButton } from "./ToolButton";
 import { capitalizeString, isTransparent, setCursorForShape } from "../utils";
 import Stack from "./Stack";
-import { ToolButton } from "./ToolButton";
+import useIsMobile from "../is-mobile";
+import { getNonDeletedElements } from "../element";
+import { trackEvent, EVENT_SHAPE, EVENT_DIALOG } from "../analytics";
 
 export const SelectedShapeActions = ({
   appState,
@@ -163,9 +164,9 @@ export const ShapesSwitcher = ({
     {SHAPES.map(({ value, icon, key }, index) => {
       const label = t(`toolBar.${value}`);
       const letter = typeof key === "string" ? key : key[0];
-      const shortcut = `${capitalizeString(letter)} ${t("helpDialog.or")} ${
-        index + 1
-      }`;
+      const shortcut = `${capitalizeString(letter)} ${t(
+        "shortcutsDialog.or",
+      )} ${index + 1}`;
       return (
         <ToolButton
           className="Shape"
@@ -180,6 +181,7 @@ export const ShapesSwitcher = ({
           aria-keyshortcuts={shortcut}
           data-testid={value}
           onChange={() => {
+            trackEvent(EVENT_SHAPE, value, "toolbar");
             setAppState({
               elementType: value,
               multiElement: null,
@@ -201,6 +203,9 @@ export const ShapesSwitcher = ({
       title={`${capitalizeString(t("toolBar.library"))} — 9`}
       aria-label={capitalizeString(t("toolBar.library"))}
       onClick={() => {
+        if (!isLibraryOpen) {
+          trackEvent(EVENT_DIALOG, "library");
+        }
         setAppState({ isLibraryOpen: !isLibraryOpen });
       }}
     />

src/components/App.tsx

@@ -2,36 +2,18 @@ import { Point, simplify } from "points-on-curve";
 import React from "react";
 import { RoughCanvas } from "roughjs/bin/canvas";
 import rough from "roughjs/bin/rough";
-import clsx from "clsx";
-
 import "../actions";
-import {
-  actionAddToLibrary,
-  actionBringForward,
-  actionBringToFront,
-  actionCopy,
-  actionCopyAsPng,
-  actionCopyAsSvg,
-  actionCopyStyles,
-  actionCut,
-  actionDeleteSelected,
-  actionDuplicateSelection,
-  actionFinalize,
-  actionGroup,
-  actionPasteStyles,
-  actionSelectAll,
-  actionSendBackward,
-  actionSendToBack,
-  actionToggleGridMode,
-  actionToggleStats,
-  actionToggleZenMode,
-  actionUngroup,
-} from "../actions";
+import { actionDeleteSelected, actionFinalize } from "../actions";
 import { createRedoAction, createUndoAction } from "../actions/actionHistory";
 import { ActionManager } from "../actions/manager";
 import { actions } from "../actions/register";
 import { ActionResult } from "../actions/types";
-import { trackEvent } from "../analytics";
+import {
+  EVENT_DIALOG,
+  EVENT_LIBRARY,
+  EVENT_SHAPE,
+  trackEvent,
+} from "../analytics";
 import { getDefaultAppState } from "../appState";
 import {
   copyToClipboard,
@@ -41,6 +23,7 @@ import {
 } from "../clipboard";
 import {
   APP_NAME,
+  CANVAS_ONLY_ACTIONS,
   CURSOR_TYPE,
   DEFAULT_VERTICAL_ALIGN,
   DRAGGING_THRESHOLD,
@@ -48,15 +31,15 @@ import {
   ELEMENT_TRANSLATE_AMOUNT,
   ENV,
   EVENT,
+  GRID_SIZE,
   LINE_CONFIRM_THRESHOLD,
   MIME_TYPES,
   POINTER_BUTTON,
   TAP_TWICE_TIMEOUT,
   TEXT_TO_CENTER_SNAP_THRESHOLD,
   TOUCH_CTX_MENU_TIMEOUT,
-  ZOOM_STEP,
 } from "../constants";
-import { loadFromBlob } from "../data";
+import { exportCanvas, loadFromBlob } from "../data";
 import { isValidLibrary } from "../data/json";
 import { Library } from "../data/library";
 import { restore } from "../data/restore";
@@ -128,7 +111,7 @@ import {
   selectGroupsForSelectedElements,
 } from "../groups";
 import { createHistory, SceneHistory } from "../history";
-import { defaultLang, getLanguage, languages, setLanguage, t } from "../i18n";
+import { t, getLanguage, setLanguage, languages, defaultLang } from "../i18n";
 import {
   CODES,
   getResizeCenterPointKey,
@@ -149,6 +132,7 @@ import {
   getSelectedElements,
   isOverScrollBars,
   isSomeElementSelected,
+  normalizeScroll,
 } from "../scene";
 import Scene from "../scene/Scene";
 import { SceneState, ScrollBars } from "../scene/types";
@@ -164,6 +148,7 @@ import {
 import {
   debounce,
   distance,
+  getNewSceneName,
   isInputLike,
   isToolIcon,
   isWritableElement,
@@ -176,12 +161,9 @@ import {
   viewportCoordsToSceneCoords,
   withBatchedUpdates,
 } from "../utils";
-import { isMobile } from "../is-mobile";
-import ContextMenu, { ContextMenuOption } from "./ContextMenu";
+import ContextMenu from "./ContextMenu";
 import LayerUI from "./LayerUI";
 import { Stats } from "./Stats";
-import { Toast } from "./Toast";
-import { actionToggleViewMode } from "../actions/actionToggleViewMode";
 
 const { history } = createHistory();
 
@@ -271,7 +253,6 @@ export type ExcalidrawImperativeAPI = {
   };
   setScrollToCenter: InstanceType<typeof App>["setScrollToCenter"];
   getSceneElements: InstanceType<typeof App>["getSceneElements"];
-  getAppState: () => InstanceType<typeof App>["state"];
   readyPromise: ResolvablePromise<ExcalidrawImperativeAPI>;
   ready: true;
 };
@@ -298,15 +279,14 @@ class App extends React.Component<ExcalidrawProps, AppState> {
       offsetLeft,
       offsetTop,
       excalidrawRef,
-      viewModeEnabled = false,
     } = props;
     this.state = {
       ...defaultAppState,
+      name: getNewSceneName(),
       isLoading: true,
       width,
       height,
       ...this.getCanvasOffsets({ offsetLeft, offsetTop }),
-      viewModeEnabled,
     };
     if (excalidrawRef) {
       const readyPromise =
@@ -324,7 +304,6 @@ class App extends React.Component<ExcalidrawProps, AppState> {
         },
         setScrollToCenter: this.setScrollToCenter,
         getSceneElements: this.getSceneElements,
-        getAppState: () => this.state,
       } as const;
       if (typeof excalidrawRef === "function") {
         excalidrawRef(api);
@@ -339,7 +318,6 @@ class App extends React.Component<ExcalidrawProps, AppState> {
       this.syncActionResult,
       () => this.state,
       () => this.scene.getElementsIncludingDeleted(),
-      this,
     );
     this.actionManager.registerAll(actions);
 
@@ -347,62 +325,6 @@ class App extends React.Component<ExcalidrawProps, AppState> {
     this.actionManager.registerAction(createRedoAction(history));
   }
 
-  private renderCanvas() {
-    const canvasScale = window.devicePixelRatio;
-    const {
-      width: canvasDOMWidth,
-      height: canvasDOMHeight,
-      viewModeEnabled,
-    } = this.state;
-    const canvasWidth = canvasDOMWidth * canvasScale;
-    const canvasHeight = canvasDOMHeight * canvasScale;
-    if (viewModeEnabled) {
-      return (
-        <canvas
-          id="canvas"
-          style={{
-            width: canvasDOMWidth,
-            height: canvasDOMHeight,
-            cursor: "grabbing",
-          }}
-          width={canvasWidth}
-          height={canvasHeight}
-          ref={this.handleCanvasRef}
-          onContextMenu={this.handleCanvasContextMenu}
-          onPointerMove={this.handleCanvasPointerMove}
-          onPointerUp={this.removePointer}
-          onPointerCancel={this.removePointer}
-          onTouchMove={this.handleTouchMove}
-          onPointerDown={this.handleCanvasPointerDown}
-        >
-          {t("labels.drawingCanvas")}
-        </canvas>
-      );
-    }
-    return (
-      <canvas
-        id="canvas"
-        style={{
-          width: canvasDOMWidth,
-          height: canvasDOMHeight,
-        }}
-        width={canvasWidth}
-        height={canvasHeight}
-        ref={this.handleCanvasRef}
-        onContextMenu={this.handleCanvasContextMenu}
-        onPointerDown={this.handleCanvasPointerDown}
-        onDoubleClick={this.handleCanvasDoubleClick}
-        onPointerMove={this.handleCanvasPointerMove}
-        onPointerUp={this.removePointer}
-        onPointerCancel={this.removePointer}
-        onTouchMove={this.handleTouchMove}
-        onDrop={this.handleCanvasOnDrop}
-      >
-        {t("labels.drawingCanvas")}
-      </canvas>
-    );
-  }
-
   public render() {
     const {
       zenModeEnabled,
@@ -410,19 +332,20 @@ class App extends React.Component<ExcalidrawProps, AppState> {
       height: canvasDOMHeight,
       offsetTop,
       offsetLeft,
-      viewModeEnabled,
     } = this.state;
 
     const { onCollabButtonClick, onExportToBackend, renderFooter } = this.props;
+    const canvasScale = window.devicePixelRatio;
+
+    const canvasWidth = canvasDOMWidth * canvasScale;
+    const canvasHeight = canvasDOMHeight * canvasScale;
 
     const DEFAULT_PASTE_X = canvasDOMWidth / 2;
     const DEFAULT_PASTE_Y = canvasDOMHeight / 2;
 
     return (
       <div
-        className={clsx("excalidraw", {
-          "excalidraw--view-mode": viewModeEnabled,
-        })}
+        className="excalidraw"
         ref={this.excalidrawContainerRef}
         style={{
           width: canvasDOMWidth,
@@ -452,23 +375,36 @@ class App extends React.Component<ExcalidrawProps, AppState> {
           isCollaborating={this.props.isCollaborating || false}
           onExportToBackend={onExportToBackend}
           renderCustomFooter={renderFooter}
-          viewModeEnabled={viewModeEnabled}
         />
         {this.state.showStats && (
           <Stats
-            setAppState={this.setAppState}
             appState={this.state}
             elements={this.scene.getElements()}
             onClose={this.toggleStats}
           />
         )}
-        {this.state.toastMessage !== null && (
-          <Toast
-            message={this.state.toastMessage}
-            clearToast={this.clearToast}
-          />
-        )}
-        <main>{this.renderCanvas()}</main>
+        <main>
+          <canvas
+            id="canvas"
+            style={{
+              width: canvasDOMWidth,
+              height: canvasDOMHeight,
+            }}
+            width={canvasWidth}
+            height={canvasHeight}
+            ref={this.handleCanvasRef}
+            onContextMenu={this.handleCanvasContextMenu}
+            onPointerDown={this.handleCanvasPointerDown}
+            onDoubleClick={this.handleCanvasDoubleClick}
+            onPointerMove={this.handleCanvasPointerMove}
+            onPointerUp={this.removePointer}
+            onPointerCancel={this.removePointer}
+            onTouchMove={this.handleTouchMove}
+            onDrop={this.handleCanvasOnDrop}
+          >
+            {t("labels.drawingCanvas")}
+          </canvas>
+        </main>
       </div>
     );
   }
@@ -508,13 +444,6 @@ class App extends React.Component<ExcalidrawProps, AppState> {
         if (actionResult.commitToHistory) {
           history.resumeRecording();
         }
-
-        let viewModeEnabled = actionResult?.appState?.viewModeEnabled || false;
-
-        if (typeof this.props.viewModeEnabled !== "undefined") {
-          viewModeEnabled = this.props.viewModeEnabled;
-        }
-
         this.setState(
           (state) => ({
             ...actionResult.appState,
@@ -524,7 +453,6 @@ class App extends React.Component<ExcalidrawProps, AppState> {
             height: state.height,
             offsetTop: state.offsetTop,
             offsetLeft: state.offsetLeft,
-            viewModeEnabled,
           }),
           () => {
             if (actionResult.syncHistory) {
@@ -578,6 +506,7 @@ class App extends React.Component<ExcalidrawProps, AppState> {
         )
       ) {
         await Library.importLibrary(blob);
+        trackEvent(EVENT_LIBRARY, "import");
         this.setState({
           isLibraryOpen: true,
         });
@@ -601,6 +530,7 @@ class App extends React.Component<ExcalidrawProps, AppState> {
       this.scene.replaceAllElements([]);
       this.setState((state) => ({
         ...getDefaultAppState(),
+        name: getNewSceneName(),
         isLoading: opts?.resetLoadingState ? false : state.isLoading,
         appearance: this.state.appearance,
       }));
@@ -707,6 +637,7 @@ class App extends React.Component<ExcalidrawProps, AppState> {
     }
 
     this.scene.addCallback(this.onSceneUpdated);
+
     this.addEventListeners();
 
     // optim to avoid extra render on init
@@ -773,16 +704,25 @@ class App extends React.Component<ExcalidrawProps, AppState> {
   }
 
   private addEventListeners() {
-    this.removeEventListeners();
     document.addEventListener(EVENT.COPY, this.onCopy);
+    document.addEventListener(EVENT.PASTE, this.pasteFromClipboard);
+    document.addEventListener(EVENT.CUT, this.onCut);
+
     document.addEventListener(EVENT.KEYDOWN, this.onKeyDown, false);
     document.addEventListener(EVENT.KEYUP, this.onKeyUp, { passive: true });
     document.addEventListener(
       EVENT.MOUSE_MOVE,
       this.updateCurrentCursorPosition,
     );
+    window.addEventListener(EVENT.RESIZE, this.onResize, false);
+    window.addEventListener(EVENT.UNLOAD, this.onUnload, false);
+    window.addEventListener(EVENT.BLUR, this.onBlur, false);
+    window.addEventListener(EVENT.DRAG_OVER, this.disableEvent, false);
+    window.addEventListener(EVENT.DROP, this.disableEvent, false);
+
     // rerender text elements on font load to fix #637 && #1553
     document.fonts?.addEventListener?.("loadingdone", this.onFontLoaded);
+
     // Safari-only desktop pinch zoom
     document.addEventListener(
       EVENT.GESTURE_START,
@@ -799,18 +739,6 @@ class App extends React.Component<ExcalidrawProps, AppState> {
       this.onGestureEnd as any,
       false,
     );
-    if (this.state.viewModeEnabled) {
-      return;
-    }
-
-    document.addEventListener(EVENT.PASTE, this.pasteFromClipboard);
-    document.addEventListener(EVENT.CUT, this.onCut);
-
-    window.addEventListener(EVENT.RESIZE, this.onResize, false);
-    window.addEventListener(EVENT.UNLOAD, this.onUnload, false);
-    window.addEventListener(EVENT.BLUR, this.onBlur, false);
-    window.addEventListener(EVENT.DRAG_OVER, this.disableEvent, false);
-    window.addEventListener(EVENT.DROP, this.disableEvent, false);
   }
 
   componentDidUpdate(prevProps: ExcalidrawProps, prevState: AppState) {
@@ -833,17 +761,6 @@ class App extends React.Component<ExcalidrawProps, AppState> {
       });
     }
 
-    if (prevProps.viewModeEnabled !== this.props.viewModeEnabled) {
-      this.setState(
-        { viewModeEnabled: !!this.props.viewModeEnabled },
-        this.addEventListeners,
-      );
-    }
-
-    if (prevState.viewModeEnabled !== this.state.viewModeEnabled) {
-      this.addEventListeners();
-    }
-
     document
       .querySelector(".excalidraw")
       ?.classList.toggle("Appearance_dark", this.state.appearance === "dark");
@@ -991,6 +908,43 @@ class App extends React.Component<ExcalidrawProps, AppState> {
     copyToClipboard(this.scene.getElements(), this.state);
   };
 
+  private copyToClipboardAsPng = async () => {
+    const elements = this.scene.getElements();
+
+    const selectedElements = getSelectedElements(elements, this.state);
+    try {
+      await exportCanvas(
+        "clipboard",
+        selectedElements.length ? selectedElements : elements,
+        this.state,
+        this.canvas!,
+        this.state,
+      );
+    } catch (error) {
+      console.error(error);
+      this.setState({ errorMessage: error.message });
+    }
+  };
+
+  private copyToClipboardAsSvg = async () => {
+    const selectedElements = getSelectedElements(
+      this.scene.getElements(),
+      this.state,
+    );
+    try {
+      await exportCanvas(
+        "clipboard-svg",
+        selectedElements.length ? selectedElements : this.scene.getElements(),
+        this.state,
+        this.canvas!,
+        this.state,
+      );
+    } catch (error) {
+      console.error(error);
+      this.setState({ errorMessage: error.message });
+    }
+  };
+
   private static resetTapTwice() {
     didTapTwice = false;
   }
@@ -1088,12 +1042,7 @@ class App extends React.Component<ExcalidrawProps, AppState> {
     const dy = y - elementsCenterY;
     const groupIdMap = new Map();
 
-    const [gridX, gridY] = getGridPoint(
-      dx,
-      dy,
-      this.state.showGrid,
-      this.state.gridSize,
-    );
+    const [gridX, gridY] = getGridPoint(dx, dy, this.state.gridSize);
 
     const oldIdToDuplicatedId = new Map();
     const newElements = clipboardElements.map((element) => {
@@ -1188,6 +1137,7 @@ class App extends React.Component<ExcalidrawProps, AppState> {
 
   toggleLock = () => {
     this.setState((prevState) => {
+      trackEvent(EVENT_SHAPE, "lock", !prevState.elementLocked ? "on" : "off");
       return {
         elementLocked: !prevState.elementLocked,
         elementType: prevState.elementLocked
@@ -1198,18 +1148,24 @@ class App extends React.Component<ExcalidrawProps, AppState> {
   };
 
   toggleZenMode = () => {
-    this.actionManager.executeAction(actionToggleZenMode);
+    this.setState({
+      zenModeEnabled: !this.state.zenModeEnabled,
+    });
   };
 
   toggleGridMode = () => {
-    this.actionManager.executeAction(actionToggleGridMode);
+    this.setState({
+      gridSize: this.state.gridSize ? null : GRID_SIZE,
+    });
   };
 
   toggleStats = () => {
     if (!this.state.showStats) {
-      trackEvent("dialog", "stats");
+      trackEvent(EVENT_DIALOG, "stats");
     }
-    this.actionManager.executeAction(actionToggleStats);
+    this.setState({
+      showStats: !this.state.showStats,
+    });
   };
 
   setScrollToCenter = (remoteElements: readonly ExcalidrawElement[]) => {
@@ -1222,10 +1178,6 @@ class App extends React.Component<ExcalidrawProps, AppState> {
     });
   };
 
-  clearToast = () => {
-    this.setState({ toastMessage: null });
-  };
-
   public updateScene = withBatchedUpdates((sceneData: SceneData) => {
     if (sceneData.commitToHistory) {
       history.resumeRecording();
@@ -1295,29 +1247,41 @@ class App extends React.Component<ExcalidrawProps, AppState> {
 
     if (event.key === KEYS.QUESTION_MARK) {
       this.setState({
-        showHelpDialog: true,
+        showShortcutsDialog: true,
       });
     }
 
+    if (!event[KEYS.CTRL_OR_CMD] && event.altKey && event.code === CODES.Z) {
+      this.toggleZenMode();
+    }
+
+    if (event[KEYS.CTRL_OR_CMD] && event.code === CODES.QUOTE) {
+      this.toggleGridMode();
+    }
+    if (event[KEYS.CTRL_OR_CMD]) {
+      this.setState({ isBindingEnabled: false });
+    }
+
+    if (event.code === CODES.C && event.altKey && event.shiftKey) {
+      this.copyToClipboardAsPng();
+      event.preventDefault();
+      return;
+    }
+
     if (this.actionManager.handleKeyDown(event)) {
       return;
     }
 
-    if (this.state.viewModeEnabled) {
-      return;
-    }
-
-    if (event[KEYS.CTRL_OR_CMD]) {
-      this.setState({ isBindingEnabled: false });
-    }
-
     if (event.code === CODES.NINE) {
+      if (!this.state.isLibraryOpen) {
+        trackEvent(EVENT_DIALOG, "library");
+      }
       this.setState({ isLibraryOpen: !this.state.isLibraryOpen });
     }
 
     if (isArrowKey(event.key)) {
       const step =
-        (this.state.showGrid &&
+        (this.state.gridSize &&
           (event.shiftKey ? ELEMENT_TRANSLATE_AMOUNT : this.state.gridSize)) ||
         (event.shiftKey
           ? ELEMENT_SHIFT_TRANSLATE_AMOUNT
@@ -1396,6 +1360,7 @@ class App extends React.Component<ExcalidrawProps, AppState> {
     ) {
       const shape = findShapeByKey(event.key);
       if (shape) {
+        trackEvent(EVENT_SHAPE, shape, "shortcut");
         this.selectShapeTool(shape);
       } else if (event.key === KEYS.Q) {
         this.toggleLock();
@@ -1779,6 +1744,7 @@ class App extends React.Component<ExcalidrawProps, AppState> {
     resetCursor();
 
     if (!event[KEYS.CTRL_OR_CMD]) {
+      trackEvent(EVENT_SHAPE, "text", "double-click");
       this.startTextEditing({
         sceneX,
         sceneY,
@@ -1815,8 +1781,8 @@ class App extends React.Component<ExcalidrawProps, AppState> {
       const scaleFactor = distance / gesture.initialDistance;
 
       this.setState(({ zoom, scrollX, scrollY, offsetLeft, offsetTop }) => ({
-        scrollX: scrollX + deltaX / zoom.value,
-        scrollY: scrollY + deltaY / zoom.value,
+        scrollX: normalizeScroll(scrollX + deltaX / zoom.value),
+        scrollY: normalizeScroll(scrollY + deltaY / zoom.value),
         zoom: getNewZoom(
           getNormalizedZoom(initialScale * scaleFactor),
           zoom,
@@ -1859,7 +1825,6 @@ class App extends React.Component<ExcalidrawProps, AppState> {
         scenePointerX,
         scenePointerY,
         this.state.editingLinearElement,
-        this.state.showGrid,
         this.state.gridSize,
       );
       if (editingLinearElement !== this.state.editingLinearElement) {
@@ -2118,16 +2083,14 @@ class App extends React.Component<ExcalidrawProps, AppState> {
 
     lastPointerUp = onPointerUp;
 
-    if (!this.state.viewModeEnabled) {
-      window.addEventListener(EVENT.POINTER_MOVE, onPointerMove);
-      window.addEventListener(EVENT.POINTER_UP, onPointerUp);
-      window.addEventListener(EVENT.KEYDOWN, onKeyDown);
-      window.addEventListener(EVENT.KEYUP, onKeyUp);
-      pointerDownState.eventListeners.onMove = onPointerMove;
-      pointerDownState.eventListeners.onUp = onPointerUp;
-      pointerDownState.eventListeners.onKeyUp = onKeyUp;
-      pointerDownState.eventListeners.onKeyDown = onKeyDown;
-    }
+    window.addEventListener(EVENT.POINTER_MOVE, onPointerMove);
+    window.addEventListener(EVENT.POINTER_UP, onPointerUp);
+    window.addEventListener(EVENT.KEYDOWN, onKeyDown);
+    window.addEventListener(EVENT.KEYUP, onKeyUp);
+    pointerDownState.eventListeners.onMove = onPointerMove;
+    pointerDownState.eventListeners.onUp = onPointerUp;
+    pointerDownState.eventListeners.onKeyUp = onKeyUp;
+    pointerDownState.eventListeners.onKeyDown = onKeyDown;
   };
 
   private maybeOpenContextMenuAfterPointerDownOnTouchDevices = (
@@ -2177,8 +2140,7 @@ class App extends React.Component<ExcalidrawProps, AppState> {
       !(
         gesture.pointers.size === 0 &&
         (event.button === POINTER_BUTTON.WHEEL ||
-          (event.button === POINTER_BUTTON.MAIN && isHoldingSpace) ||
-          this.state.viewModeEnabled)
+          (event.button === POINTER_BUTTON.MAIN && isHoldingSpace))
       )
     ) {
       return false;
@@ -2231,8 +2193,12 @@ class App extends React.Component<ExcalidrawProps, AppState> {
       }
 
       this.setState({
-        scrollX: this.state.scrollX - deltaX / this.state.zoom.value,
-        scrollY: this.state.scrollY - deltaY / this.state.zoom.value,
+        scrollX: normalizeScroll(
+          this.state.scrollX - deltaX / this.state.zoom.value,
+        ),
+        scrollY: normalizeScroll(
+          this.state.scrollY - deltaY / this.state.zoom.value,
+        ),
       });
     });
     const teardown = withBatchedUpdates(
@@ -2289,12 +2255,7 @@ class App extends React.Component<ExcalidrawProps, AppState> {
     return {
       origin,
       originInGrid: tupleToCoors(
-        getGridPoint(
-          origin.x,
-          origin.y,
-          this.state.showGrid,
-          this.state.gridSize,
-        ),
+        getGridPoint(origin.x, origin.y, this.state.gridSize),
       ),
       scrollbars: isOverScrollBars(
         currentScrollBars,
@@ -2650,8 +2611,7 @@ class App extends React.Component<ExcalidrawProps, AppState> {
       const [gridX, gridY] = getGridPoint(
         pointerDownState.origin.x,
         pointerDownState.origin.y,
-        elementType === "draw" ? false : this.state.showGrid,
-        this.state.gridSize,
+        elementType === "draw" ? null : this.state.gridSize,
       );
 
       /* If arrow is pre-arrowheads, it will have undefined for both start and end arrowheads.
@@ -2713,7 +2673,6 @@ class App extends React.Component<ExcalidrawProps, AppState> {
     const [gridX, gridY] = getGridPoint(
       pointerDownState.origin.x,
       pointerDownState.origin.y,
-      this.state.showGrid,
       this.state.gridSize,
     );
     const element = newElement({
@@ -2803,7 +2762,6 @@ class App extends React.Component<ExcalidrawProps, AppState> {
       const [gridX, gridY] = getGridPoint(
         pointerCoords.x,
         pointerCoords.y,
-        this.state.showGrid,
         this.state.gridSize,
       );
 
@@ -2876,7 +2834,6 @@ class App extends React.Component<ExcalidrawProps, AppState> {
           const [dragX, dragY] = getGridPoint(
             pointerCoords.x - pointerDownState.drag.offset.x,
             pointerCoords.y - pointerDownState.drag.offset.y,
-            this.state.showGrid,
             this.state.gridSize,
           );
 
@@ -2929,7 +2886,6 @@ class App extends React.Component<ExcalidrawProps, AppState> {
                 const [originDragX, originDragY] = getGridPoint(
                   pointerDownState.origin.x - pointerDownState.drag.offset.x,
                   pointerDownState.origin.y - pointerDownState.drag.offset.y,
-                  this.state.showGrid,
                   this.state.gridSize,
                 );
                 mutateElement(duplicatedElement, {
@@ -3056,7 +3012,9 @@ class App extends React.Component<ExcalidrawProps, AppState> {
       const x = event.clientX;
       const dx = x - pointerDownState.lastCoords.x;
       this.setState({
-        scrollX: this.state.scrollX - dx / this.state.zoom.value,
+        scrollX: normalizeScroll(
+          this.state.scrollX - dx / this.state.zoom.value,
+        ),
       });
       pointerDownState.lastCoords.x = x;
       return true;
@@ -3066,7 +3024,9 @@ class App extends React.Component<ExcalidrawProps, AppState> {
       const y = event.clientY;
       const dy = y - pointerDownState.lastCoords.y;
       this.setState({
-        scrollY: this.state.scrollY - dy / this.state.zoom.value,
+        scrollY: normalizeScroll(
+          this.state.scrollY - dy / this.state.zoom.value,
+        ),
       });
       pointerDownState.lastCoords.y = y;
       return true;
@@ -3184,7 +3144,7 @@ class App extends React.Component<ExcalidrawProps, AppState> {
             );
           }
           this.setState({ suggestedBindings: [], startBoundElement: null });
-          if (!elementLocked && elementType !== "draw") {
+          if (!elementLocked) {
             resetCursor();
             this.setState((prevState) => ({
               draggingElement: null,
@@ -3331,7 +3291,7 @@ class App extends React.Component<ExcalidrawProps, AppState> {
         return;
       }
 
-      if (!elementLocked && elementType !== "draw" && draggingElement) {
+      if (!elementLocked && draggingElement) {
         this.setState((prevState) => ({
           selectedElementIds: {
             ...prevState.selectedElementIds,
@@ -3355,7 +3315,7 @@ class App extends React.Component<ExcalidrawProps, AppState> {
         );
       }
 
-      if (!elementLocked && elementType !== "draw") {
+      if (!elementLocked) {
         resetCursor();
         this.setState({
           draggingElement: null,
@@ -3586,7 +3546,6 @@ class App extends React.Component<ExcalidrawProps, AppState> {
       const [gridX, gridY] = getGridPoint(
         pointerCoords.x,
         pointerCoords.y,
-        this.state.showGrid,
         this.state.gridSize,
       );
       dragNewElement(
@@ -3625,13 +3584,15 @@ class App extends React.Component<ExcalidrawProps, AppState> {
     const [resizeX, resizeY] = getGridPoint(
       pointerCoords.x - pointerDownState.resize.offset.x,
       pointerCoords.y - pointerDownState.resize.offset.y,
-      this.state.showGrid,
       this.state.gridSize,
     );
     if (
       transformElements(
         pointerDownState,
         transformHandleType,
+        (newTransformHandle) => {
+          pointerDownState.resize.handleType = newTransformHandle;
+        },
         selectedElements,
         pointerDownState.resize.arrowDirection,
         getRotateWithDiscreteAngleKey(event),
@@ -3661,87 +3622,46 @@ class App extends React.Component<ExcalidrawProps, AppState> {
       this.state,
     );
 
-    const maybeGroupAction = actionGroup.contextItemPredicate!(
-      this.actionManager.getElementsIncludingDeleted(),
-      this.actionManager.getAppState(),
-    );
-
-    const maybeUngroupAction = actionUngroup.contextItemPredicate!(
-      this.actionManager.getElementsIncludingDeleted(),
-      this.actionManager.getAppState(),
-    );
-
-    const separator = "separator";
-
-    const _isMobile = isMobile();
-
     const elements = this.scene.getElements();
     const element = this.getElementAtPosition(x, y);
-    const options: ContextMenuOption[] = [];
-    if (probablySupportsClipboardBlob && elements.length > 0) {
-      options.push(actionCopyAsPng);
-    }
-
-    if (probablySupportsClipboardWriteText && elements.length > 0) {
-      options.push(actionCopyAsSvg);
-    }
     if (!element) {
-      const viewModeOptions: ContextMenuOption[] = [
-        ...options,
-        actionToggleStats,
-      ];
-
-      if (typeof this.props.viewModeEnabled === "undefined") {
-        viewModeOptions.push(actionToggleViewMode);
-      }
-
-      ContextMenu.push({
-        options: viewModeOptions,
-        top: clientY,
-        left: clientX,
-        actionManager: this.actionManager,
-        appState: this.state,
-      });
-
-      if (this.state.viewModeEnabled) {
-        return;
-      }
-
       ContextMenu.push({
         options: [
-          _isMobile &&
-            navigator.clipboard && {
-              name: "paste",
-              perform: (elements, appStates) => {
-                this.pasteFromClipboard(null);
-                return {
-                  commitToHistory: false,
-                };
-              },
-              contextItemLabel: "labels.paste",
-            },
-          _isMobile && navigator.clipboard && separator,
+          navigator.clipboard && {
+            shortcutName: "paste",
+            label: t("labels.paste"),
+            action: () => this.pasteFromClipboard(null),
+          },
           probablySupportsClipboardBlob &&
-            elements.length > 0 &&
-            actionCopyAsPng,
+            elements.length > 0 && {
+              shortcutName: "copyAsPng",
+              label: t("labels.copyAsPng"),
+              action: this.copyToClipboardAsPng,
+            },
           probablySupportsClipboardWriteText &&
-            elements.length > 0 &&
-            actionCopyAsSvg,
-          ((probablySupportsClipboardBlob && elements.length > 0) ||
-            (probablySupportsClipboardWriteText && elements.length > 0)) &&
-            separator,
-          actionSelectAll,
-          separator,
-          actionToggleGridMode,
-          actionToggleZenMode,
-          typeof this.props.viewModeEnabled === "undefined" &&
-            actionToggleViewMode,
-          actionToggleStats,
+            elements.length > 0 && {
+              shortcutName: "copyAsSvg",
+              label: t("labels.copyAsSvg"),
+              action: this.copyToClipboardAsSvg,
+            },
+          ...this.actionManager.getContextMenuItems((action) =>
+            CANVAS_ONLY_ACTIONS.includes(action.name),
+          ),
+          {
+            checked: this.state.gridSize !== null,
+            shortcutName: "gridMode",
+            label: t("labels.gridMode"),
+            action: this.toggleGridMode,
+          },
+          {
+            checked: this.state.showStats,
+            shortcutName: "stats",
+            label: t("stats.title"),
+            action: this.toggleStats,
+          },
         ],
         top: clientY,
         left: clientX,
-        actionManager: this.actionManager,
-        appState: this.state,
       });
       return;
     }
@@ -3750,55 +3670,39 @@ class App extends React.Component<ExcalidrawProps, AppState> {
       this.setState({ selectedElementIds: { [element.id]: true } });
     }
 
-    if (this.state.viewModeEnabled) {
-      ContextMenu.push({
-        options: [navigator.clipboard && actionCopy, ...options],
-        top: clientY,
-        left: clientX,
-        actionManager: this.actionManager,
-        appState: this.state,
-      });
-      return;
-    }
-
     ContextMenu.push({
       options: [
-        _isMobile && actionCut,
-        _isMobile && navigator.clipboard && actionCopy,
-        _isMobile &&
-          navigator.clipboard && {
-            name: "paste",
-            perform: (elements, appStates) => {
-              this.pasteFromClipboard(null);
-              return {
-                commitToHistory: false,
-              };
-            },
-            contextItemLabel: "labels.paste",
-          },
-        _isMobile && separator,
-        ...options,
-        separator,
-        actionCopyStyles,
-        actionPasteStyles,
-        separator,
-        maybeGroupAction && actionGroup,
-        maybeUngroupAction && actionUngroup,
-        (maybeGroupAction || maybeUngroupAction) && separator,
-        actionAddToLibrary,
-        separator,
-        actionSendBackward,
-        actionBringForward,
-        actionSendToBack,
-        actionBringToFront,
-        separator,
-        actionDuplicateSelection,
-        actionDeleteSelected,
+        {
+          shortcutName: "cut",
+          label: t("labels.cut"),
+          action: this.cutAll,
+        },
+        navigator.clipboard && {
+          shortcutName: "copy",
+          label: t("labels.copy"),
+          action: this.copyAll,
+        },
+        navigator.clipboard && {
+          shortcutName: "paste",
+          label: t("labels.paste"),
+          action: () => this.pasteFromClipboard(null),
+        },
+        probablySupportsClipboardBlob && {
+          shortcutName: "copyAsPng",
+          label: t("labels.copyAsPng"),
+          action: this.copyToClipboardAsPng,
+        },
+        probablySupportsClipboardWriteText && {
+          shortcutName: "copyAsSvg",
+          label: t("labels.copyAsSvg"),
+          action: this.copyToClipboardAsSvg,
+        },
+        ...this.actionManager.getContextMenuItems(
+          (action) => !CANVAS_ONLY_ACTIONS.includes(action.name),
+        ),
       ],
       top: clientY,
       left: clientX,
-      actionManager: this.actionManager,
-      appState: this.state,
     });
   };
 
@@ -3829,15 +3733,9 @@ class App extends React.Component<ExcalidrawProps, AppState> {
         }, 1000);
       }
 
-      let newZoom = this.state.zoom.value - delta / 100;
-      // increase zoom steps the more zoomed-in we are (applies to >100% only)
-      newZoom += Math.log10(Math.max(1, this.state.zoom.value)) * -sign;
-      // round to nearest step
-      newZoom = Math.round(newZoom * ZOOM_STEP * 100) / (ZOOM_STEP * 100);
-
       this.setState(({ zoom, offsetLeft, offsetTop }) => ({
         zoom: getNewZoom(
-          getNormalizedZoom(newZoom),
+          getNormalizedZoom(zoom.value - delta / 100),
           zoom,
           { left: offsetLeft, top: offsetTop },
           {
@@ -3860,14 +3758,14 @@ class App extends React.Component<ExcalidrawProps, AppState> {
     if (event.shiftKey) {
       this.setState(({ zoom, scrollX }) => ({
         // on Mac, shift+wheel tends to result in deltaX
-        scrollX: scrollX - (deltaY || deltaX) / zoom.value,
+        scrollX: normalizeScroll(scrollX - (deltaY || deltaX) / zoom.value),
       }));
       return;
     }
 
     this.setState(({ zoom, scrollX, scrollY }) => ({
-      scrollX: scrollX - deltaX / zoom.value,
-      scrollY: scrollY - deltaY / zoom.value,
+      scrollX: normalizeScroll(scrollX - deltaX / zoom.value),
+      scrollY: normalizeScroll(scrollY - deltaY / zoom.value),
     }));
   });
 
@@ -3927,9 +3825,7 @@ class App extends React.Component<ExcalidrawProps, AppState> {
   };
 
   private resetShouldCacheIgnoreZoomDebounced = debounce(() => {
-    if (!this.unmounted) {
-      this.setState({ shouldCacheIgnoreZoom: false });
-    }
+    this.setState({ shouldCacheIgnoreZoom: false });
   }, 300);
 
   private getCanvasOffsets(offsets?: {

src/components/Avatar.scss

@@ -1,4 +1,4 @@
-@import "../css/variables.module";
+@import "../css/_variables";
 
 .excalidraw {
   .Avatar {

src/components/BackgroundPickerAndDarkModeToggle.tsx

@@ -1,5 +1,6 @@
 import React from "react";
 import { ActionManager } from "../actions/manager";
+import { EVENT_CHANGE, trackEvent } from "../analytics";
 import { AppState } from "../types";
 import { DarkModeToggle } from "./DarkModeToggle";
 
@@ -18,6 +19,8 @@ export const BackgroundPickerAndDarkModeToggle = ({
       <DarkModeToggle
         value={appState.appearance}
         onChange={(appearance) => {
+          // TODO: track the theme on the first load too
+          trackEvent(EVENT_CHANGE, "theme", appearance);
           setAppState({ appearance });
         }}
       />

src/components/CollabButton.scss

@@ -1,4 +1,4 @@
-@import "../css/variables.module";
+@import "../css/_variables";
 
 .excalidraw {
   .CollabButton.is-collaborating {

src/components/CollabButton.tsx

@@ -6,6 +6,7 @@ import useIsMobile from "../is-mobile";
 import { users } from "./icons";
 
 import "./CollabButton.scss";
+import { EVENT_DIALOG, trackEvent } from "../analytics";
 
 const CollabButton = ({
   isCollaborating,
@@ -22,7 +23,10 @@ const CollabButton = ({
         className={clsx("CollabButton", {
           "is-collaborating": isCollaborating,
         })}
-        onClick={onClick}
+        onClick={() => {
+          trackEvent(EVENT_DIALOG, "collaboration");
+          onClick();
+        }}
         icon={users}
         type="button"
         title={t("buttons.roomDialog")}

src/components/ColorPicker.scss

@@ -1,4 +1,4 @@
-@import "../css/variables.module";
+@import "../css/_variables";
 
 .excalidraw {
   .color-picker {

src/components/ContextMenu.scss

@@ -1,4 +1,4 @@
-@import "../css/variables.module";
+@import "../css/_variables";
 
 .excalidraw {
   .context-menu {
@@ -9,10 +9,9 @@
     list-style: none;
     user-select: none;
     margin: -0.25rem 0 0 0.125rem;
-    padding: 0.5rem 0;
+    padding: 0.25rem 0;
     background-color: var(--popup-secondary-background-color);
     border: 1px solid var(--button-gray-3);
-    cursor: default;
   }
 
   .context-menu button {
@@ -55,7 +54,6 @@
     .context-menu-option__shortcut {
       justify-self: end;
       opacity: 0.6;
-      font-family: inherit;
       font-size: 0.7rem;
     }
   }
@@ -89,9 +87,4 @@
       }
     }
   }
-
-  .context-menu-option-separator {
-    border: none;
-    border-top: 1px solid $oc-gray-5;
-  }
 }

src/components/ContextMenu.tsx

@@ -2,36 +2,28 @@ import React from "react";
 import { render, unmountComponentAtNode } from "react-dom";
 import clsx from "clsx";
 import { Popover } from "./Popover";
-import { t } from "../i18n";
 
 import "./ContextMenu.scss";
 import {
   getShortcutFromShortcutName,
   ShortcutName,
 } from "../actions/shortcuts";
-import { Action } from "../actions/types";
-import { ActionManager } from "../actions/manager";
-import { AppState } from "../types";
 
-export type ContextMenuOption = "separator" | Action;
+type ContextMenuOption = {
+  checked?: boolean;
+  shortcutName: ShortcutName;
+  label: string;
+  action(): void;
+};
 
-type ContextMenuProps = {
+type Props = {
   options: ContextMenuOption[];
   onCloseRequest?(): void;
   top: number;
   left: number;
-  actionManager: ActionManager;
-  appState: Readonly<AppState>;
 };
 
-const ContextMenu = ({
-  options,
-  onCloseRequest,
-  top,
-  left,
-  actionManager,
-  appState,
-}: ContextMenuProps) => {
+const ContextMenu = ({ options, onCloseRequest, top, left }: Props) => {
   const isDarkTheme = !!document
     .querySelector(".excalidraw")
     ?.classList.contains("Appearance_dark");
@@ -51,34 +43,23 @@ const ContextMenu = ({
           className="context-menu"
           onContextMenu={(event) => event.preventDefault()}
         >
-          {options.map((option, idx) => {
-            if (option === "separator") {
-              return <hr key={idx} className="context-menu-option-separator" />;
-            }
-
-            const actionName = option.name;
-            const label = option.contextItemLabel
-              ? t(option.contextItemLabel)
-              : "";
-            return (
-              <li key={idx} data-testid={actionName} onClick={onCloseRequest}>
-                <button
-                  className={clsx("context-menu-option", {
-                    dangerous: actionName === "deleteSelectedElements",
-                    checkmark: option.checked?.(appState),
-                  })}
-                  onClick={() => actionManager.executeAction(option)}
-                >
-                  <div className="context-menu-option__label">{label}</div>
-                  <kbd className="context-menu-option__shortcut">
-                    {actionName
-                      ? getShortcutFromShortcutName(actionName as ShortcutName)
-                      : ""}
-                  </kbd>
-                </button>
-              </li>
-            );
-          })}
+          {options.map(({ action, checked, shortcutName, label }, idx) => (
+            <li data-testid={shortcutName} key={idx} onClick={onCloseRequest}>
+              <button
+                className={`context-menu-option 
+                ${shortcutName === "delete" ? "dangerous" : ""}
+                ${checked ? "checkmark" : ""}`}
+                onClick={action}
+              >
+                <div className="context-menu-option__label">{label}</div>
+                <div className="context-menu-option__shortcut">
+                  {shortcutName
+                    ? getShortcutFromShortcutName(shortcutName)
+                    : ""}
+                </div>
+              </button>
+            </li>
+          ))}
         </ul>
       </Popover>
     </div>
@@ -97,10 +78,8 @@ const getContextMenuNode = (): HTMLDivElement => {
 
 type ContextMenuParams = {
   options: (ContextMenuOption | false | null | undefined)[];
-  top: ContextMenuProps["top"];
-  left: ContextMenuProps["left"];
-  actionManager: ContextMenuProps["actionManager"];
-  appState: Readonly<AppState>;
+  top: number;
+  left: number;
 };
 
 const handleClose = () => {
@@ -122,8 +101,6 @@ export default {
           left={params.left}
           options={options}
           onCloseRequest={handleClose}
-          actionManager={params.actionManager}
-          appState={params.appState}
         />,
         getContextMenuNode(),
       );

src/components/Dialog.scss

@@ -1,11 +1,6 @@
-@import "../css/variables.module";
+@import "../css/_variables";
 
 .excalidraw {
-  .Dialog {
-    user-select: text;
-    cursor: auto;
-  }
-
   .Dialog__title {
     display: grid;
     align-items: center;
@@ -15,7 +10,6 @@
     padding: calc(var(--space-factor) * 2);
     text-align: center;
     font-variant: small-caps;
-    font-size: 1.2em;
   }
 
   .Dialog__titleContent {

src/components/Dialog.tsx

@@ -1,6 +1,5 @@
 import clsx from "clsx";
-import React, { useEffect } from "react";
-import { useCallbackRefState } from "../hooks/useCallbackRefState";
+import React, { useCallback, useEffect, useState } from "react";
 import { t } from "../i18n";
 import useIsMobile from "../is-mobile";
 import { KEYS } from "../keys";
@@ -9,6 +8,14 @@ import { back, close } from "./icons";
 import { Island } from "./Island";
 import { Modal } from "./Modal";
 
+const useRefState = <T,>() => {
+  const [refValue, setRefValue] = useState<T | null>(null);
+  const refCallback = useCallback((value: T) => {
+    setRefValue(value);
+  }, []);
+  return [refValue, refCallback] as const;
+};
+
 export const Dialog = (props: {
   children: React.ReactNode;
   className?: string;
@@ -17,7 +24,7 @@ export const Dialog = (props: {
   title: React.ReactNode;
   autofocus?: boolean;
 }) => {
-  const [islandNode, setIslandNode] = useCallbackRefState<HTMLDivElement>();
+  const [islandNode, setIslandNode] = useRefState<HTMLDivElement>();
 
   useEffect(() => {
     if (!islandNode) {
@@ -73,7 +80,7 @@ export const Dialog = (props: {
       onCloseRequest={props.onCloseRequest}
     >
       <Island ref={setIslandNode}>
-        <h2 id="dialog-title" className="Dialog__title">
+        <h3 id="dialog-title" className="Dialog__title">
           <span className="Dialog__titleContent">{props.title}</span>
           <button
             className="Modal__close"
@@ -82,7 +89,7 @@ export const Dialog = (props: {
           >
             {useIsMobile() ? back : close}
           </button>
-        </h2>
+        </h3>
         <div className="Dialog__content">{props.children}</div>
       </Island>
     </Modal>

src/components/ExportDialog.scss

@@ -1,4 +1,4 @@
-@import "../css/variables.module";
+@import "../css/_variables";
 
 .excalidraw {
   .ExportDialog__preview {

src/components/ExportDialog.tsx

@@ -1,6 +1,7 @@
 import React, { useEffect, useRef, useState } from "react";
 import { render, unmountComponentAtNode } from "react-dom";
 import { ActionsManagerInterface } from "../actions/types";
+import { EVENT_DIALOG, trackEvent } from "../analytics";
 import { probablySupportsClipboardBlob } from "../clipboard";
 import { canvasToBlob } from "../data/blob";
 import { NonDeletedExcalidrawElement } from "../element/types";
@@ -250,6 +251,7 @@ export const ExportDialog = ({
     <>
       <ToolButton
         onClick={() => {
+          trackEvent(EVENT_DIALOG, "export");
           setModalIsShown(true);
         }}
         icon={exportFile}

src/components/GitHubCorner.tsx

@@ -1,5 +1,6 @@
-import oc from "open-color";
 import React from "react";
+import oc from "open-color";
+import { EVENT_EXIT, trackEvent } from "../analytics";
 
 // https://github.com/tholman/github-corners
 export const GitHubCorner = React.memo(
@@ -16,6 +17,9 @@ export const GitHubCorner = React.memo(
         target="_blank"
         rel="noopener noreferrer"
         aria-label="GitHub repository"
+        onClick={() => {
+          trackEvent(EVENT_EXIT, "github");
+        }}
       >
         <path
           d="M0 0l115 115h15l12 27 108 108V0z"

src/components/HelpDialog.tsx

@@ -1,359 +0,0 @@
-import React from "react";
-import { t } from "../i18n";
-import { isDarwin, isWindows } from "../keys";
-import { Dialog } from "./Dialog";
-import { getShortcutKey } from "../utils";
-import "./HelpDialog.scss";
-
-const Header = () => (
-  <div className="HelpDialog--header">
-    <a
-      className="HelpDialog--btn"
-      href="https://github.com/excalidraw/excalidraw#documentation"
-      target="_blank"
-      rel="noopener noreferrer"
-    >
-      {t("helpDialog.documentation")}
-    </a>
-    <a
-      className="HelpDialog--btn"
-      href="https://blog.excalidraw.com"
-      target="_blank"
-      rel="noopener noreferrer"
-    >
-      {t("helpDialog.blog")}
-    </a>
-    <a
-      className="HelpDialog--btn"
-      href="https://github.com/excalidraw/excalidraw/issues"
-      target="_blank"
-      rel="noopener noreferrer"
-    >
-      {t("helpDialog.github")}
-    </a>
-  </div>
-);
-
-const Section = (props: { title: string; children: React.ReactNode }) => (
-  <>
-    <h3>{props.title}</h3>
-    {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;
-}) => (
-  <div className="HelpDialog--island">
-    <h3 className="HelpDialog--island-title">{props.caption}</h3>
-    {props.children}
-  </div>
-);
-
-const Shortcut = (props: {
-  label: string;
-  shortcuts: string[];
-  isOr: boolean;
-}) => {
-  return (
-    <div className="HelpDialog--shortcut">
-      <div
-        style={{
-          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} />
-);
-
-export const HelpDialog = ({ onClose }: { onClose?: () => void }) => {
-  const handleClose = React.useCallback(() => {
-    if (onClose) {
-      onClose();
-    }
-  }, [onClose]);
-
-  return (
-    <>
-      <Dialog
-        onCloseRequest={handleClose}
-        title={t("helpDialog.title")}
-        className={"HelpDialog"}
-      >
-        <Header />
-        <Section title={t("helpDialog.shortcuts")}>
-          <Columns>
-            <Column>
-              <ShortcutIsland caption={t("helpDialog.shapes")}>
-                <Shortcut
-                  label={t("toolBar.selection")}
-                  shortcuts={["V", "1"]}
-                />
-                <Shortcut
-                  label={t("toolBar.rectangle")}
-                  shortcuts={["R", "2"]}
-                />
-                <Shortcut label={t("toolBar.diamond")} shortcuts={["D", "3"]} />
-                <Shortcut label={t("toolBar.ellipse")} shortcuts={["E", "4"]} />
-                <Shortcut label={t("toolBar.arrow")} shortcuts={["A", "5"]} />
-                <Shortcut label={t("toolBar.line")} shortcuts={["P", "6"]} />
-                <Shortcut
-                  label={t("toolBar.draw")}
-                  shortcuts={["Shift+P", "7"]}
-                />
-                <Shortcut label={t("toolBar.text")} shortcuts={["T", "8"]} />
-                <Shortcut
-                  label={t("helpDialog.textNewLine")}
-                  shortcuts={[
-                    getShortcutKey("Enter"),
-                    getShortcutKey("Shift+Enter"),
-                  ]}
-                />
-                <Shortcut
-                  label={t("helpDialog.textFinish")}
-                  shortcuts={[
-                    getShortcutKey("Esc"),
-                    getShortcutKey("CtrlOrCmd+Enter"),
-                  ]}
-                />
-                <Shortcut
-                  label={t("helpDialog.curvedArrow")}
-                  shortcuts={[
-                    "A",
-                    t("helpDialog.click"),
-                    t("helpDialog.click"),
-                    t("helpDialog.click"),
-                  ]}
-                  isOr={false}
-                />
-                <Shortcut
-                  label={t("helpDialog.curvedLine")}
-                  shortcuts={[
-                    "L",
-                    t("helpDialog.click"),
-                    t("helpDialog.click"),
-                    t("helpDialog.click"),
-                  ]}
-                  isOr={false}
-                />
-                <Shortcut label={t("toolBar.lock")} shortcuts={["Q"]} />
-                <Shortcut
-                  label={t("helpDialog.preventBinding")}
-                  shortcuts={[getShortcutKey("CtrlOrCmd")]}
-                />
-              </ShortcutIsland>
-              <ShortcutIsland caption={t("helpDialog.view")}>
-                <Shortcut
-                  label={t("buttons.zoomIn")}
-                  shortcuts={[getShortcutKey("CtrlOrCmd++")]}
-                />
-                <Shortcut
-                  label={t("buttons.zoomOut")}
-                  shortcuts={[getShortcutKey("CtrlOrCmd+-")]}
-                />
-                <Shortcut
-                  label={t("buttons.resetZoom")}
-                  shortcuts={[getShortcutKey("CtrlOrCmd+0")]}
-                />
-                <Shortcut
-                  label={t("helpDialog.zoomToFit")}
-                  shortcuts={["Shift+1"]}
-                />
-                <Shortcut
-                  label={t("helpDialog.zoomToSelection")}
-                  shortcuts={["Shift+2"]}
-                />
-                <Shortcut label={t("buttons.fullScreen")} shortcuts={["F"]} />
-                <Shortcut
-                  label={t("buttons.zenMode")}
-                  shortcuts={[getShortcutKey("Alt+Z")]}
-                />
-                <Shortcut
-                  label={t("labels.gridMode")}
-                  shortcuts={[getShortcutKey("CtrlOrCmd+'")]}
-                />
-                <Shortcut
-                  label={t("labels.viewMode")}
-                  shortcuts={[getShortcutKey("Alt+R")]}
-                />
-              </ShortcutIsland>
-            </Column>
-            <Column>
-              <ShortcutIsland caption={t("helpDialog.editor")}>
-                <Shortcut
-                  label={t("labels.selectAll")}
-                  shortcuts={[getShortcutKey("CtrlOrCmd+A")]}
-                />
-                <Shortcut
-                  label={t("labels.multiSelect")}
-                  shortcuts={[getShortcutKey(`Shift+${t("helpDialog.click")}`)]}
-                />
-                <Shortcut
-                  label={t("labels.moveCanvas")}
-                  shortcuts={[
-                    getShortcutKey(`Space+${t("helpDialog.drag")}`),
-                    getShortcutKey(`Wheel+${t("helpDialog.drag")}`),
-                  ]}
-                  isOr={true}
-                />
-                <Shortcut
-                  label={t("labels.cut")}
-                  shortcuts={[getShortcutKey("CtrlOrCmd+X")]}
-                />
-                <Shortcut
-                  label={t("labels.copy")}
-                  shortcuts={[getShortcutKey("CtrlOrCmd+C")]}
-                />
-                <Shortcut
-                  label={t("labels.paste")}
-                  shortcuts={[getShortcutKey("CtrlOrCmd+V")]}
-                />
-                <Shortcut
-                  label={t("labels.copyAsPng")}
-                  shortcuts={[getShortcutKey("Shift+Alt+C")]}
-                />
-                <Shortcut
-                  label={t("labels.copyStyles")}
-                  shortcuts={[getShortcutKey("CtrlOrCmd+Alt+C")]}
-                />
-                <Shortcut
-                  label={t("labels.pasteStyles")}
-                  shortcuts={[getShortcutKey("CtrlOrCmd+Alt+V")]}
-                />
-                <Shortcut
-                  label={t("labels.delete")}
-                  shortcuts={[getShortcutKey("Del")]}
-                />
-                <Shortcut
-                  label={t("labels.sendToBack")}
-                  shortcuts={[
-                    isDarwin
-                      ? getShortcutKey("CtrlOrCmd+Alt+[")
-                      : getShortcutKey("CtrlOrCmd+Shift+["),
-                  ]}
-                />
-                <Shortcut
-                  label={t("labels.bringToFront")}
-                  shortcuts={[
-                    isDarwin
-                      ? getShortcutKey("CtrlOrCmd+Alt+]")
-                      : getShortcutKey("CtrlOrCmd+Shift+]"),
-                  ]}
-                />
-                <Shortcut
-                  label={t("labels.sendBackward")}
-                  shortcuts={[getShortcutKey("CtrlOrCmd+[")]}
-                />
-                <Shortcut
-                  label={t("labels.bringForward")}
-                  shortcuts={[getShortcutKey("CtrlOrCmd+]")]}
-                />
-                <Shortcut
-                  label={t("labels.alignTop")}
-                  shortcuts={[getShortcutKey("CtrlOrCmd+Shift+Up")]}
-                />
-                <Shortcut
-                  label={t("labels.alignBottom")}
-                  shortcuts={[getShortcutKey("CtrlOrCmd+Shift+Down")]}
-                />
-                <Shortcut
-                  label={t("labels.alignLeft")}
-                  shortcuts={[getShortcutKey("CtrlOrCmd+Shift+Left")]}
-                />
-                <Shortcut
-                  label={t("labels.alignRight")}
-                  shortcuts={[getShortcutKey("CtrlOrCmd+Shift+Right")]}
-                />
-                <Shortcut
-                  label={t("labels.duplicateSelection")}
-                  shortcuts={[
-                    getShortcutKey("CtrlOrCmd+D"),
-                    getShortcutKey(`Alt+${t("helpDialog.drag")}`),
-                  ]}
-                />
-                <Shortcut
-                  label={t("buttons.undo")}
-                  shortcuts={[getShortcutKey("CtrlOrCmd+Z")]}
-                />
-                <Shortcut
-                  label={t("buttons.redo")}
-                  shortcuts={
-                    isWindows
-                      ? [
-                          getShortcutKey("CtrlOrCmd+Y"),
-                          getShortcutKey("CtrlOrCmd+Shift+Z"),
-                        ]
-                      : [getShortcutKey("CtrlOrCmd+Shift+Z")]
-                  }
-                />
-                <Shortcut
-                  label={t("labels.group")}
-                  shortcuts={[getShortcutKey("CtrlOrCmd+G")]}
-                />
-                <Shortcut
-                  label={t("labels.ungroup")}
-                  shortcuts={[getShortcutKey("CtrlOrCmd+Shift+G")]}
-                />
-              </ShortcutIsland>
-            </Column>
-          </Columns>
-        </Section>
-      </Dialog>
-    </>
-  );
-};

src/components/HelpIcon.tsx

@@ -1,5 +1,4 @@
 import React from "react";
-import { questionCircle } from "../components/icons";
 
 type HelpIconProps = {
   title?: string;
@@ -8,8 +7,19 @@ type HelpIconProps = {
   onClick?(): void;
 };
 
+const ICON = (
+  <svg
+    width="30"
+    height="22"
+    viewBox="0 0 512 512"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path d="M528 448H48c-26.51 0-48-21.49-48-48V112c0-26.51 21.49-48 48-48h480c26.51 0 48 21.49 48 48v288c0 26.51-21.49 48-48 48zM128 180v-40c0-6.627-5.373-12-12-12H76c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm-336 96v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm-336 96v-40c0-6.627-5.373-12-12-12H76c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm288 0v-40c0-6.627-5.373-12-12-12H172c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h232c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12z" />
+  </svg>
+);
+
 export const HelpIcon = (props: HelpIconProps) => (
   <label title={`${props.title} — ?`} className="help-icon">
-    <div onClick={props.onClick}>{questionCircle}</div>
+    <div onClick={props.onClick}>{ICON}</div>
   </label>
 );

src/components/HintViewer.scss

@@ -1,4 +1,4 @@
-@import "../css/variables.module";
+@import "../css/_variables";
 
 // this is loosely based on the longest hint text
 $wide-viewport-width: 1000px;

src/components/IconPicker.scss

@@ -1,4 +1,4 @@
-@import "../css/variables.module";
+@import "../css/_variables";
 
 .excalidraw {
   .picker-container {
@@ -102,7 +102,6 @@
     position: absolute;
     bottom: 2px;
     font-size: 0.7em;
-    color: var(--keybinding-color);
 
     :root[dir="ltr"] & {
       right: 2px;

src/components/LayerUI.tsx

@@ -1,46 +1,56 @@
-import clsx from "clsx";
 import React, {
-  RefObject,
-  useCallback,
-  useEffect,
   useRef,
   useState,
+  RefObject,
+  useEffect,
+  useCallback,
 } from "react";
-import { ActionManager } from "../actions/manager";
-import { CLASSES } from "../constants";
-import { exportCanvas } from "../data";
-import { importLibraryFromJSON, saveLibraryAsJSON } from "../data/json";
-import { Library } from "../data/library";
 import { showSelectedShapeActions } from "../element";
-import { NonDeletedExcalidrawElement } from "../element/types";
-import { Language, t } from "../i18n";
-import useIsMobile from "../is-mobile";
 import { calculateScrollCenter, getSelectedElements } from "../scene";
+import { exportCanvas } from "../data";
+
+import { AppState, LibraryItems, LibraryItem } from "../types";
+import { NonDeletedExcalidrawElement } from "../element/types";
+
+import { ActionManager } from "../actions/manager";
+import { Island } from "./Island";
+import Stack from "./Stack";
+import { FixedSideContainer } from "./FixedSideContainer";
+import { UserList } from "./UserList";
+import { LockIcon } from "./LockIcon";
+import { ExportDialog, ExportCB } from "./ExportDialog";
+import { Language, t } from "../i18n";
+import { HintViewer } from "./HintViewer";
+import useIsMobile from "../is-mobile";
+
 import { ExportType } from "../scene/types";
-import { AppState, LibraryItem, LibraryItems } from "../types";
-import { muteFSAbortError } from "../utils";
-import { SelectedShapeActions, ShapesSwitcher, ZoomActions } from "./Actions";
-import { BackgroundPickerAndDarkModeToggle } from "./BackgroundPickerAndDarkModeToggle";
+import { MobileMenu } from "./MobileMenu";
+import { ZoomActions, SelectedShapeActions, ShapesSwitcher } from "./Actions";
+import { Section } from "./Section";
 import CollabButton from "./CollabButton";
 import { ErrorDialog } from "./ErrorDialog";
-import { ExportCB, ExportDialog } from "./ExportDialog";
-import { FixedSideContainer } from "./FixedSideContainer";
+import { ShortcutsDialog } from "./ShortcutsDialog";
+import { LoadingMessage } from "./LoadingMessage";
+import { CLASSES } from "../constants";
+import { shield, exportFile, load } from "./icons";
 import { GitHubCorner } from "./GitHubCorner";
-import { HintViewer } from "./HintViewer";
-import { exportFile, load, shield } from "./icons";
-import { Island } from "./Island";
+import { Tooltip } from "./Tooltip";
+
 import "./LayerUI.scss";
 import { LibraryUnit } from "./LibraryUnit";
-import { LoadingMessage } from "./LoadingMessage";
-import { LockIcon } from "./LockIcon";
-import { MobileMenu } from "./MobileMenu";
-import { PasteChartDialog } from "./PasteChartDialog";
-import { Section } from "./Section";
-import { HelpDialog } from "./HelpDialog";
-import Stack from "./Stack";
 import { ToolButton } from "./ToolButton";
-import { Tooltip } from "./Tooltip";
-import { UserList } from "./UserList";
+import { saveLibraryAsJSON, importLibraryFromJSON } from "../data/json";
+import { muteFSAbortError } from "../utils";
+import { BackgroundPickerAndDarkModeToggle } from "./BackgroundPickerAndDarkModeToggle";
+import clsx from "clsx";
+import { Library } from "../data/library";
+import {
+  EVENT_ACTION,
+  EVENT_EXIT,
+  EVENT_LIBRARY,
+  trackEvent,
+} from "../analytics";
+import { PasteChartDialog } from "./PasteChartDialog";
 
 interface LayerUIProps {
   actionManager: ActionManager;
@@ -61,7 +71,6 @@ interface LayerUIProps {
     canvas: HTMLCanvasElement | null,
   ) => void;
   renderCustomFooter?: (isMobile: boolean) => JSX.Element;
-  viewModeEnabled: boolean;
 }
 
 const useOnClickOutside = (
@@ -150,7 +159,13 @@ const LibraryMenuItems = ({
         }}
       />
 
-      <a href="https://libraries.excalidraw.com" target="_excalidraw_libraries">
+      <a
+        href="https://libraries.excalidraw.com"
+        target="_excalidraw_libraries"
+        onClick={() => {
+          trackEvent(EVENT_EXIT, "libraries");
+        }}
+      >
         {t("labels.libraries")}
       </a>
     </div>,
@@ -252,6 +267,7 @@ const LibraryMenu = ({
     const items = await Library.loadLibrary();
     const nextItems = items.filter((_, index) => index !== indexToRemove);
     Library.saveLibrary(nextItems);
+    trackEvent(EVENT_LIBRARY, "remove");
     setLibraryItems(nextItems);
   }, []);
 
@@ -260,6 +276,7 @@ const LibraryMenu = ({
       const items = await Library.loadLibrary();
       const nextItems = [...items, elements];
       onAddToLibrary();
+      trackEvent(EVENT_LIBRARY, "add");
       Library.saveLibrary(nextItems);
       setLibraryItems(nextItems);
     },
@@ -300,7 +317,6 @@ const LayerUI = ({
   isCollaborating,
   onExportToBackend,
   renderCustomFooter,
-  viewModeEnabled,
 }: LayerUIProps) => {
   const isMobile = useIsMobile();
 
@@ -312,6 +328,9 @@ const LayerUI = ({
       href="https://blog.excalidraw.com/end-to-end-encryption/"
       target="_blank"
       rel="noopener noreferrer"
+      onClick={() => {
+        trackEvent(EVENT_EXIT, "e2ee shield");
+      }}
     >
       <Tooltip label={t("encrypted.tooltip")} position="above" long={true}>
         {shield}
@@ -360,28 +379,6 @@ const LayerUI = ({
     );
   };
 
-  const renderViewModeCanvasActions = () => {
-    return (
-      <Section
-        heading="canvasActions"
-        className={clsx("zen-mode-transition", {
-          "transition-left": 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("saveScene")}
-              {actionManager.renderAction("saveAsScene")}
-              {renderExportDialog()}
-            </Stack.Row>
-          </Stack.Col>
-        </Island>
-      </Section>
-    );
-  };
   const renderCanvasActions = () => (
     <Section
       heading="canvasActions"
@@ -472,42 +469,38 @@ const LayerUI = ({
             gap={4}
             className={clsx({ "disable-pointerEvents": zenModeEnabled })}
           >
-            {viewModeEnabled
-              ? renderViewModeCanvasActions()
-              : renderCanvasActions()}
+            {renderCanvasActions()}
             {shouldRenderSelectedShapeActions && renderSelectedShapeActions()}
           </Stack.Col>
-          {!viewModeEnabled && (
-            <Section heading="shapes">
-              {(heading) => (
-                <Stack.Col gap={4} align="start">
-                  <Stack.Row gap={1}>
-                    <Island
-                      padding={1}
-                      className={clsx({ "zen-mode": zenModeEnabled })}
-                    >
-                      <HintViewer appState={appState} elements={elements} />
-                      {heading}
-                      <Stack.Row gap={1}>
-                        <ShapesSwitcher
-                          elementType={appState.elementType}
-                          setAppState={setAppState}
-                          isLibraryOpen={appState.isLibraryOpen}
-                        />
-                      </Stack.Row>
-                    </Island>
-                    <LockIcon
-                      zenModeEnabled={zenModeEnabled}
-                      checked={appState.elementLocked}
-                      onChange={onLockToggle}
-                      title={t("toolBar.lock")}
-                    />
-                  </Stack.Row>
-                  {libraryMenu}
-                </Stack.Col>
-              )}
-            </Section>
-          )}
+          <Section heading="shapes">
+            {(heading) => (
+              <Stack.Col gap={4} align="start">
+                <Stack.Row gap={1}>
+                  <Island
+                    padding={1}
+                    className={clsx({ "zen-mode": zenModeEnabled })}
+                  >
+                    <HintViewer appState={appState} elements={elements} />
+                    {heading}
+                    <Stack.Row gap={1}>
+                      <ShapesSwitcher
+                        elementType={appState.elementType}
+                        setAppState={setAppState}
+                        isLibraryOpen={appState.isLibraryOpen}
+                      />
+                    </Stack.Row>
+                  </Island>
+                  <LockIcon
+                    zenModeEnabled={zenModeEnabled}
+                    checked={appState.elementLocked}
+                    onChange={onLockToggle}
+                    title={t("toolBar.lock")}
+                  />
+                </Stack.Row>
+                {libraryMenu}
+              </Stack.Col>
+            )}
+          </Section>
           <UserList
             className={clsx("zen-mode-transition", {
               "transition-right": zenModeEnabled,
@@ -552,20 +545,6 @@ const LayerUI = ({
     );
   };
 
-  const renderGitHubCorner = () => {
-    return (
-      <aside
-        className={clsx(
-          "layer-ui__wrapper__github-corner zen-mode-transition",
-          {
-            "transition-right": zenModeEnabled,
-          },
-        )}
-      >
-        <GitHubCorner appearance={appState.appearance} />
-      </aside>
-    );
-  };
   const renderFooter = () => (
     <footer role="contentinfo" className="layer-ui__wrapper__footer">
       <div
@@ -588,6 +567,7 @@ const LayerUI = ({
         <button
           className="scroll-back-to-content"
           onClick={() => {
+            trackEvent(EVENT_ACTION, "scroll to content");
             setAppState({
               ...calculateScrollCenter(elements, appState, canvas),
             });
@@ -608,8 +588,10 @@ const LayerUI = ({
           onClose={() => setAppState({ errorMessage: null })}
         />
       )}
-      {appState.showHelpDialog && (
-        <HelpDialog onClose={() => setAppState({ showHelpDialog: false })} />
+      {appState.showShortcutsDialog && (
+        <ShortcutsDialog
+          onClose={() => setAppState({ showShortcutsDialog: false })}
+        />
       )}
       {appState.pasteDialog.shown && (
         <PasteChartDialog
@@ -641,19 +623,25 @@ const LayerUI = ({
         canvas={canvas}
         isCollaborating={isCollaborating}
         renderCustomFooter={renderCustomFooter}
-        viewModeEnabled={viewModeEnabled}
       />
     </>
   ) : (
-    <div
-      className={clsx("layer-ui__wrapper", {
-        "disable-pointerEvents": appState.cursorButton === "down",
-      })}
-    >
+    <div className="layer-ui__wrapper">
       {dialogs}
       {renderFixedSideContainer()}
       {renderBottomAppMenu()}
-      {renderGitHubCorner()}
+      {
+        <aside
+          className={clsx(
+            "layer-ui__wrapper__github-corner zen-mode-transition",
+            {
+              "transition-right": zenModeEnabled,
+            },
+          )}
+        >
+          <GitHubCorner appearance={appState.appearance} />
+        </aside>
+      }
       {renderFooter()}
     </div>
   );

src/components/MobileMenu.tsx

@@ -16,6 +16,7 @@ import { SCROLLBAR_WIDTH, SCROLLBAR_MARGIN } from "../scene/scrollbars";
 import { LockIcon } from "./LockIcon";
 import { UserList } from "./UserList";
 import { BackgroundPickerAndDarkModeToggle } from "./BackgroundPickerAndDarkModeToggle";
+import { EVENT_ACTION, trackEvent } from "../analytics";
 
 type MobileMenuProps = {
   appState: AppState;
@@ -29,7 +30,6 @@ type MobileMenuProps = {
   canvas: HTMLCanvasElement | null;
   isCollaborating: boolean;
   renderCustomFooter?: (isMobile: boolean) => JSX.Element;
-  viewModeEnabled: boolean;
 };
 
 export const MobileMenu = ({
@@ -44,164 +44,122 @@ export const MobileMenu = ({
   canvas,
   isCollaborating,
   renderCustomFooter,
-  viewModeEnabled,
-}: MobileMenuProps) => {
-  const renderFixedSideContainer = () => {
-    return (
-      <FixedSideContainer side="top">
-        <Section heading="shapes">
-          {(heading) => (
-            <Stack.Col gap={4} align="center">
-              <Stack.Row gap={1}>
-                <Island padding={1}>
-                  {heading}
-                  <Stack.Row gap={1}>
-                    <ShapesSwitcher
-                      elementType={appState.elementType}
-                      setAppState={setAppState}
-                      isLibraryOpen={appState.isLibraryOpen}
-                    />
-                  </Stack.Row>
-                </Island>
-                <LockIcon
-                  checked={appState.elementLocked}
-                  onChange={onLockToggle}
-                  title={t("toolBar.lock")}
-                />
-              </Stack.Row>
-              {libraryMenu}
-            </Stack.Col>
-          )}
-        </Section>
-        <HintViewer appState={appState} elements={elements} />
-      </FixedSideContainer>
-    );
-  };
-
-  const renderAppToolbar = () => {
-    if (viewModeEnabled) {
-      return (
-        <div className="App-toolbar-content">
-          {actionManager.renderAction("toggleCanvasMenu")}
-        </div>
-      );
-    }
-    return (
-      <div className="App-toolbar-content">
-        {actionManager.renderAction("toggleCanvasMenu")}
-        {actionManager.renderAction("toggleEditMenu")}
-        {actionManager.renderAction("undo")}
-        {actionManager.renderAction("redo")}
-        {actionManager.renderAction(
-          appState.multiElement ? "finalize" : "duplicateSelection",
-        )}
-        {actionManager.renderAction("deleteSelectedElements")}
-      </div>
-    );
-  };
-
-  const renderCanvasActions = () => {
-    if (viewModeEnabled) {
-      return (
-        <>
-          {actionManager.renderAction("saveScene")}
-          {actionManager.renderAction("saveAsScene")}
-          {exportButton}
-        </>
-      );
-    }
-    return (
-      <>
-        {actionManager.renderAction("loadScene")}
-        {actionManager.renderAction("saveScene")}
-        {actionManager.renderAction("saveAsScene")}
-        {exportButton}
-        {actionManager.renderAction("clearCanvas")}
-        {onCollabButtonClick && (
-          <CollabButton
-            isCollaborating={isCollaborating}
-            collaboratorCount={appState.collaborators.size}
-            onClick={onCollabButtonClick}
-          />
-        )}
-        {
-          <BackgroundPickerAndDarkModeToggle
-            actionManager={actionManager}
-            appState={appState}
-            setAppState={setAppState}
-          />
-        }
-      </>
-    );
-  };
-  return (
-    <>
-      {!viewModeEnabled && renderFixedSideContainer()}
-      <div
-        className="App-bottom-bar"
-        style={{
-          marginBottom: SCROLLBAR_WIDTH + SCROLLBAR_MARGIN * 2,
-          marginLeft: SCROLLBAR_WIDTH + SCROLLBAR_MARGIN * 2,
-          marginRight: SCROLLBAR_WIDTH + SCROLLBAR_MARGIN * 2,
-        }}
-      >
-        <Island padding={0}>
-          {appState.openMenu === "canvas" ? (
-            <Section className="App-mobile-menu" heading="canvasActions">
-              <div className="panelColumn">
-                <Stack.Col gap={4}>
-                  {renderCanvasActions()}
-                  {renderCustomFooter?.(true)}
-                  <fieldset>
-                    <legend>{t("labels.collaborators")}</legend>
-                    <UserList mobile>
-                      {Array.from(appState.collaborators)
-                        // Collaborator is either not initialized or is actually the current user.
-                        .filter(
-                          ([_, client]) => Object.keys(client).length !== 0,
-                        )
-                        .map(([clientId, client]) => (
-                          <React.Fragment key={clientId}>
-                            {actionManager.renderAction(
-                              "goToCollaborator",
-                              clientId,
-                            )}
-                          </React.Fragment>
-                        ))}
-                    </UserList>
-                  </fieldset>
-                </Stack.Col>
-              </div>
-            </Section>
-          ) : appState.openMenu === "shape" &&
-            !viewModeEnabled &&
-            showSelectedShapeActions(appState, elements) ? (
-            <Section className="App-mobile-menu" heading="selectedShapeActions">
-              <SelectedShapeActions
-                appState={appState}
-                elements={elements}
-                renderAction={actionManager.renderAction}
-                elementType={appState.elementType}
+}: MobileMenuProps) => (
+  <>
+    <FixedSideContainer side="top">
+      <Section heading="shapes">
+        {(heading) => (
+          <Stack.Col gap={4} align="center">
+            <Stack.Row gap={1}>
+              <Island padding={1}>
+                {heading}
+                <Stack.Row gap={1}>
+                  <ShapesSwitcher
+                    elementType={appState.elementType}
+                    setAppState={setAppState}
+                    isLibraryOpen={appState.isLibraryOpen}
+                  />
+                </Stack.Row>
+              </Island>
+              <LockIcon
+                checked={appState.elementLocked}
+                onChange={onLockToggle}
+                title={t("toolBar.lock")}
               />
-            </Section>
-          ) : null}
-          <footer className="App-toolbar">
-            {renderAppToolbar()}
-            {appState.scrolledOutside && !appState.openMenu && (
-              <button
-                className="scroll-back-to-content"
-                onClick={() => {
-                  setAppState({
-                    ...calculateScrollCenter(elements, appState, canvas),
-                  });
-                }}
-              >
-                {t("buttons.scrollBackToContent")}
-              </button>
+            </Stack.Row>
+            {libraryMenu}
+          </Stack.Col>
+        )}
+      </Section>
+      <HintViewer appState={appState} elements={elements} />
+    </FixedSideContainer>
+    <div
+      className="App-bottom-bar"
+      style={{
+        marginBottom: SCROLLBAR_WIDTH + SCROLLBAR_MARGIN * 2,
+        marginLeft: SCROLLBAR_WIDTH + SCROLLBAR_MARGIN * 2,
+        marginRight: SCROLLBAR_WIDTH + SCROLLBAR_MARGIN * 2,
+      }}
+    >
+      <Island padding={0}>
+        {appState.openMenu === "canvas" ? (
+          <Section className="App-mobile-menu" heading="canvasActions">
+            <div className="panelColumn">
+              <Stack.Col gap={4}>
+                {actionManager.renderAction("loadScene")}
+                {actionManager.renderAction("saveScene")}
+                {actionManager.renderAction("saveAsScene")}
+                {exportButton}
+                {actionManager.renderAction("clearCanvas")}
+                {onCollabButtonClick && (
+                  <CollabButton
+                    isCollaborating={isCollaborating}
+                    collaboratorCount={appState.collaborators.size}
+                    onClick={onCollabButtonClick}
+                  />
+                )}
+                <BackgroundPickerAndDarkModeToggle
+                  actionManager={actionManager}
+                  appState={appState}
+                  setAppState={setAppState}
+                />
+                {renderCustomFooter?.(true)}
+                <fieldset>
+                  <legend>{t("labels.collaborators")}</legend>
+                  <UserList mobile>
+                    {Array.from(appState.collaborators)
+                      // Collaborator is either not initialized or is actually the current user.
+                      .filter(([_, client]) => Object.keys(client).length !== 0)
+                      .map(([clientId, client]) => (
+                        <React.Fragment key={clientId}>
+                          {actionManager.renderAction(
+                            "goToCollaborator",
+                            clientId,
+                          )}
+                        </React.Fragment>
+                      ))}
+                  </UserList>
+                </fieldset>
+              </Stack.Col>
+            </div>
+          </Section>
+        ) : appState.openMenu === "shape" &&
+          showSelectedShapeActions(appState, elements) ? (
+          <Section className="App-mobile-menu" heading="selectedShapeActions">
+            <SelectedShapeActions
+              appState={appState}
+              elements={elements}
+              renderAction={actionManager.renderAction}
+              elementType={appState.elementType}
+            />
+          </Section>
+        ) : null}
+        <footer className="App-toolbar">
+          <div className="App-toolbar-content">
+            {actionManager.renderAction("toggleCanvasMenu")}
+            {actionManager.renderAction("toggleEditMenu")}
+            {actionManager.renderAction("undo")}
+            {actionManager.renderAction("redo")}
+            {actionManager.renderAction(
+              appState.multiElement ? "finalize" : "duplicateSelection",
             )}
-          </footer>
-        </Island>
-      </div>
-    </>
-  );
-};
+            {actionManager.renderAction("deleteSelectedElements")}
+          </div>
+          {appState.scrolledOutside && !appState.openMenu && (
+            <button
+              className="scroll-back-to-content"
+              onClick={() => {
+                trackEvent(EVENT_ACTION, "scroll to content");
+                setAppState({
+                  ...calculateScrollCenter(elements, appState, canvas),
+                });
+              }}
+            >
+              {t("buttons.scrollBackToContent")}
+            </button>
+          )}
+        </footer>
+      </Island>
+    </div>
+  </>
+);

src/components/Modal.scss

@@ -1,4 +1,4 @@
-@import "../css/variables.module";
+@import "../css/_variables";
 
 .excalidraw {
   .Modal {

src/components/PasteChartDialog.scss

@@ -1,4 +1,4 @@
-@import "../css/variables.module";
+@import "../css/_variables";
 
 .excalidraw {
   .PasteChartDialog {

src/components/PasteChartDialog.tsx

@@ -1,6 +1,5 @@
 import oc from "open-color";
 import React, { useLayoutEffect, useRef, useState } from "react";
-import { trackEvent } from "../analytics";
 import { ChartElements, renderSpreadsheet, Spreadsheet } from "../charts";
 import { ChartType } from "../element/types";
 import { t } from "../i18n";
@@ -87,7 +86,6 @@ export const PasteChartDialog = ({
 
   const handleChartClick = (chartType: ChartType, elements: ChartElements) => {
     onInsertChart(elements);
-    trackEvent("magic", "chart", chartType);
     setAppState({
       currentChartType: chartType,
       pasteDialog: {

src/components/ShortcutsDialog.scss

@@ -1,28 +1,23 @@
-@import "../css/variables.module";
+@import "../css/_variables";
 
 .excalidraw {
-  .HelpDialog h3 {
-    border-bottom: 1px solid var(--button-gray-2);
-    padding-bottom: 4px;
-  }
-
-  .HelpDialog--island {
+  .ShortcutsDialog-island {
     border: 1px solid var(--button-gray-2);
     margin-bottom: 16px;
   }
 
-  .HelpDialog--island-title {
+  .ShortcutsDialog-island-title {
     margin: 0;
     padding: 4px;
     background-color: var(--button-gray-1);
     text-align: center;
   }
 
-  .HelpDialog--shortcut {
+  .ShorcutsDialog-shortcut {
     border-top: 1px solid var(--button-gray-2);
   }
 
-  .HelpDialog--key {
+  .ShorcutsDialog-key {
     word-break: keep-all;
     border: 1px solid var(--button-gray-2);
     padding: 2px 8px;
@@ -34,23 +29,14 @@
     box-sizing: border-box;
     display: flex;
     align-items: center;
-    font-family: inherit;
   }
 
-  .HelpDialog--header {
+  .ShortcutsDialog-footer {
     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;
+    border-top: 1px solid var(--button-gray-2);
+    margin-top: 8px;
+    padding-top: 16px;
   }
 }

src/components/ShortcutsDialog.tsx

@@ -0,0 +1,338 @@
+import React from "react";
+import { t } from "../i18n";
+import { isDarwin } from "../keys";
+import { Dialog } from "./Dialog";
+import { getShortcutKey } from "../utils";
+import "./ShortcutsDialog.scss";
+import { EVENT_EXIT, trackEvent } from "../analytics";
+
+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;
+}) => (
+  <div className="ShortcutsDialog-island">
+    <h3 className="ShortcutsDialog-island-title">{props.caption}</h3>
+    {props.children}
+  </div>
+);
+
+const Shortcut = (props: {
+  label: string;
+  shortcuts: string[];
+  isOr: boolean;
+}) => {
+  return (
+    <div className="ShorcutsDialog-shortcut">
+      <div
+        style={{
+          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("shortcutsDialog.or")}
+            </React.Fragment>
+          ))}
+        </div>
+      </div>
+    </div>
+  );
+};
+
+Shortcut.defaultProps = {
+  isOr: true,
+};
+
+const ShortcutKey = (props: { children: React.ReactNode }) => (
+  <span className="ShorcutsDialog-key" {...props} />
+);
+
+const Footer = () => (
+  <div className="ShortcutsDialog-footer">
+    <a
+      href="https://blog.excalidraw.com"
+      target="_blank"
+      rel="noopener noreferrer"
+      onClick={() => {
+        trackEvent(EVENT_EXIT, "blog");
+      }}
+    >
+      {t("shortcutsDialog.blog")}
+    </a>
+    <a
+      href="https://howto.excalidraw.com"
+      target="_blank"
+      rel="noopener noreferrer"
+      onClick={() => {
+        trackEvent(EVENT_EXIT, "guides");
+      }}
+    >
+      {t("shortcutsDialog.howto")}
+    </a>
+    <a
+      href="https://github.com/excalidraw/excalidraw/issues"
+      target="_blank"
+      rel="noopener noreferrer"
+      onClick={() => {
+        trackEvent(EVENT_EXIT, "issues");
+      }}
+    >
+      {t("shortcutsDialog.github")}
+    </a>
+  </div>
+);
+
+export const ShortcutsDialog = ({ onClose }: { onClose?: () => void }) => {
+  const handleClose = React.useCallback(() => {
+    if (onClose) {
+      onClose();
+    }
+  }, [onClose]);
+
+  return (
+    <>
+      <Dialog onCloseRequest={handleClose} title={t("shortcutsDialog.title")}>
+        <Columns>
+          <Column>
+            <ShortcutIsland caption={t("shortcutsDialog.shapes")}>
+              <Shortcut label={t("toolBar.selection")} shortcuts={["V", "1"]} />
+              <Shortcut label={t("toolBar.rectangle")} shortcuts={["R", "2"]} />
+              <Shortcut label={t("toolBar.diamond")} shortcuts={["D", "3"]} />
+              <Shortcut label={t("toolBar.ellipse")} shortcuts={["E", "4"]} />
+              <Shortcut label={t("toolBar.arrow")} shortcuts={["A", "5"]} />
+              <Shortcut label={t("toolBar.line")} shortcuts={["P", "6"]} />
+              <Shortcut
+                label={t("toolBar.draw")}
+                shortcuts={["Shift+P", "7"]}
+              />
+              <Shortcut label={t("toolBar.text")} shortcuts={["T", "8"]} />
+              <Shortcut
+                label={t("shortcutsDialog.textNewLine")}
+                shortcuts={[
+                  getShortcutKey("Enter"),
+                  getShortcutKey("Shift+Enter"),
+                ]}
+              />
+              <Shortcut
+                label={t("shortcutsDialog.textFinish")}
+                shortcuts={[
+                  getShortcutKey("Esc"),
+                  getShortcutKey("CtrlOrCmd+Enter"),
+                ]}
+              />
+              <Shortcut
+                label={t("shortcutsDialog.curvedArrow")}
+                shortcuts={[
+                  "A",
+                  t("shortcutsDialog.click"),
+                  t("shortcutsDialog.click"),
+                  t("shortcutsDialog.click"),
+                ]}
+                isOr={false}
+              />
+              <Shortcut
+                label={t("shortcutsDialog.curvedLine")}
+                shortcuts={[
+                  "L",
+                  t("shortcutsDialog.click"),
+                  t("shortcutsDialog.click"),
+                  t("shortcutsDialog.click"),
+                ]}
+                isOr={false}
+              />
+              <Shortcut label={t("toolBar.lock")} shortcuts={["Q"]} />
+              <Shortcut
+                label={t("shortcutsDialog.preventBinding")}
+                shortcuts={[getShortcutKey("CtrlOrCmd")]}
+              />
+            </ShortcutIsland>
+            <ShortcutIsland caption={t("shortcutsDialog.view")}>
+              <Shortcut
+                label={t("buttons.zoomIn")}
+                shortcuts={[getShortcutKey("CtrlOrCmd++")]}
+              />
+              <Shortcut
+                label={t("buttons.zoomOut")}
+                shortcuts={[getShortcutKey("CtrlOrCmd+-")]}
+              />
+              <Shortcut
+                label={t("buttons.resetZoom")}
+                shortcuts={[getShortcutKey("CtrlOrCmd+0")]}
+              />
+              <Shortcut
+                label={t("shortcutsDialog.zoomToFit")}
+                shortcuts={["Shift+1"]}
+              />
+              <Shortcut
+                label={t("shortcutsDialog.zoomToSelection")}
+                shortcuts={["Shift+2"]}
+              />
+              <Shortcut label={t("buttons.fullScreen")} shortcuts={["F"]} />
+              <Shortcut
+                label={t("buttons.zenMode")}
+                shortcuts={[getShortcutKey("Alt+Z")]}
+              />
+              <Shortcut
+                label={t("labels.gridMode")}
+                shortcuts={[getShortcutKey("CtrlOrCmd+'")]}
+              />
+            </ShortcutIsland>
+          </Column>
+          <Column>
+            <ShortcutIsland caption={t("shortcutsDialog.editor")}>
+              <Shortcut
+                label={t("labels.selectAll")}
+                shortcuts={[getShortcutKey("CtrlOrCmd+A")]}
+              />
+              <Shortcut
+                label={t("labels.multiSelect")}
+                shortcuts={[
+                  getShortcutKey(`Shift+${t("shortcutsDialog.click")}`),
+                ]}
+              />
+              <Shortcut
+                label={t("labels.moveCanvas")}
+                shortcuts={[
+                  getShortcutKey(`Space+${t("shortcutsDialog.drag")}`),
+                  getShortcutKey(`Wheel+${t("shortcutsDialog.drag")}`),
+                ]}
+                isOr={true}
+              />
+              <Shortcut
+                label={t("labels.cut")}
+                shortcuts={[getShortcutKey("CtrlOrCmd+X")]}
+              />
+              <Shortcut
+                label={t("labels.copy")}
+                shortcuts={[getShortcutKey("CtrlOrCmd+C")]}
+              />
+              <Shortcut
+                label={t("labels.paste")}
+                shortcuts={[getShortcutKey("CtrlOrCmd+V")]}
+              />
+              <Shortcut
+                label={t("labels.copyAsPng")}
+                shortcuts={[getShortcutKey("Shift+Alt+C")]}
+              />
+              <Shortcut
+                label={t("labels.copyStyles")}
+                shortcuts={[getShortcutKey("CtrlOrCmd+Alt+C")]}
+              />
+              <Shortcut
+                label={t("labels.pasteStyles")}
+                shortcuts={[getShortcutKey("CtrlOrCmd+Alt+V")]}
+              />
+              <Shortcut
+                label={t("labels.delete")}
+                shortcuts={[getShortcutKey("Del")]}
+              />
+              <Shortcut
+                label={t("labels.sendToBack")}
+                shortcuts={[
+                  isDarwin
+                    ? getShortcutKey("CtrlOrCmd+Alt+[")
+                    : getShortcutKey("CtrlOrCmd+Shift+["),
+                ]}
+              />
+              <Shortcut
+                label={t("labels.bringToFront")}
+                shortcuts={[
+                  isDarwin
+                    ? getShortcutKey("CtrlOrCmd+Alt+]")
+                    : getShortcutKey("CtrlOrCmd+Shift+]"),
+                ]}
+              />
+              <Shortcut
+                label={t("labels.sendBackward")}
+                shortcuts={[getShortcutKey("CtrlOrCmd+[")]}
+              />
+              <Shortcut
+                label={t("labels.bringForward")}
+                shortcuts={[getShortcutKey("CtrlOrCmd+]")]}
+              />
+              <Shortcut
+                label={t("labels.alignTop")}
+                shortcuts={[getShortcutKey("CtrlOrCmd+Shift+Up")]}
+              />
+              <Shortcut
+                label={t("labels.alignBottom")}
+                shortcuts={[getShortcutKey("CtrlOrCmd+Shift+Down")]}
+              />
+              <Shortcut
+                label={t("labels.alignLeft")}
+                shortcuts={[getShortcutKey("CtrlOrCmd+Shift+Left")]}
+              />
+              <Shortcut
+                label={t("labels.alignRight")}
+                shortcuts={[getShortcutKey("CtrlOrCmd+Shift+Right")]}
+              />
+              <Shortcut
+                label={t("labels.duplicateSelection")}
+                shortcuts={[
+                  getShortcutKey("CtrlOrCmd+D"),
+                  getShortcutKey(`Alt+${t("shortcutsDialog.drag")}`),
+                ]}
+              />
+              <Shortcut
+                label={t("buttons.undo")}
+                shortcuts={[getShortcutKey("CtrlOrCmd+Z")]}
+              />
+              <Shortcut
+                label={t("buttons.redo")}
+                shortcuts={[getShortcutKey("CtrlOrCmd+Shift+Z")]}
+              />
+              <Shortcut
+                label={t("labels.group")}
+                shortcuts={[getShortcutKey("CtrlOrCmd+G")]}
+              />
+              <Shortcut
+                label={t("labels.ungroup")}
+                shortcuts={[getShortcutKey("CtrlOrCmd+Shift+G")]}
+              />
+            </ShortcutIsland>
+          </Column>
+        </Columns>
+        <Footer />
+      </Dialog>
+    </>
+  );
+};

src/components/Stats.scss

@@ -1,4 +1,4 @@
-@import "../css/variables.module";
+@import "../css/_variables";
 
 .Stats {
   position: fixed;

src/components/Stats.tsx

@@ -24,7 +24,6 @@ const getStorageSizes = debounce((cb: (sizes: StorageSizes) => void) => {
 }, 500);
 
 export const Stats = (props: {
-  setAppState: React.Component<any, AppState>["setState"];
   appState: AppState;
   elements: readonly NonDeletedExcalidrawElement[];
   onClose: () => void;
@@ -47,12 +46,6 @@ export const Stats = (props: {
   const selectedElements = getTargetElements(props.elements, props.appState);
   const selectedBoundingBox = getCommonBounds(selectedElements);
 
-  const onGridSizeChange = () => {
-    props.setAppState({
-      gridSize: ((props.appState.gridSize - 5) % 50) + 10,
-    });
-  };
-
   if (isMobile && props.appState.openMenu) {
     return null;
   }
@@ -163,17 +156,6 @@ export const Stats = (props: {
                 </td>
               </tr>
             )}
-            {props.appState.showGrid && (
-              <>
-                <tr>
-                  <th colSpan={2}>{"Misc"}</th>
-                </tr>
-                <tr onClick={onGridSizeChange} style={{ cursor: "pointer" }}>
-                  <td>{"Grid size"}</td>
-                  <td>{props.appState.gridSize}</td>
-                </tr>
-              </>
-            )}
           </tbody>
         </table>
       </Island>

src/components/TextInput.scss

@@ -1,4 +1,4 @@
-@import "../css/variables.module";
+@import "../css/_variables.scss";
 
 .excalidraw {
   .TextInput {

src/components/Toast.scss

@@ -1,32 +0,0 @@
-@import "../css/variables.module";
-
-.excalidraw {
-  .Toast {
-    animation: fade-in 0.5s;
-    background-color: var(--button-gray-1);
-    border-radius: 4px;
-    bottom: 10px;
-    box-sizing: border-box;
-    cursor: default;
-    left: 50%;
-    margin-left: -150px;
-    padding: 4px 0;
-    position: fixed;
-    text-align: center;
-    width: 300px;
-    z-index: 999999;
-  }
-
-  .Toast__message {
-    color: var(--popup-text-color);
-  }
-
-  @keyframes fade-in {
-    from {
-      opacity: 0;
-    }
-    to {
-      opacity: 1;
-    }
-  }
-}

src/components/Toast.tsx

@@ -1,34 +0,0 @@
-import React, { useCallback, useEffect, useRef } from "react";
-import { TOAST_TIMEOUT } from "../constants";
-import "./Toast.scss";
-
-export const Toast = ({
-  message,
-  clearToast,
-}: {
-  message: string;
-  clearToast: () => void;
-}) => {
-  const timerRef = useRef<number>(0);
-
-  const scheduleTimeout = useCallback(
-    () =>
-      (timerRef.current = window.setTimeout(() => clearToast(), TOAST_TIMEOUT)),
-    [clearToast],
-  );
-
-  useEffect(() => {
-    scheduleTimeout();
-    return () => clearTimeout(timerRef.current);
-  }, [scheduleTimeout, message]);
-
-  return (
-    <div
-      className="Toast"
-      onMouseEnter={() => clearTimeout(timerRef?.current)}
-      onMouseLeave={scheduleTimeout}
-    >
-      <p className="Toast__message">{message}</p>
-    </div>
-  );
-};

src/components/ToolIcon.scss

@@ -1,5 +1,5 @@
 @import "open-color/open-color.scss";
-@import "../css/variables.module";
+@import "../css/variables";
 
 .excalidraw {
   .ToolIcon {

src/components/Tooltip.scss

@@ -1,4 +1,4 @@
-@import "../css/variables.module";
+@import "../css/_variables";
 .excalidraw {
   .Tooltip {
     position: relative;
@@ -48,7 +48,15 @@
     }
   }
 
-  .Tooltip:hover .Tooltip__label {
+  // the following 3 rules ensure that the tooltip doesn't show (nor affect
+  // the cursor) when you drag over when you draw on canvas, but at the same
+  // time it still works when clicking on the link/shield
+
+  body:active & .Tooltip:not(:hover) {
+    pointer-events: none;
+  }
+
+  body:not(:active) & .Tooltip:hover .Tooltip__label {
     visibility: visible;
   }
 

src/constants.ts

@@ -70,7 +70,6 @@ export const DEFAULT_FONT_SIZE = 20;
 export const DEFAULT_FONT_FAMILY: FontFamily = 1;
 export const DEFAULT_TEXT_ALIGN = "left";
 export const DEFAULT_VERTICAL_ALIGN = "top";
-export const DEFAULT_VERSION = "{version}";
 
 export const CANVAS_ONLY_ACTIONS = ["selectAll"];
 
@@ -89,7 +88,5 @@ export const STORAGE_KEYS = {
 export const TAP_TWICE_TIMEOUT = 300;
 export const TOUCH_CTX_MENU_TIMEOUT = 500;
 export const TITLE_TIMEOUT = 10000;
-export const TOAST_TIMEOUT = 5000;
-export const VERSION_TIMEOUT = 30000;
 
-export const ZOOM_STEP = 0.1;
+export const SCENE_NAME_FALLBACK = "Untitled";

src/createInverseContext.tsx

@@ -1,42 +0,0 @@
-import React from "react";
-
-export const createInverseContext = <T extends unknown = null>(
-  initialValue: T,
-) => {
-  const Context = React.createContext(initialValue) as React.Context<T> & {
-    _updateProviderValue?: (value: T) => void;
-  };
-
-  class InverseConsumer extends React.Component {
-    state = { value: initialValue };
-    constructor(props: any) {
-      super(props);
-      Context._updateProviderValue = (value: T) => this.setState({ value });
-    }
-    render() {
-      return (
-        <Context.Provider value={this.state.value}>
-          {this.props.children}
-        </Context.Provider>
-      );
-    }
-  }
-
-  class InverseProvider extends React.Component<{ value: T }> {
-    componentDidMount() {
-      Context._updateProviderValue?.(this.props.value);
-    }
-    componentDidUpdate() {
-      Context._updateProviderValue?.(this.props.value);
-    }
-    render() {
-      return <Context.Consumer>{() => this.props.children}</Context.Consumer>;
-    }
-  }
-
-  return {
-    Context,
-    Consumer: InverseConsumer,
-    Provider: InverseProvider,
-  };
-};

src/css/_variables.scss

@@ -2,7 +2,3 @@
 
 // keep up to date with is-mobile.tsx
 $is-mobile-query: "(max-width: 600px), (max-height: 500px) and (max-width: 1000px)";
-
-:export {
-  isMobileQuery: unquote($is-mobile-query);
-}

src/css/styles.scss

@@ -1,4 +1,4 @@
-@import "./variables.module";
+@import "./_variables";
 @import "./theme";
 
 .excalidraw {
@@ -13,7 +13,7 @@
   a {
     font-weight: 500;
     text-decoration: none;
-    color: var(--link-color);
+    color: $oc-blue-7; /* OC Blue 7 */
 
     &:hover {
       text-decoration: underline;
@@ -282,7 +282,7 @@
     pointer-events: none !important;
   }
 
-  .layer-ui__wrapper:not(.disable-pointerEvents) .App-menu_top > * {
+  .App-menu_top > * {
     pointer-events: all;
   }
 
@@ -323,7 +323,7 @@
     }
   }
 
-  .layer-ui__wrapper:not(.disable-pointerEvents) .App-menu_bottom > * {
+  .App-menu_bottom > * {
     pointer-events: all;
   }
 
@@ -431,7 +431,6 @@
     cursor: pointer;
     fill: $oc-gray-6;
     bottom: 14px;
-    width: 1.5rem;
 
     :root[dir="ltr"] & {
       right: 14px;
@@ -492,13 +491,6 @@
     pointer-events: none !important;
   }
 
-  &.excalidraw--view-mode {
-    .App-menu {
-      display: flex;
-      justify-content: space-between;
-    }
-  }
-
   @media print {
     .App-bottom-bar,
     .FixedSideContainer,

src/css/theme.scss

@@ -32,7 +32,6 @@
   --popup-text-color: #{$oc-black};
   --popup-text-inverted-color: #{$oc-white};
   --dialog-border: #{$oc-gray-6};
-  --link-color: #{$oc-blue-7};
 }
 
 .excalidraw {

src/data/blob.ts

@@ -1,3 +1,4 @@
+import { EVENT_IO, trackEvent } from "../analytics";
 import { cleanAppStateForExport } from "../appState";
 import { MIME_TYPES } from "../constants";
 import { clearElementsForExport } from "../element";
@@ -110,6 +111,7 @@ export const loadFromBlob = async (
       localAppState,
     );
 
+    trackEvent(EVENT_IO, "load", getMimeType(blob));
     return result;
   } catch (error) {
     console.error(error.message);

src/data/index.ts

@@ -1,4 +1,5 @@
-import { fileSave } from "browser-fs-access";
+import { fileSave } from "browser-nativefs";
+import { EVENT_IO, trackEvent } from "../analytics";
 import {
   copyCanvasToClipboardAsPng,
   copyTextToSystemClipboard,
@@ -7,8 +8,8 @@ import { NonDeletedExcalidrawElement } from "../element/types";
 import { t } from "../i18n";
 import { exportToCanvas, exportToSvg } from "../scene/export";
 import { ExportType } from "../scene/types";
-import { AppState } from "../types";
 import { canvasToBlob } from "./blob";
+import { AppState } from "../types";
 import { serializeAsJSON } from "./json";
 
 export { loadFromBlob } from "./blob";
@@ -36,7 +37,7 @@ export const exportCanvas = async (
   },
 ) => {
   if (elements.length === 0) {
-    throw new Error(t("alerts.cannotExportEmptyCanvas"));
+    return window.alert(t("alerts.cannotExportEmptyCanvas"));
   }
   if (type === "svg" || type === "clipboard-svg") {
     const tempSvg = exportToSvg(elements, {
@@ -59,8 +60,10 @@ export const exportCanvas = async (
         fileName: `${name}.svg`,
         extensions: [".svg"],
       });
+      trackEvent(EVENT_IO, "export", "svg");
       return;
     } else if (type === "clipboard-svg") {
+      trackEvent(EVENT_IO, "export", "clipboard-svg");
       copyTextToSystemClipboard(tempSvg.outerHTML);
       return;
     }
@@ -92,9 +95,11 @@ export const exportCanvas = async (
       fileName,
       extensions: [".png"],
     });
+    trackEvent(EVENT_IO, "export", "png");
   } else if (type === "clipboard") {
     try {
       await copyCanvasToClipboardAsPng(tempCanvas);
+      trackEvent(EVENT_IO, "export", "clipboard-png");
     } catch (error) {
       if (error.name === "CANVAS_POSSIBLY_TOO_BIG") {
         throw error;

src/data/json.ts

@@ -1,11 +1,13 @@
-import { fileOpen, fileSave } from "browser-fs-access";
-import { cleanAppStateForExport } from "../appState";
-import { MIME_TYPES } from "../constants";
-import { clearElementsForExport } from "../element";
 import { ExcalidrawElement } from "../element/types";
 import { AppState } from "../types";
+import { cleanAppStateForExport } from "../appState";
+
+import { fileOpen, fileSave } from "browser-nativefs";
 import { loadFromBlob } from "./blob";
 import { Library } from "./library";
+import { MIME_TYPES } from "../constants";
+import { clearElementsForExport } from "../element";
+import { EVENT_LIBRARY, trackEvent } from "../analytics";
 
 export const serializeAsJSON = (
   elements: readonly ExcalidrawElement[],
@@ -82,6 +84,7 @@ export const saveLibraryAsJSON = async () => {
     description: "Excalidraw library file",
     extensions: [".excalidrawlib"],
   });
+  trackEvent(EVENT_LIBRARY, "save");
 };
 
 export const importLibraryFromJSON = async () => {
@@ -90,5 +93,6 @@ export const importLibraryFromJSON = async () => {
     extensions: [".json", ".excalidrawlib"],
     mimeTypes: ["application/json"],
   });
+  trackEvent(EVENT_LIBRARY, "load");
   Library.importLibrary(blob);
 };

src/data/restore.ts

@@ -15,6 +15,7 @@ import {
   DEFAULT_VERTICAL_ALIGN,
 } from "../constants";
 import { getDefaultAppState } from "../appState";
+import { getNewSceneName } from "../utils";
 
 const getFontFamilyByName = (fontFamilyName: string): FontFamily => {
   for (const [id, fontFamilyString] of Object.entries(FONT_FAMILY)) {
@@ -166,6 +167,7 @@ const restoreAppState = (
 
   return {
     ...nextAppState,
+    name: appState.name ?? localAppState?.name ?? getNewSceneName(),
     offsetLeft: appState.offsetLeft || 0,
     offsetTop: appState.offsetTop || 0,
     // Migrates from previous version where appState.zoom was a number

src/element/index.ts

@@ -34,6 +34,7 @@ export {
 export {
   resizeTest,
   getCursorForResizingElement,
+  normalizeTransformHandleType,
   getElementWithTransformHandleType,
   getTransformHandleTypeFromCoords,
 } from "./resizeTest";

src/element/linearElementEditor.ts

@@ -102,7 +102,6 @@ export class LinearElementEditor {
         element,
         scenePointerX - editingLinearElement.pointerOffset.x,
         scenePointerY - editingLinearElement.pointerOffset.y,
-        appState.showGrid,
         appState.gridSize,
       );
       LinearElementEditor.movePoint(element, activePointIndex, newPoint);
@@ -199,7 +198,6 @@ export class LinearElementEditor {
               element,
               scenePointer.x,
               scenePointer.y,
-              appState.showGrid,
               appState.gridSize,
             ),
           ],
@@ -284,8 +282,7 @@ export class LinearElementEditor {
     scenePointerX: number,
     scenePointerY: number,
     editingLinearElement: LinearElementEditor,
-    isGridOn: boolean,
-    gridSize: number,
+    gridSize: number | null,
   ): LinearElementEditor {
     const { elementId, lastUncommittedPoint } = editingLinearElement;
     const element = LinearElementEditor.getElement(elementId);
@@ -307,7 +304,6 @@ export class LinearElementEditor {
       element,
       scenePointerX - editingLinearElement.pointerOffset.x,
       scenePointerY - editingLinearElement.pointerOffset.y,
-      isGridOn,
       gridSize,
     );
 
@@ -402,15 +398,9 @@ export class LinearElementEditor {
     element: NonDeleted<ExcalidrawLinearElement>,
     scenePointerX: number,
     scenePointerY: number,
-    isGridOn: boolean,
-    gridSize: number,
+    gridSize: number | null,
   ): Point {
-    const pointerOnGrid = getGridPoint(
-      scenePointerX,
-      scenePointerY,
-      isGridOn,
-      gridSize,
-    );
+    const pointerOnGrid = getGridPoint(scenePointerX, scenePointerY, gridSize);
     const [x1, y1, x2, y2] = getElementAbsoluteCoords(element);
     const cx = (x1 + x2) / 2;
     const cy = (y1 + y2) / 2;

src/element/resizeElements.ts

@@ -4,6 +4,7 @@ import { rescalePoints } from "../points";
 import {
   rotate,
   adjustXYWithRotation,
+  getFlipAdjustment,
   centerPoint,
   rotatePoint,
 } from "../math";
@@ -12,16 +13,21 @@ import {
   ExcalidrawTextElement,
   NonDeletedExcalidrawElement,
   NonDeleted,
+  ExcalidrawGenericElement,
+  ExcalidrawElement,
 } from "./types";
 import {
   getElementAbsoluteCoords,
   getCommonBounds,
   getResizedElementAbsoluteCoords,
 } from "./bounds";
-import { isLinearElement, isTextElement } from "./typeChecks";
+import { isGenericElement, isLinearElement, isTextElement } from "./typeChecks";
 import { mutateElement } from "./mutateElement";
 import { getPerfectElementSize } from "./sizeHelpers";
-import { getCursorForResizingElement } from "./resizeTest";
+import {
+  getCursorForResizingElement,
+  normalizeTransformHandleType,
+} from "./resizeTest";
 import { measureText, getFontString } from "../utils";
 import { updateBoundElements } from "./binding";
 import {
@@ -43,6 +49,7 @@ const normalizeAngle = (angle: number): number => {
 export const transformElements = (
   pointerDownState: PointerDownState,
   transformHandleType: MaybeTransformHandleType,
+  setTransformHandle: (nextTransformHandle: MaybeTransformHandleType) => void,
   selectedElements: readonly NonDeletedExcalidrawElement[],
   resizeArrowDirection: "origin" | "end",
   isRotateWithDiscreteAngle: boolean,
@@ -94,15 +101,36 @@ export const transformElements = (
       );
       updateBoundElements(element);
     } else if (transformHandleType) {
-      resizeSingleElement(
-        pointerDownState.originalElements.get(element.id) as typeof element,
-        shouldKeepSidesRatio,
-        element,
-        transformHandleType,
-        isResizeCenterPoint,
-        pointerX,
-        pointerY,
-      );
+      if (isGenericElement(element)) {
+        resizeSingleGenericElement(
+          pointerDownState.originalElements.get(element.id) as typeof element,
+          shouldKeepSidesRatio,
+          element,
+          transformHandleType,
+          isResizeCenterPoint,
+          pointerX,
+          pointerY,
+        );
+      } else {
+        const keepSquareAspectRatio = shouldKeepSidesRatio;
+        resizeSingleNonGenericElement(
+          element,
+          transformHandleType,
+          isResizeCenterPoint,
+          keepSquareAspectRatio,
+          pointerX,
+          pointerY,
+        );
+        setTransformHandle(
+          normalizeTransformHandleType(element, transformHandleType),
+        );
+        if (element.width < 0) {
+          mutateElement(element, { width: -element.width });
+        }
+        if (element.height < 0) {
+          mutateElement(element, { height: -element.height });
+        }
+      }
     }
 
     // update cursor
@@ -386,8 +414,8 @@ const resizeSingleTextElement = (
   }
 };
 
-const resizeSingleElement = (
-  stateAtResizeStart: NonDeletedExcalidrawElement,
+const resizeSingleGenericElement = (
+  stateAtResizeStart: NonDeleted<ExcalidrawGenericElement>,
   shouldKeepSidesRatio: boolean,
   element: NonDeletedExcalidrawElement,
   transformHandleDirection: TransformHandleDirection,
@@ -395,184 +423,251 @@ const resizeSingleElement = (
   pointerX: number,
   pointerY: number,
 ) => {
-  // Gets bounds corners
-  const [x1, y1, x2, y2] = getResizedElementAbsoluteCoords(
-    stateAtResizeStart,
-    stateAtResizeStart.width,
-    stateAtResizeStart.height,
-  );
+  const [x1, y1, x2, y2] = getElementAbsoluteCoords(stateAtResizeStart);
   const startTopLeft: Point = [x1, y1];
   const startBottomRight: Point = [x2, y2];
   const startCenter: Point = centerPoint(startTopLeft, startBottomRight);
 
   // Calculate new dimensions based on cursor position
+  let newWidth = stateAtResizeStart.width;
+  let newHeight = stateAtResizeStart.height;
   const rotatedPointer = rotatePoint(
     [pointerX, pointerY],
     startCenter,
     -stateAtResizeStart.angle,
   );
-
-  //Get bounds corners rendered on screen
-  const [esx1, esy1, esx2, esy2] = getResizedElementAbsoluteCoords(
-    element,
-    element.width,
-    element.height,
-  );
-  const boundsCurrentWidth = esx2 - esx1;
-  const boundsCurrentHeight = esy2 - esy1;
-
-  // It's important we set the initial scale value based on the width and height at resize start,
-  // otherwise previous dimensions affected by modifiers will be taken into account.
-  const atStartBoundsWidth = startBottomRight[0] - startTopLeft[0];
-  const atStartBoundsHeight = startBottomRight[1] - startTopLeft[1];
-  let scaleX = atStartBoundsWidth / boundsCurrentWidth;
-  let scaleY = atStartBoundsHeight / boundsCurrentHeight;
-
   if (transformHandleDirection.includes("e")) {
-    scaleX = (rotatedPointer[0] - startTopLeft[0]) / boundsCurrentWidth;
+    newWidth = rotatedPointer[0] - startTopLeft[0];
   }
   if (transformHandleDirection.includes("s")) {
-    scaleY = (rotatedPointer[1] - startTopLeft[1]) / boundsCurrentHeight;
+    newHeight = rotatedPointer[1] - startTopLeft[1];
   }
   if (transformHandleDirection.includes("w")) {
-    scaleX = (startBottomRight[0] - rotatedPointer[0]) / boundsCurrentWidth;
+    newWidth = startBottomRight[0] - rotatedPointer[0];
   }
   if (transformHandleDirection.includes("n")) {
-    scaleY = (startBottomRight[1] - rotatedPointer[1]) / boundsCurrentHeight;
+    newHeight = startBottomRight[1] - rotatedPointer[1];
   }
-  // Linear elements dimensions differ from bounds dimensions
-  const eleInitialWidth = stateAtResizeStart.width;
-  const eleInitialHeight = stateAtResizeStart.height;
-  // We have to use dimensions of element on screen, otherwise the scaling of the
-  // dimensions won't match the cursor for linear elements.
-  let eleNewWidth = element.width * scaleX;
-  let eleNewHeight = element.height * scaleY;
 
   // adjust dimensions for resizing from center
   if (isResizeFromCenter) {
-    eleNewWidth = 2 * eleNewWidth - eleInitialWidth;
-    eleNewHeight = 2 * eleNewHeight - eleInitialHeight;
+    newWidth = 2 * newWidth - stateAtResizeStart.width;
+    newHeight = 2 * newHeight - stateAtResizeStart.height;
   }
 
   // adjust dimensions to keep sides ratio
   if (shouldKeepSidesRatio) {
-    const widthRatio = Math.abs(eleNewWidth) / eleInitialWidth;
-    const heightRatio = Math.abs(eleNewHeight) / eleInitialHeight;
+    const widthRatio = Math.abs(newWidth) / stateAtResizeStart.width;
+    const heightRatio = Math.abs(newHeight) / stateAtResizeStart.height;
     if (transformHandleDirection.length === 1) {
-      eleNewHeight *= widthRatio;
-      eleNewWidth *= heightRatio;
+      newHeight *= widthRatio;
+      newWidth *= heightRatio;
     }
     if (transformHandleDirection.length === 2) {
       const ratio = Math.max(widthRatio, heightRatio);
-      eleNewWidth = eleInitialWidth * ratio * Math.sign(eleNewWidth);
-      eleNewHeight = eleInitialHeight * ratio * Math.sign(eleNewHeight);
+      newWidth = stateAtResizeStart.width * ratio * Math.sign(newWidth);
+      newHeight = stateAtResizeStart.height * ratio * Math.sign(newHeight);
     }
   }
 
-  const [
-    newBoundsX1,
-    newBoundsY1,
-    newBoundsX2,
-    newBoundsY2,
-  ] = getResizedElementAbsoluteCoords(
-    stateAtResizeStart,
-    eleNewWidth,
-    eleNewHeight,
-  );
-  const newBoundsWidth = newBoundsX2 - newBoundsX1;
-  const newBoundsHeight = newBoundsY2 - newBoundsY1;
-
   // Calculate new topLeft based on fixed corner during resize
-  let newTopLeft = [...startTopLeft] as [number, number];
+  let newTopLeft = startTopLeft as [number, number];
   if (["n", "w", "nw"].includes(transformHandleDirection)) {
     newTopLeft = [
-      startBottomRight[0] - Math.abs(newBoundsWidth),
-      startBottomRight[1] - Math.abs(newBoundsHeight),
+      startBottomRight[0] - Math.abs(newWidth),
+      startBottomRight[1] - Math.abs(newHeight),
     ];
   }
   if (transformHandleDirection === "ne") {
-    const bottomLeft = [startTopLeft[0], startBottomRight[1]];
-    newTopLeft = [bottomLeft[0], bottomLeft[1] - Math.abs(newBoundsHeight)];
+    const bottomLeft = [
+      stateAtResizeStart.x,
+      stateAtResizeStart.y + stateAtResizeStart.height,
+    ];
+    newTopLeft = [bottomLeft[0], bottomLeft[1] - Math.abs(newHeight)];
   }
   if (transformHandleDirection === "sw") {
-    const topRight = [startBottomRight[0], startTopLeft[1]];
-    newTopLeft = [topRight[0] - Math.abs(newBoundsWidth), topRight[1]];
+    const topRight = [
+      stateAtResizeStart.x + stateAtResizeStart.width,
+      stateAtResizeStart.y,
+    ];
+    newTopLeft = [topRight[0] - Math.abs(newWidth), topRight[1]];
   }
 
   // Keeps opposite handle fixed during resize
   if (shouldKeepSidesRatio) {
     if (["s", "n"].includes(transformHandleDirection)) {
-      newTopLeft[0] = startCenter[0] - newBoundsWidth / 2;
+      newTopLeft[0] = startCenter[0] - newWidth / 2;
     }
     if (["e", "w"].includes(transformHandleDirection)) {
-      newTopLeft[1] = startCenter[1] - newBoundsHeight / 2;
+      newTopLeft[1] = startCenter[1] - newHeight / 2;
     }
   }
 
   // Flip horizontally
-  if (eleNewWidth < 0) {
+  if (newWidth < 0) {
     if (transformHandleDirection.includes("e")) {
-      newTopLeft[0] -= Math.abs(newBoundsWidth);
+      newTopLeft[0] -= Math.abs(newWidth);
     }
     if (transformHandleDirection.includes("w")) {
-      newTopLeft[0] += Math.abs(newBoundsWidth);
+      newTopLeft[0] += Math.abs(newWidth);
     }
   }
   // Flip vertically
-  if (eleNewHeight < 0) {
+  if (newHeight < 0) {
     if (transformHandleDirection.includes("s")) {
-      newTopLeft[1] -= Math.abs(newBoundsHeight);
+      newTopLeft[1] -= Math.abs(newHeight);
     }
     if (transformHandleDirection.includes("n")) {
-      newTopLeft[1] += Math.abs(newBoundsHeight);
+      newTopLeft[1] += Math.abs(newHeight);
     }
   }
 
   if (isResizeFromCenter) {
-    newTopLeft[0] = startCenter[0] - Math.abs(newBoundsWidth) / 2;
-    newTopLeft[1] = startCenter[1] - Math.abs(newBoundsHeight) / 2;
+    newTopLeft[0] = startCenter[0] - Math.abs(newWidth) / 2;
+    newTopLeft[1] = startCenter[1] - Math.abs(newHeight) / 2;
   }
 
   // adjust topLeft to new rotation point
   const angle = stateAtResizeStart.angle;
   const rotatedTopLeft = rotatePoint(newTopLeft, startCenter, angle);
   const newCenter: Point = [
-    newTopLeft[0] + Math.abs(newBoundsWidth) / 2,
-    newTopLeft[1] + Math.abs(newBoundsHeight) / 2,
+    newTopLeft[0] + Math.abs(newWidth) / 2,
+    newTopLeft[1] + Math.abs(newHeight) / 2,
   ];
   const rotatedNewCenter = rotatePoint(newCenter, startCenter, angle);
   newTopLeft = rotatePoint(rotatedTopLeft, rotatedNewCenter, -angle);
 
-  // Readjust points for linear elements
-  const rescaledPoints = rescalePointsInElement(
-    stateAtResizeStart,
-    eleNewWidth,
-    eleNewHeight,
-  );
-  // For linear elements (x,y) are the coordinates of the first drawn point not the top-left corner
-  // So we need to readjust (x,y) to be where the first point should be
-  const newOrigin = [...newTopLeft];
-  newOrigin[0] += stateAtResizeStart.x - newBoundsX1;
-  newOrigin[1] += stateAtResizeStart.y - newBoundsY1;
-
   const resizedElement = {
-    width: Math.abs(eleNewWidth),
-    height: Math.abs(eleNewHeight),
-    x: newOrigin[0],
-    y: newOrigin[1],
-    ...rescaledPoints,
+    width: Math.abs(newWidth),
+    height: Math.abs(newHeight),
+    x: newTopLeft[0],
+    y: newTopLeft[1],
   };
+  updateBoundElements(element, {
+    newSize: { width: resizedElement.width, height: resizedElement.height },
+  });
+  mutateElement(element, resizedElement);
+};
+
+const resizeSingleNonGenericElement = (
+  element: NonDeleted<Exclude<ExcalidrawElement, ExcalidrawGenericElement>>,
+  transformHandleType: "n" | "s" | "w" | "e" | "nw" | "ne" | "sw" | "se",
+  isResizeFromCenter: boolean,
+  keepSquareAspectRatio: boolean,
+  pointerX: number,
+  pointerY: number,
+) => {
+  const [x1, y1, x2, y2] = getElementAbsoluteCoords(element);
+  const cx = (x1 + x2) / 2;
+  const cy = (y1 + y2) / 2;
+
+  // rotation pointer with reverse angle
+  const [rotatedX, rotatedY] = rotate(
+    pointerX,
+    pointerY,
+    cx,
+    cy,
+    -element.angle,
+  );
+
+  let scaleX = 1;
+  let scaleY = 1;
+  if (
+    transformHandleType === "e" ||
+    transformHandleType === "ne" ||
+    transformHandleType === "se"
+  ) {
+    scaleX = (rotatedX - x1) / (x2 - x1);
+  }
+  if (
+    transformHandleType === "s" ||
+    transformHandleType === "sw" ||
+    transformHandleType === "se"
+  ) {
+    scaleY = (rotatedY - y1) / (y2 - y1);
+  }
+  if (
+    transformHandleType === "w" ||
+    transformHandleType === "nw" ||
+    transformHandleType === "sw"
+  ) {
+    scaleX = (x2 - rotatedX) / (x2 - x1);
+  }
+  if (
+    transformHandleType === "n" ||
+    transformHandleType === "nw" ||
+    transformHandleType === "ne"
+  ) {
+    scaleY = (y2 - rotatedY) / (y2 - y1);
+  }
+  let nextWidth = element.width * scaleX;
+  let nextHeight = element.height * scaleY;
+  if (keepSquareAspectRatio) {
+    nextWidth = nextHeight = Math.max(nextWidth, nextHeight);
+  }
+
+  const [nextX1, nextY1, nextX2, nextY2] = getResizedElementAbsoluteCoords(
+    element,
+    nextWidth,
+    nextHeight,
+  );
+  const deltaX1 = (x1 - nextX1) / 2;
+  const deltaY1 = (y1 - nextY1) / 2;
+  const deltaX2 = (x2 - nextX2) / 2;
+  const deltaY2 = (y2 - nextY2) / 2;
+
+  const rescaledPoints = rescalePointsInElement(element, nextWidth, nextHeight);
+
+  updateBoundElements(element, {
+    newSize: { width: nextWidth, height: nextHeight },
+  });
+  const [finalX1, finalY1, finalX2, finalY2] = getResizedElementAbsoluteCoords(
+    {
+      ...element,
+      ...rescaledPoints,
+    },
+    Math.abs(nextWidth),
+    Math.abs(nextHeight),
+  );
+  const [flipDiffX, flipDiffY] = getFlipAdjustment(
+    transformHandleType,
+    nextWidth,
+    nextHeight,
+    nextX1,
+    nextY1,
+    nextX2,
+    nextY2,
+    finalX1,
+    finalY1,
+    finalX2,
+    finalY2,
+    isLinearElement(element),
+    element.angle,
+  );
+  const [nextElementX, nextElementY] = adjustXYWithRotation(
+    getSidesForTransformHandle(transformHandleType, isResizeFromCenter),
+    element.x - flipDiffX,
+    element.y - flipDiffY,
+    element.angle,
+    deltaX1,
+    deltaY1,
+    deltaX2,
+    deltaY2,
+  );
 
   if (
-    resizedElement.width !== 0 &&
-    resizedElement.height !== 0 &&
-    Number.isFinite(resizedElement.x) &&
-    Number.isFinite(resizedElement.y)
+    nextWidth !== 0 &&
+    nextHeight !== 0 &&
+    Number.isFinite(nextElementX) &&
+    Number.isFinite(nextElementY)
   ) {
-    updateBoundElements(element, {
-      newSize: { width: resizedElement.width, height: resizedElement.height },
+    mutateElement(element, {
+      width: nextWidth,
+      height: nextHeight,
+      x: nextElementX,
+      y: nextElementY,
+      ...rescaledPoints,
     });
-    mutateElement(element, resizedElement);
   }
 };
 

src/element/resizeTest.ts

@@ -173,3 +173,57 @@ export const getCursorForResizingElement = (resizingElement: {
 
   return cursor ? `${cursor}-resize` : "";
 };
+
+export const normalizeTransformHandleType = (
+  element: ExcalidrawElement,
+  transformHandleType: TransformHandleType,
+): TransformHandleType => {
+  if (element.width >= 0 && element.height >= 0) {
+    return transformHandleType;
+  }
+
+  if (element.width < 0 && element.height < 0) {
+    switch (transformHandleType) {
+      case "nw":
+        return "se";
+      case "ne":
+        return "sw";
+      case "se":
+        return "nw";
+      case "sw":
+        return "ne";
+    }
+  } else if (element.width < 0) {
+    switch (transformHandleType) {
+      case "nw":
+        return "ne";
+      case "ne":
+        return "nw";
+      case "se":
+        return "sw";
+      case "sw":
+        return "se";
+      case "e":
+        return "w";
+      case "w":
+        return "e";
+    }
+  } else {
+    switch (transformHandleType) {
+      case "nw":
+        return "sw";
+      case "ne":
+        return "se";
+      case "se":
+        return "ne";
+      case "sw":
+        return "nw";
+      case "n":
+        return "s";
+      case "s":
+        return "n";
+    }
+  }
+
+  return transformHandleType;
+};

src/element/showSelectedShapeActions.ts

@@ -7,8 +7,7 @@ export const showSelectedShapeActions = (
   elements: readonly NonDeletedExcalidrawElement[],
 ) =>
   Boolean(
-    !appState.viewModeEnabled &&
-      (appState.editingElement ||
-        getSelectedElements(elements, appState).length ||
-        appState.elementType !== "selection"),
+    appState.editingElement ||
+      getSelectedElements(elements, appState).length ||
+      appState.elementType !== "selection",
   );

src/excalidraw-app/collab/CollabWrapper.tsx

@@ -1,38 +1,40 @@
-import throttle from "lodash.throttle";
 import React, { PureComponent } from "react";
-import { ExcalidrawImperativeAPI } from "../../components/App";
-import { ErrorDialog } from "../../components/ErrorDialog";
+import throttle from "lodash.throttle";
+
 import { APP_NAME, ENV, EVENT } from "../../constants";
-import { ImportedDataState } from "../../data/types";
-import { ExcalidrawElement } from "../../element/types";
-import {
-  getElementMap,
-  getSceneVersion,
-  getSyncableElements,
-} from "../../packages/excalidraw/index";
-import { Collaborator, Gesture } from "../../types";
-import { resolvablePromise, withBatchedUpdates } from "../../utils";
-import {
-  INITIAL_SCENE_UPDATE_TIMEOUT,
-  SCENE,
-  SYNC_FULL_SCENE_INTERVAL_MS,
-} from "../app_constants";
+
 import {
   decryptAESGEM,
-  generateCollaborationLink,
-  getCollaborationLinkData,
   SocketUpdateDataSource,
+  getCollaborationLinkData,
+  generateCollaborationLink,
   SOCKET_SERVER,
 } from "../data";
 import { isSavedToFirebase, saveToFirebase } from "../data/firebase";
+
+import Portal from "./Portal";
+import { AppState, Collaborator, Gesture } from "../../types";
+import { ExcalidrawElement } from "../../element/types";
 import {
   importUsernameFromLocalStorage,
   saveUsernameToLocalStorage,
   STORAGE_KEYS,
 } from "../data/localStorage";
-import Portal from "./Portal";
+import { resolvablePromise, withBatchedUpdates } from "../../utils";
+import {
+  getSceneVersion,
+  getSyncableElements,
+} from "../../packages/excalidraw/index";
 import RoomDialog from "./RoomDialog";
-import { createInverseContext } from "../../createInverseContext";
+import { ErrorDialog } from "../../components/ErrorDialog";
+import { ImportedDataState } from "../../data/types";
+import { ExcalidrawImperativeAPI } from "../../components/App";
+import {
+  INITIAL_SCENE_UPDATE_TIMEOUT,
+  SCENE,
+  SYNC_FULL_SCENE_INTERVAL_MS,
+} from "../app_constants";
+import { EVENT_SHARE, trackEvent } from "../../analytics";
 
 interface CollabState {
   isCollaborating: boolean;
@@ -58,21 +60,17 @@ type ReconciledElements = readonly ExcalidrawElement[] & {
 };
 
 interface Props {
-  excalidrawAPI: ExcalidrawImperativeAPI;
+  children: (collab: CollabAPI) => React.ReactNode;
+  // NOTE not type-safe because the refObject may in fact not be initialized
+  // with ExcalidrawImperativeAPI yet
+  excalidrawRef: React.MutableRefObject<ExcalidrawImperativeAPI>;
 }
 
-const {
-  Context: CollabContext,
-  Consumer: CollabContextConsumer,
-  Provider: CollabContextProvider,
-} = createInverseContext<{ api: CollabAPI | null }>({ api: null });
-
-export { CollabContext, CollabContextConsumer };
-
 class CollabWrapper extends PureComponent<Props, CollabState> {
   portal: Portal;
-  excalidrawAPI: Props["excalidrawAPI"];
   private socketInitializationTimer?: NodeJS.Timeout;
+  private excalidrawRef: Props["excalidrawRef"];
+  excalidrawAppState?: AppState;
   private lastBroadcastedOrReceivedSceneVersion: number = -1;
   private collaborators = new Map<string, Collaborator>();
 
@@ -86,7 +84,7 @@ class CollabWrapper extends PureComponent<Props, CollabState> {
       activeRoomLink: "",
     };
     this.portal = new Portal(this);
-    this.excalidrawAPI = props.excalidrawAPI;
+    this.excalidrawRef = props.excalidrawRef;
   }
 
   componentDidMount() {
@@ -148,7 +146,7 @@ class CollabWrapper extends PureComponent<Props, CollabState> {
 
   saveCollabRoomToFirebase = async (
     syncableElements: ExcalidrawElement[] = getSyncableElements(
-      this.excalidrawAPI.getSceneElementsIncludingDeleted(),
+      this.excalidrawRef.current!.getSceneElementsIncludingDeleted(),
     ),
   ) => {
     try {
@@ -160,16 +158,17 @@ class CollabWrapper extends PureComponent<Props, CollabState> {
 
   openPortal = async () => {
     window.history.pushState({}, APP_NAME, await generateCollaborationLink());
-    const elements = this.excalidrawAPI.getSceneElements();
+    const elements = this.excalidrawRef.current!.getSceneElements();
     // remove deleted elements from elements array & history to ensure we don't
     // expose potentially sensitive user data in case user manually deletes
     // existing elements (or clears scene), which would otherwise be persisted
     // to database even if deleted before creating the room.
-    this.excalidrawAPI.history.clear();
-    this.excalidrawAPI.updateScene({
+    this.excalidrawRef.current!.history.clear();
+    this.excalidrawRef.current!.updateScene({
       elements,
       commitToHistory: true,
     });
+    trackEvent(EVENT_SHARE, "session start");
     return this.initializeSocketClient();
   };
 
@@ -177,11 +176,12 @@ class CollabWrapper extends PureComponent<Props, CollabState> {
     this.saveCollabRoomToFirebase();
     window.history.pushState({}, APP_NAME, window.location.origin);
     this.destroySocketClient();
+    trackEvent(EVENT_SHARE, "session end");
   };
 
   private destroySocketClient = () => {
     this.collaborators = new Map();
-    this.excalidrawAPI.updateScene({
+    this.excalidrawRef.current!.updateScene({
       collaborators: this.collaborators,
     });
     this.setState({
@@ -271,7 +271,7 @@ class CollabWrapper extends PureComponent<Props, CollabState> {
               user.selectedElementIds = selectedElementIds;
               user.username = username;
               collaborators.set(socketId, user);
-              this.excalidrawAPI.updateScene({
+              this.excalidrawRef.current!.updateScene({
                 collaborators,
               });
               break;
@@ -306,55 +306,7 @@ class CollabWrapper extends PureComponent<Props, CollabState> {
   private reconcileElements = (
     elements: readonly ExcalidrawElement[],
   ): ReconciledElements => {
-    const currentElements = this.getSceneElementsIncludingDeleted();
-    // create a map of ids so we don't have to iterate
-    // over the array more than once.
-    const localElementMap = getElementMap(currentElements);
-
-    const appState = this.excalidrawAPI.getAppState();
-
-    // Reconcile
-    const newElements: readonly ExcalidrawElement[] = elements
-      .reduce((elements, element) => {
-        // if the remote element references one that's currently
-        // edited on local, skip it (it'll be added in the next step)
-        if (
-          element.id === appState.editingElement?.id ||
-          element.id === appState.resizingElement?.id ||
-          element.id === appState.draggingElement?.id
-        ) {
-          return elements;
-        }
-
-        if (
-          localElementMap.hasOwnProperty(element.id) &&
-          localElementMap[element.id].version > element.version
-        ) {
-          elements.push(localElementMap[element.id]);
-          delete localElementMap[element.id];
-        } else if (
-          localElementMap.hasOwnProperty(element.id) &&
-          localElementMap[element.id].version === element.version &&
-          localElementMap[element.id].versionNonce !== element.versionNonce
-        ) {
-          // resolve conflicting edits deterministically by taking the one with the lowest versionNonce
-          if (localElementMap[element.id].versionNonce < element.versionNonce) {
-            elements.push(localElementMap[element.id]);
-          } else {
-            // it should be highly unlikely that the two versionNonces are the same. if we are
-            // really worried about this, we can replace the versionNonce with the socket id.
-            elements.push(element);
-          }
-          delete localElementMap[element.id];
-        } else {
-          elements.push(element);
-          delete localElementMap[element.id];
-        }
-
-        return elements;
-      }, [] as Mutable<typeof elements>)
-      // add local elements that weren't deleted or on remote
-      .concat(...Object.values(localElementMap));
+    const newElements = this.portal.reconcileElements(elements);
 
     // Avoid broadcasting to the rest of the collaborators the scene
     // we just received!
@@ -373,10 +325,10 @@ class CollabWrapper extends PureComponent<Props, CollabState> {
     }: { init?: boolean; initFromSnapshot?: boolean } = {},
   ) => {
     if (init || initFromSnapshot) {
-      this.excalidrawAPI.setScrollToCenter(elements);
+      this.excalidrawRef.current!.setScrollToCenter(elements);
     }
 
-    this.excalidrawAPI.updateScene({
+    this.excalidrawRef.current!.updateScene({
       elements,
       commitToHistory: !!init,
     });
@@ -385,7 +337,7 @@ class CollabWrapper extends PureComponent<Props, CollabState> {
     // when we receive any messages from another peer. This UX can be pretty rough -- if you
     // undo, a user makes a change, and then try to redo, your element(s) will be lost. However,
     // right now we think this is the right tradeoff.
-    this.excalidrawAPI.history.clear();
+    this.excalidrawRef.current!.history.clear();
   };
 
   setCollaborators(sockets: string[]) {
@@ -401,7 +353,7 @@ class CollabWrapper extends PureComponent<Props, CollabState> {
         }
       }
       this.collaborators = collaborators;
-      this.excalidrawAPI.updateScene({ collaborators });
+      this.excalidrawRef.current!.updateScene({ collaborators });
     });
   }
 
@@ -414,7 +366,7 @@ class CollabWrapper extends PureComponent<Props, CollabState> {
   };
 
   public getSceneElementsIncludingDeleted = () => {
-    return this.excalidrawAPI.getSceneElementsIncludingDeleted();
+    return this.excalidrawRef.current!.getSceneElementsIncludingDeleted();
   };
 
   onPointerUpdate = (payload: {
@@ -427,7 +379,11 @@ class CollabWrapper extends PureComponent<Props, CollabState> {
       this.portal.broadcastMouseLocation(payload);
   };
 
-  broadcastElements = (elements: readonly ExcalidrawElement[]) => {
+  broadcastElements = (
+    elements: readonly ExcalidrawElement[],
+    state: AppState,
+  ) => {
+    this.excalidrawAppState = state;
     if (
       getSceneVersion(elements) >
       this.getLastBroadcastedOrReceivedSceneVersion()
@@ -446,7 +402,7 @@ class CollabWrapper extends PureComponent<Props, CollabState> {
     this.portal.broadcastScene(
       SCENE.UPDATE,
       getSyncableElements(
-        this.excalidrawAPI.getSceneElementsIncludingDeleted(),
+        this.excalidrawRef.current!.getSceneElementsIncludingDeleted(),
       ),
       true,
     );
@@ -475,23 +431,8 @@ class CollabWrapper extends PureComponent<Props, CollabState> {
     });
   };
 
-  /** PRIVATE. Use `this.getContextValue()` instead. */
-  private contextValue: CollabAPI | null = null;
-
-  /** Getter of context value. Returned object is stable. */
-  getContextValue = (): CollabAPI => {
-    this.contextValue = this.contextValue || ({} as CollabAPI);
-
-    this.contextValue.isCollaborating = this.state.isCollaborating;
-    this.contextValue.username = this.state.username;
-    this.contextValue.onPointerUpdate = this.onPointerUpdate;
-    this.contextValue.initializeSocketClient = this.initializeSocketClient;
-    this.contextValue.onCollabButtonClick = this.onCollabButtonClick;
-    this.contextValue.broadcastElements = this.broadcastElements;
-    return this.contextValue;
-  };
-
   render() {
+    const { children } = this.props;
     const { modalIsShown, username, errorMessage, activeRoomLink } = this.state;
 
     return (
@@ -515,11 +456,14 @@ class CollabWrapper extends PureComponent<Props, CollabState> {
             onClose={() => this.setState({ errorMessage: "" })}
           />
         )}
-        <CollabContextProvider
-          value={{
-            api: this.getContextValue(),
-          }}
-        />
+        {children({
+          isCollaborating: this.state.isCollaborating,
+          username: this.state.username,
+          onPointerUpdate: this.onPointerUpdate,
+          initializeSocketClient: this.initializeSocketClient,
+          onCollabButtonClick: this.onCollabButtonClick,
+          broadcastElements: this.broadcastElements,
+        })}
       </>
     );
   }

src/excalidraw-app/collab/Portal.tsx

@@ -6,20 +6,23 @@ import {
 
 import CollabWrapper from "./CollabWrapper";
 
-import { getSyncableElements } from "../../packages/excalidraw/index";
+import {
+  getElementMap,
+  getSyncableElements,
+} from "../../packages/excalidraw/index";
 import { ExcalidrawElement } from "../../element/types";
 import { BROADCAST, SCENE } from "../app_constants";
 
 class Portal {
-  collab: CollabWrapper;
+  app: CollabWrapper;
   socket: SocketIOClient.Socket | null = null;
   socketInitialized: boolean = false; // we don't want the socket to emit any updates until it is fully initialized
   roomId: string | null = null;
   roomKey: string | null = null;
   broadcastedElementVersions: Map<string, number> = new Map();
 
-  constructor(collab: CollabWrapper) {
-    this.collab = collab;
+  constructor(app: CollabWrapper) {
+    this.app = app;
   }
 
   open(socket: SocketIOClient.Socket, id: string, key: string) {
@@ -27,7 +30,7 @@ class Portal {
     this.roomId = id;
     this.roomKey = key;
 
-    // Initialize socket listeners
+    // Initialize socket listeners (moving from App)
     this.socket.on("init-room", () => {
       if (this.socket) {
         this.socket.emit("join-room", this.roomId);
@@ -36,12 +39,12 @@ class Portal {
     this.socket.on("new-user", async (_socketId: string) => {
       this.broadcastScene(
         SCENE.INIT,
-        getSyncableElements(this.collab.getSceneElementsIncludingDeleted()),
+        getSyncableElements(this.app.getSceneElementsIncludingDeleted()),
         /* syncAll */ true,
       );
     });
     this.socket.on("room-user-change", (clients: string[]) => {
-      this.collab.setCollaborators(clients);
+      this.app.setCollaborators(clients);
     });
   }
 
@@ -122,10 +125,10 @@ class Portal {
       data as SocketUpdateData,
     );
 
-    if (syncAll && this.collab.state.isCollaborating) {
+    if (syncAll && this.app.state.isCollaborating) {
       await Promise.all([
         broadcastPromise,
-        this.collab.saveCollabRoomToFirebase(syncableElements),
+        this.app.saveCollabRoomToFirebase(syncableElements),
       ]);
     } else {
       await broadcastPromise;
@@ -143,9 +146,9 @@ class Portal {
           socketId: this.socket.id,
           pointer: payload.pointer,
           button: payload.button || "up",
-          selectedElementIds: this.collab.excalidrawAPI.getAppState()
-            .selectedElementIds,
-          username: this.collab.state.username,
+          selectedElementIds:
+            this.app.excalidrawAppState?.selectedElementIds || {},
+          username: this.app.state.username,
         },
       };
       return this._broadcastSocketData(
@@ -154,6 +157,62 @@ class Portal {
       );
     }
   };
+
+  reconcileElements = (
+    sceneElements: readonly ExcalidrawElement[],
+  ): readonly ExcalidrawElement[] => {
+    const currentElements = this.app.getSceneElementsIncludingDeleted();
+    // create a map of ids so we don't have to iterate
+    // over the array more than once.
+    const localElementMap = getElementMap(currentElements);
+
+    // Reconcile
+    return (
+      sceneElements
+        .reduce((elements, element) => {
+          // if the remote element references one that's currently
+          // edited on local, skip it (it'll be added in the next step)
+          if (
+            element.id === this.app.excalidrawAppState?.editingElement?.id ||
+            element.id === this.app.excalidrawAppState?.resizingElement?.id ||
+            element.id === this.app.excalidrawAppState?.draggingElement?.id
+          ) {
+            return elements;
+          }
+
+          if (
+            localElementMap.hasOwnProperty(element.id) &&
+            localElementMap[element.id].version > element.version
+          ) {
+            elements.push(localElementMap[element.id]);
+            delete localElementMap[element.id];
+          } else if (
+            localElementMap.hasOwnProperty(element.id) &&
+            localElementMap[element.id].version === element.version &&
+            localElementMap[element.id].versionNonce !== element.versionNonce
+          ) {
+            // resolve conflicting edits deterministically by taking the one with the lowest versionNonce
+            if (
+              localElementMap[element.id].versionNonce < element.versionNonce
+            ) {
+              elements.push(localElementMap[element.id]);
+            } else {
+              // it should be highly unlikely that the two versionNonces are the same. if we are
+              // really worried about this, we can replace the versionNonce with the socket id.
+              elements.push(element);
+            }
+            delete localElementMap[element.id];
+          } else {
+            elements.push(element);
+            delete localElementMap[element.id];
+          }
+
+          return elements;
+        }, [] as Mutable<typeof sceneElements>)
+        // add local elements that weren't deleted or on remote
+        .concat(...Object.values(localElementMap))
+    );
+  };
 }
 
 export default Portal;

src/excalidraw-app/collab/RoomDialog.scss

@@ -1,4 +1,4 @@
-@import "../../css/variables.module";
+@import "../../css/_variables";
 
 .excalidraw {
   .RoomDialog-linkContainer {

src/excalidraw-app/collab/RoomDialog.tsx

@@ -1,10 +1,12 @@
 import React, { useRef } from "react";
-import { copyTextToSystemClipboard } from "../../clipboard";
-import { Dialog } from "../../components/Dialog";
-import { clipboard, start, stop } from "../../components/icons";
-import { ToolButton } from "../../components/ToolButton";
 import { t } from "../../i18n";
+import { Dialog } from "../../components/Dialog";
+import { copyTextToSystemClipboard } from "../../clipboard";
+import { ToolButton } from "../../components/ToolButton";
+import { clipboard, start, stop } from "../../components/icons";
+
 import "./RoomDialog.scss";
+import { EVENT_SHARE, trackEvent } from "../../analytics";
 
 const RoomDialog = ({
   handleClose,
@@ -28,6 +30,7 @@ const RoomDialog = ({
   const copyRoomLink = async () => {
     try {
       await copyTextToSystemClipboard(activeRoomLink);
+      trackEvent(EVENT_SHARE, "copy link");
     } catch (error) {
       setErrorMessage(error.message);
     }
@@ -92,6 +95,7 @@ const RoomDialog = ({
                 value={username || ""}
                 className="RoomDialog-username TextInput"
                 onChange={(event) => onUsernameChange(event.target.value)}
+                onBlur={() => trackEvent(EVENT_SHARE, "name")}
                 onKeyPress={(event) => event.key === "Enter" && handleClose()}
               />
             </div>