docs: add excalidraw codebase section

2025-08-17 07:19:41 +02:00 · 2023-02-18 11:47:37 +01:00
234 changed files with 5216 additions and 10123 deletions
--- a/.env.development
+++ b/.env.development
@@ -22,13 +22,3 @@ REACT_APP_DEV_ENABLE_SW=
 REACT_APP_DEV_DISABLE_LIVE_RELOAD=

 FAST_REFRESH=false
-
-# MATOMO
-REACT_APP_MATOMO_URL=
-REACT_APP_CDN_MATOMO_TRACKER_URL=
-REACT_APP_MATOMO_SITE_ID=
-
-#Debug flags
-
-# To enable bounding box for text containers
-REACT_APP_DEBUG_ENABLE_TEXT_CONTAINER_BOUNDING_BOX=
--- a/.env.production
+++ b/.env.production
@@ -12,13 +12,6 @@ REACT_APP_WS_SERVER_URL=
 REACT_APP_FIREBASE_CONFIG='{"apiKey":"AIzaSyAd15pYlMci_xIp9ko6wkEsDzAAA0Dn0RU","authDomain":"excalidraw-room-persistence.firebaseapp.com","databaseURL":"https://excalidraw-room-persistence.firebaseio.com","projectId":"excalidraw-room-persistence","storageBucket":"excalidraw-room-persistence.appspot.com","messagingSenderId":"654800341332","appId":"1:654800341332:web:4a692de832b55bd57ce0c1"}'

 # production-only vars
-# GOOGLE ANALYTICS
 REACT_APP_GOOGLE_ANALYTICS_ID=UA-387204-13
-# MATOMO
-REACT_APP_MATOMO_URL=https://excalidraw.matomo.cloud/
-REACT_APP_CDN_MATOMO_TRACKER_URL=//cdn.matomo.cloud/excalidraw.matomo.cloud/matomo.js
-REACT_APP_MATOMO_SITE_ID=1
-
-

 REACT_APP_PLUS_APP=https://app.excalidraw.com
--- a/.gitignore
+++ b/.gitignore
@@ -25,4 +25,3 @@ src/packages/excalidraw/types
 src/packages/excalidraw/example/public/bundle.js
 src/packages/excalidraw/example/public/excalidraw-assets-dev
 src/packages/excalidraw/example/public/excalidraw.development.js
-coverage
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@
    An open source virtual hand-drawn style whiteboard. </br>
    Collaborative and end-to-end encrypted. </br>
  <br />
-  </h2>
+  </h3>
 </div>

 <br />
@@ -70,7 +70,7 @@ The Excalidraw editor (npm package) supports:

 ## Excalidraw.com

-The app hosted at [excalidraw.com](https://excalidraw.com) is a minimal showcase of what you can build with Excalidraw. Its [source code](https://github.com/excalidraw/excalidraw/tree/master/src/excalidraw-app) is part of this repository as well, and the app features:
+The app hosted at [excalidraw.com](https://excalidraw.com) is a minimal showcase of what you can build with Excalidraw. Its [source code](https://github.com/excalidraw/excalidraw/tree/maielo/new-readme/src/excalidraw-app) is part of this repository as well, and the app features:

 - 📡&nbsp;PWA support (works offline).
 - 🤼&nbsp;Real-time collaboration.
--- a/dev-docs/docs/@excalidraw/excalidraw/api/props/ref.mdx
+++ b/dev-docs/docs/@excalidraw/excalidraw/api/props/ref.mdx
@@ -1,19 +1,6 @@
 # ref
-
 <pre>
-  <a href="https://reactjs.org/docs/refs-and-the-dom.html#creating-refs">
-    createRef
-  </a>{" "}
-  &#124;{" "}
-  <a href="https://reactjs.org/docs/hooks-reference.html#useref">useRef</a>{" "}
-  &#124;{" "}
-  <a href="https://reactjs.org/docs/refs-and-the-dom.html#callback-refs">
-    callbackRef
-  </a>{" "}
-  &#124; <br />
-  &#123; current: &#123; readyPromise: <a href="https://github.com/excalidraw/excalidraw/blob/master/src/utils.ts#L460">
-    resolvablePromise
-  </a> } }
+<a href="https://reactjs.org/docs/refs-and-the-dom.html#creating-refs">createRef</a> &#124; <a href="https://reactjs.org/docs/hooks-reference.html#useref">useRef</a> &#124; <a href="https://reactjs.org/docs/refs-and-the-dom.html#callback-refs">callbackRef</a> &#124; <br/>&#123; current: &#123; readyPromise: <a href="https://github.com/excalidraw/excalidraw/blob/master/src/utils.ts#L460">resolvablePromise</a> } }
 </pre>

 You can pass a `ref` when you want to access some excalidraw APIs. We expose the below APIs:
@@ -152,9 +139,7 @@ function App() {
  return (
    <div style={{ height: "500px" }}>
      <p style={{ fontSize: "16px" }}> Click to update the scene</p>
-      <button className="custom-button" onClick={updateScene}>
-        Update Scene
-      </button>
+      <button className="custom-button" onClick={updateScene}>Update Scene</button>
      <Excalidraw ref={(api) => setExcalidrawAPI(api)} />
    </div>
  );
@@ -202,8 +187,7 @@ function App() {
  return (
    <div style={{ height: "500px" }}>
      <p style={{ fontSize: "16px" }}> Click to update the library items</p>
-      <button
-        className="custom-button"
+      <button className="custom-button"
        onClick={() => {
          const libraryItems = [
            {
@@ -221,8 +205,10 @@ function App() {
          ];
          excalidrawAPI.updateLibrary({
            libraryItems,
-            openLibraryMenu: true,
+            openLibraryMenu: true
+
          });
+         
        }}
      >
        Update Library
@@ -264,7 +250,7 @@ Resets the scene. If `resetLoadingState` is passed as true then it will also for

 <pre>
  () =>{" "}
-  <a href="https://github.com/excalidraw/excalidraw/blob/master/src/element/types.ts#L115">
+  <a href="https://github.com/excalidraw/excalidraw/blob/master/src/element/types.ts#L114">
    ExcalidrawElement[]
  </a>
 </pre>
@@ -275,7 +261,7 @@ Returns all the elements including the deleted in the scene.

 <pre>
  () => NonDeleted&#60;
-  <a href="https://github.com/excalidraw/excalidraw/blob/master/src/element/types.ts#L115">
+  <a href="https://github.com/excalidraw/excalidraw/blob/master/src/element/types.ts#L114">
    ExcalidrawElement
  </a>
  []&#62;
@@ -307,31 +293,18 @@ This is the history API. history.clear() will clear the history.
 ## scrollToContent

 <pre>
-  (<br />
-  {"  "}
-  target?:{" "}
-  <a href="https://github.com/excalidraw/excalidraw/blob/master/src/element/types.ts#L115">
+  (target?:{" "}
+  <a href="https://github.com/excalidraw/excalidraw/blob/master/src/element/types.ts#L114">
    ExcalidrawElement
  </a>{" "}
  &#124;{" "}
-  <a href="https://github.com/excalidraw/excalidraw/blob/master/src/element/types.ts#L115">
+  <a href="https://github.com/excalidraw/excalidraw/blob/master/src/element/types.ts#L114">
    ExcalidrawElement
  </a>
-  [],
-  <br />
-  {"  "}opts?: &#123; fitToContent?: boolean; animate?: boolean; duration?: number
-  &#125;
-  <br />) => void
+  []) => void
 </pre>

-Scroll the nearest element out of the elements supplied to the center of the viewport. Defaults to the elements on the scene.
-
-| Attribute | type | default | Description |
-| --- | --- | --- | --- |
-| target | <code>ExcalidrawElement &#124; ExcalidrawElement[]</code> | All scene elements | The element(s) to scroll to. |
-| opts.fitToContent | boolean | false | Whether to fit the elements to viewport by automatically changing zoom as needed. |
-| opts.animate | boolean | false | Whether to animate between starting and ending position. Note that for larger scenes the animation may not be smooth due to performance issues. |
-| opts.duration | number | 500 | Duration of the animation if `opts.animate` is `true`. |
+Scroll the nearest element out of the elements supplied to the center. Defaults to the elements on the scene.

 ## refresh

@@ -350,7 +323,7 @@ For any other cases if the position of excalidraw is updated (example due to scr
 This API can be used to show the toast with custom message.

 ```tsx
-({ message: string, closable?:boolean,duration?:number
+({ message: string, closable?:boolean,duration?:number 
  } | null) => void
 ```

@@ -385,18 +358,15 @@ This API can be used to get the files present in the scene. It may contain files

 This API has the below signature. It sets the `tool` passed in param as the active tool.

+
 <pre>
-  (tool: <br /> &#123; type:{" "}
-  <a href="https://github.com/excalidraw/excalidraw/blob/master/src/shapes.tsx#L15">
-    SHAPES
-  </a>
-  [number]["value"]&#124; "eraser" &#125; &#124;
-  <br /> &#123; type: "custom"; customType: string &#125;) => void
+(tool: <br/>  &#123; type: <a href="https://github.com/excalidraw/excalidraw/blob/master/src/shapes.tsx#L15">SHAPES</a>[number]["value"]&#124; "eraser" &#125; &#124;<br/>  &#123; type: "custom"; customType: string &#125;) => void
 </pre>

 ## setCursor

-This API can be used to customise the mouse cursor on the canvas and has the below signature. It sets the mouse cursor to the cursor passed in param.
+This API can be used to customise the mouse cursor on the canvas and has the below signature.   
+It sets the mouse cursor to the cursor passed in param.

 ```tsx
 (cursor: string) => void
--- a/dev-docs/docs/@excalidraw/excalidraw/api/utils/restore.mdx
+++ b/dev-docs/docs/@excalidraw/excalidraw/api/utils/restore.mdx
@@ -31,29 +31,10 @@ You can pass `null` / `undefined` if not applicable.
 restoreElements(
  elements: <a href="https://github.com/excalidraw/excalidraw/blob/master/src/element/types.ts#L114">ImportedDataState["elements"]</a>,<br/>&nbsp;
  localElements: <a href="https://github.com/excalidraw/excalidraw/blob/master/src/element/types.ts#L114">ExcalidrawElement[]</a> | null | undefined): <a href="https://github.com/excalidraw/excalidraw/blob/master/src/element/types.ts#L114">ExcalidrawElement[]</a>,<br/>&nbsp;
-  opts: &#123; refreshDimensions?: boolean, repairBindings?: boolean }<br/>
+  refreshDimensions?: boolean<br/>
 )
 </pre>

-| Prop | Type | Description |
-| ---- | ---- | ---- |
-| `elements` | <a href="https://github.com/excalidraw/excalidraw/blob/master/src/element/types.ts#L114">ImportedDataState["elements"]</a> | The `elements` to be restored |
-| [`localElements`](#localelements) | <a href="https://github.com/excalidraw/excalidraw/blob/master/src/element/types.ts#L114">ExcalidrawElement[]</a> &#124; null &#124; undefined |  When `localElements` are supplied, they are used to ensure that existing restored elements reuse `version` (and increment it), and regenerate `versionNonce`. |
-| [`opts`](#opts) | `Object` | The extra optional parameter to configure restored elements
-
-#### localElements
-
-When `localElements` are supplied, they are used to ensure that existing restored elements reuse `version` (and increment it), and regenerate `versionNonce`.  
-Use this when you `import` elements which may already be present in the scene to ensure that you do not disregard the newly imported elements if you're using element version to detect the update
-
-#### opts
-The extra optional parameter to configure restored elements. It has the following attributes
-
-| Prop | Type | Description|
-| --- | --- | ------|
-| `refreshDimensions` | `boolean` | Indicates whether we should also `recalculate` text element dimensions. Since this is a potentially costly operation, you may want to disable it if you restore elements in tight loops, such as during collaboration. |
-| `repairBindings` |`boolean` | Indicates whether the `bindings` for the elements should be repaired. This is to make sure there are no containers with non existent bound text element id and no bound text elements with non existent container id. |
-
 **_How to use_**

 ```js
@@ -62,6 +43,9 @@ import { restoreElements } from "@excalidraw/excalidraw";

 This function will make sure all properties of element is correctly set and if any attribute is missing, it will be set to its default value.

+When `localElements` are supplied, they are used to ensure that existing restored elements reuse `version` (and increment it), and regenerate `versionNonce`.  
+Use this when you import elements which may already be present in the scene to ensure that you do not disregard the newly imported elements if you're using element version to detect the updates.
+
 Parameter `refreshDimensions` indicates whether we should also `recalculate` text element dimensions. Defaults to `false`. Since this is a potentially costly operation, you may want to disable it if you restore elements in tight loops, such as during collaboration.

 ### restore
@@ -72,9 +56,7 @@ Parameter `refreshDimensions` indicates whether we should also `recalculate` tex
 restore(
  data: <a href="https://github.com/excalidraw/excalidraw/blob/master/src/data/types.ts#L34">ImportedDataState</a>,<br/>&nbsp;
  localAppState: Partial&lt;<a href="https://github.com/excalidraw/excalidraw/blob/master/src/types.ts#L95">AppState</a>> | null | undefined,<br/>&nbsp;
-  localElements: <a href="https://github.com/excalidraw/excalidraw/blob/master/src/element/types.ts#L114">ExcalidrawElement[]</a> | null | undefined<br/>): <a href="https://github.com/excalidraw/excalidraw/blob/master/src/data/types.ts#L4">DataState</a><br/>
-  opts: &#123; refreshDimensions?: boolean, repairBindings?: boolean }<br/>
-
+  localElements: <a href="https://github.com/excalidraw/excalidraw/blob/master/src/element/types.ts#L114">ExcalidrawElement[]</a> | null | undefined<br/>): <a href="https://github.com/excalidraw/excalidraw/blob/master/src/data/types.ts#L4">DataState</a>
 )
 </pre>

--- a/dev-docs/docs/@excalidraw/excalidraw/api/utils/utils-intro.md
+++ b/dev-docs/docs/@excalidraw/excalidraw/api/utils/utils-intro.md
@@ -339,47 +339,3 @@ The `device` has the following `attributes`
 | `isMobile` | `boolean` | Set to `true` when the device is `mobile` |
 | `isTouchScreen` | `boolean` | Set to `true` for `touch` devices |
 | `canDeviceFitSidebar` | `boolean` | Implies whether there is enough space to fit the `sidebar` |
-
-### i18n
-
-To help with localization, we export the following.
-
-| name | type |
-| --- | --- |
-| `defaultLang` | `string` |
-| `languages` | [`Language[]`](https://github.com/excalidraw/excalidraw/blob/master/src/i18n.ts#L15) |
-| `useI18n` | [`() => { langCode, t }`](https://github.com/excalidraw/excalidraw/blob/master/src/i18n.ts#L15) |
-
-```js
-import { defaultLang, languages, useI18n } from "@excalidraw/excalidraw";
-```
-
-#### defaultLang
-
-Default language code, `en`.
-
-#### languages
-
-List of supported language codes. You can pass any of these to `Excalidraw`'s [`langCode` prop](/docs/@excalidraw/excalidraw/api/props/#langcode).
-
-#### useI18n
-
-A hook that returns the current language code and translation helper function. You can use this to translate strings in the components you render as children of `<Excalidraw>`.
-
-```jsx live
-function App() {
-  const { t } = useI18n();
-  return (
-    <div style={{ height: "500px" }}>
-      <Excalidraw>
-        <button
-          style={{ position: "absolute", zIndex: 10, height: "2rem" }}
-          onClick={() => window.alert(t("labels.madeWithExcalidraw"))}
-        >
-          {t("buttons.confirm")}
-        </button>
-      </Excalidraw>
-    </div>
-  );
-}
-```
--- a/dev-docs/docs/@excalidraw/excalidraw/faq.mdx
+++ b/dev-docs/docs/@excalidraw/excalidraw/faq.mdx
@@ -4,34 +4,6 @@

 No, Excalidraw package doesn't come with collaboration built in, since the implementation is specific to each host app. We expose APIs which you can use to communicate with Excalidraw which you can use to implement it. You can check our own implementation [here](https://github.com/excalidraw/excalidraw/blob/master/src/excalidraw-app/index.tsx). Here is a [detailed answer](https://github.com/excalidraw/excalidraw/discussions/3879#discussioncomment-1110524) on how you can achieve the same.

-### Turning off Aggressive Anti-Fingerprinting in Brave browser
-
-When *Aggressive Anti-Fingerprinting* is turned on, the `measureText` API breaks which in turn breaks the Text Elements in your drawings. Here is more [info](https://github.com/excalidraw/excalidraw/pull/6336) on the same.
-
-We strongly recommend turning it off. You can follow the steps below on how to do so.
-
-
-1. Open [excalidraw.com](https://excalidraw.com) in Brave and click on the **Shield** button
-![Shield button](../../assets/brave-shield.png)
-
-<div style={{width:'30rem'}}>
-
-2. Once opened, look for **Aggressively Block Fingerprinting**
-
-![Aggresive block fingerprinting](../../assets/aggressive-block-fingerprint.png)
-
-3. Switch to **Block Fingerprinting**
-
-![Block filtering](../../assets/block-fingerprint.png)
-
-4. Thats all. All text elements should be fixed now 🎉
-
-</div>
-
-If disabling this setting doesn't fix the display of text elements, please consider opening an [issue](https://github.com/excalidraw/excalidraw/issues/new) on our GitHub, or message us on [Discord](https://discord.gg/UexuTaE).
-
-
-
 ## Need help?

 Check out the existing [Q&A](https://github.com/excalidraw/excalidraw/discussions?discussions_q=label%3Apackage%3Aexcalidraw). If you have any queries or need help, ask us [here](https://github.com/excalidraw/excalidraw/discussions?discussions_q=label%3Apackage%3Aexcalidraw).
--- a/dev-docs/docs/assets/aggressive-block-fingerprint.png
+++ b/dev-docs/docs/assets/aggressive-block-fingerprint.png
--- a/dev-docs/docs/assets/block-fingerprint.png
+++ b/dev-docs/docs/assets/block-fingerprint.png
--- a/dev-docs/docs/assets/brave-shield.png
+++ b/dev-docs/docs/assets/brave-shield.png
--- a/dev-docs/docs/codebase/introduction-to-the-codebase.mdx
+++ b/dev-docs/docs/codebase/introduction-to-the-codebase.mdx
@@ -0,0 +1,6 @@
+---
+title: Introduction to the codebase
+slug: ../
+---
+
+This section is documenting the Excalidraw codebase itself for developers who want to contribute to the project.
--- a/dev-docs/package.json
+++ b/dev-docs/package.json
@@ -18,7 +18,7 @@
    "@docusaurus/core": "2.2.0",
    "@docusaurus/preset-classic": "2.2.0",
    "@docusaurus/theme-live-codeblock": "2.2.0",
-    "@excalidraw/excalidraw": "0.15.2",
+    "@excalidraw/excalidraw": "0.14.2",
    "@mdx-js/react": "^1.6.22",
    "clsx": "^1.2.1",
    "docusaurus-plugin-sass": "0.2.3",
--- a/dev-docs/sidebars.js
+++ b/dev-docs/sidebars.js
@@ -92,6 +92,16 @@ const sidebars = {
        "@excalidraw/excalidraw/development",
      ],
    },
+
+    {
+      type: "category",
+      label: "Excalidraw codebase",
+      link: {
+        type: "doc",
+        id: "codebase/introduction-to-the-codebase",
+      },
+      items: [],
+    },
  ],
 };

--- a/dev-docs/src/theme/ReactLiveScope/index.js
+++ b/dev-docs/src/theme/ReactLiveScope/index.js
@@ -24,7 +24,6 @@ const ExcalidrawScope = {
  Sidebar: ExcalidrawComp.Sidebar,
  exportToCanvas: ExcalidrawComp.exportToCanvas,
  initialData,
-  useI18n: ExcalidrawComp.useI18n,
 };

 export default ExcalidrawScope;
--- a/dev-docs/yarn.lock
+++ b/dev-docs/yarn.lock
@@ -1631,10 +1631,10 @@
    url-loader "^4.1.1"
    webpack "^5.73.0"

-"@excalidraw/excalidraw@0.15.2":
-  version "0.15.2"
-  resolved "https://registry.yarnpkg.com/@excalidraw/excalidraw/-/excalidraw-0.15.2.tgz#7dba4f6e10c52015a007efb75a9fc1afe598574c"
-  integrity sha512-rTI02kgWSTXiUdIkBxt9u/581F3eXcqQgJdIxmz54TFtG3ughoxO5fr4t7Fr2LZIturBPqfocQHGKZ0t2KLKgw==
+"@excalidraw/excalidraw@0.14.2":
+  version "0.14.2"
+  resolved "https://registry.yarnpkg.com/@excalidraw/excalidraw/-/excalidraw-0.14.2.tgz#150cb4b7a1bf0d11cd64295936c930e7e0db8375"
+  integrity sha512-8LdjpTBWEK5waDWB7Bt/G9YBI4j0OxkstUhvaDGz7dwQGfzF6FW5CXBoYHNEoX0qmb+Fg/NPOlZ7FrKsrSVCqg==

 "@hapi/hoek@^9.0.0":
  version "9.3.0"
@@ -1785,9 +1785,9 @@
    "@hapi/hoek" "^9.0.0"

 "@sideway/formula@^3.0.0":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.1.tgz#80fcbcbaf7ce031e0ef2dd29b1bfc7c3f583611f"
-  integrity sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.0.tgz#fe158aee32e6bd5de85044be615bc08478a0a13c"
+  integrity sha512-vHe7wZ4NOXVfkoRb8T5otiENVlT7a3IAiw7H5M2+GO+9CDgcVUUsX1zalAztCmwyOr2RUTGJdgB+ZvSVqmdHmg==

 "@sideway/pinpoint@^2.0.0":
  version "2.0.0"
@@ -4376,9 +4376,9 @@ htmlparser2@^8.0.1:
    entities "^4.3.0"

 http-cache-semantics@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
-  integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
+  integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==

 http-deceiver@^1.2.7:
  version "1.2.7"
@@ -7159,9 +7159,9 @@ typescript@^4.7.4:
  integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==

 ua-parser-js@^0.7.30:
-  version "0.7.33"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.33.tgz#1d04acb4ccef9293df6f70f2c3d22f3030d8b532"
-  integrity sha512-s8ax/CeZdK9R/56Sui0WM6y9OFREJarMRHqLB2EwkovemBxNQ+Bqu8GAsUnVcXKgphb++ghr/B2BZx4mahujPw==
+  version "0.7.31"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.31.tgz#649a656b191dffab4f21d5e053e27ca17cbff5c6"
+  integrity sha512-qLK/Xe9E2uzmYI3qLeOmI0tEOt+TBBQyUIAh4aAgU05FVYzeZrKUdkAZfBNVGRaHVgV0TDkdEngJSw/SyQchkQ==

 unescape@^1.0.1:
  version "1.0.1"
@@ -7542,9 +7542,9 @@ webpack-sources@^3.2.2, webpack-sources@^3.2.3:
  integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==

 webpack@^5.73.0:
-  version "5.76.1"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.76.1.tgz#7773de017e988bccb0f13c7d75ec245f377d295c"
-  integrity sha512-4+YIK4Abzv8172/SGqObnUjaIHjLEuUasz9EwQj/9xmPPkYJy2Mh03Q/lJfSD3YLzbxy5FeTq5Uw0323Oh6SJQ==
+  version "5.74.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.74.0.tgz#02a5dac19a17e0bb47093f2be67c695102a55980"
+  integrity sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==
  dependencies:
    "@types/eslint-scope" "^3.7.3"
    "@types/estree" "^0.0.51"
--- a/package.json
+++ b/package.json
@@ -19,12 +19,17 @@
    ]
  },
  "dependencies": {
-    "@radix-ui/react-tabs": "1.0.2",
+    "@dwelle/tunnel-rat": "0.1.1",
    "@sentry/browser": "6.2.5",
    "@sentry/integrations": "6.2.5",
    "@testing-library/jest-dom": "5.16.2",
    "@testing-library/react": "12.1.5",
    "@tldraw/vec": "1.7.1",
+    "@types/jest": "27.4.0",
+    "@types/pica": "5.1.3",
+    "@types/react": "18.0.15",
+    "@types/react-dom": "18.0.6",
+    "@types/socket.io-client": "1.4.36",
    "browser-fs-access": "0.29.1",
    "clsx": "1.1.1",
    "cross-env": "7.0.3",
@@ -50,8 +55,9 @@
    "react-scripts": "5.0.1",
    "roughjs": "4.5.2",
    "sass": "1.51.0",
-    "socket.io-client": "4.6.1",
-    "tunnel-rat": "0.1.2",
+    "socket.io-client": "2.3.1",
+    "tunnel-rat": "0.1.0",
+    "typescript": "4.9.4",
    "workbox-background-sync": "^6.5.4",
    "workbox-broadcast-update": "^6.5.4",
    "workbox-cacheable-response": "^6.5.4",
@@ -69,14 +75,9 @@
    "@excalidraw/eslint-config": "1.0.0",
    "@excalidraw/prettier-config": "1.0.2",
    "@types/chai": "4.3.0",
-    "@types/jest": "27.4.0",
    "@types/lodash.throttle": "4.1.7",
    "@types/pako": "1.0.3",
-    "@types/pica": "5.1.3",
-    "@types/react": "18.0.15",
-    "@types/react-dom": "18.0.6",
    "@types/resize-observer-browser": "0.1.7",
-    "@types/socket.io-client": "1.4.36",
    "chai": "4.3.6",
    "dotenv": "16.0.1",
    "eslint-config-prettier": "8.5.0",
@@ -87,8 +88,7 @@
    "lint-staged": "12.3.7",
    "pepjs": "0.5.3",
    "prettier": "2.6.2",
-    "rewire": "6.0.0",
-    "typescript": "4.9.4"
+    "rewire": "6.0.0"
  },
  "engines": {
    "node": ">=14.0.0"
--- a/public/index.html
+++ b/public/index.html
@@ -79,7 +79,6 @@
    </style>
    <!------------------------------------------------------------------------->

-    <% if (process.env.NODE_ENV === "production") { %>
    <script>
      // Redirect Excalidraw+ users which have auto-redirect enabled.
      //
@@ -98,7 +97,6 @@
        window.location.href = "https://app.excalidraw.com";
      }
    </script>
-    <% } %>

    <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />

@@ -148,18 +146,8 @@
      // setting this so that libraries installation reuses this window tab.
      window.name = "_excalidraw";
    </script>
-    <% if (process.env.REACT_APP_DISABLE_TRACKING !== 'true') { %>
-
-    <!-- Fathom - privacy-friendly analytics -->
-    <script
-      src="https://cdn.usefathom.com/script.js"
-      data-site="VMSBUEYA"
-      defer
-    ></script>
-    <!-- / Fathom -->
-
-    <!-- LEGACY GOOGLE ANALYTICS -->
-    <% if (process.env.REACT_APP_GOOGLE_ANALYTICS_ID) { %>
+    <% if (process.env.REACT_APP_DISABLE_TRACKING !== 'true' &&
+    process.env.REACT_APP_GOOGLE_ANALYTICS_ID) { %>
    <script
      async
      src="https://www.googletagmanager.com/gtag/js?id=%REACT_APP_GOOGLE_ANALYTICS_ID%"
@@ -173,8 +161,6 @@
      gtag("config", "%REACT_APP_GOOGLE_ANALYTICS_ID%");
    </script>
    <% } %>
-    <!-- end LEGACY GOOGLE ANALYTICS -->
-    <% } %>

    <!-- FIXME: remove this when we update CRA (fix SW caching) -->
    <style>
@@ -227,17 +213,5 @@
      <h1 class="visually-hidden">Excalidraw</h1>
    </header>
    <div id="root"></div>
-    <!-- 100% privacy friendly analytics -->
-    <script
-      async
-      defer
-      src="https://scripts.simpleanalyticscdn.com/latest.js"
-    ></script>
-    <noscript
-      ><img
-        src="https://queue.simpleanalyticscdn.com/noscript.gif"
-        alt=""
-        referrerpolicy="no-referrer-when-downgrade"
-    /></noscript>
  </body>
 </html>
--- a/scripts/locales-coverage-description.js
+++ b/scripts/locales-coverage-description.js
@@ -2,9 +2,6 @@ const fs = require("fs");

 const THRESSHOLD = 85;

-// we're using BCP 47 language tags as keys
-// e.g. https://gist.github.com/typpo/b2b828a35e683b9bf8db91b5404f1bd1
-
 const crowdinMap = {
  "ar-SA": "en-ar",
  "bg-BG": "en-bg",
@@ -55,7 +52,6 @@ const crowdinMap = {
  "kk-KZ": "en-kk",
  "vi-VN": "en-vi",
  "mr-IN": "en-mr",
-  "th-TH": "en-th",
 };

 const flags = {
@@ -108,7 +104,6 @@ const flags = {
  "eu-ES": "🇪🇦",
  "vi-VN": "🇻🇳",
  "mr-IN": "🇮🇳",
-  "th-TH": "🇹🇭",
 };

 const languages = {
@@ -161,7 +156,6 @@ const languages = {
  "zh-TW": "繁體中文",
  "vi-VN": "Tiếng Việt",
  "mr-IN": "मराठी",
-  "th-TH": "ภาษาไทย",
 };

 const percentages = fs.readFileSync(
--- a/scripts/release.js
+++ b/scripts/release.js
@@ -1,9 +1,22 @@
+const fs = require("fs");
 const { execSync } = require("child_process");

 const excalidrawDir = `${__dirname}/../src/packages/excalidraw`;
 const excalidrawPackage = `${excalidrawDir}/package.json`;
 const pkg = require(excalidrawPackage);

+const originalReadMe = fs.readFileSync(`${excalidrawDir}/README.md`, "utf8");
+
+const updateReadme = () => {
+  const excalidrawIndex = originalReadMe.indexOf("### Excalidraw");
+
+  // remove note for stable readme
+  const data = originalReadMe.slice(excalidrawIndex);
+
+  // update readme
+  fs.writeFileSync(`${excalidrawDir}/README.md`, data, "utf8");
+};
+
 const publish = () => {
  try {
    execSync(`yarn  --frozen-lockfile`);
@@ -17,8 +30,15 @@ const publish = () => {
 };

 const release = () => {
+  updateReadme();
+  console.info("Note for stable readme removed");
+
  publish();
  console.info(`Published ${pkg.version}!`);
+
+  // revert readme after release
+  fs.writeFileSync(`${excalidrawDir}/README.md`, originalReadMe, "utf8");
+  console.info("Readme reverted");
 };

 release();
--- a/src/actions/actionBoundText.tsx
+++ b/src/actions/actionBoundText.tsx
@@ -1,14 +1,7 @@
-import {
-  BOUND_TEXT_PADDING,
-  ROUNDNESS,
-  VERTICAL_ALIGN,
-  TEXT_ALIGN,
-} from "../constants";
-import { getNonDeletedElements, isTextElement, newElement } from "../element";
+import { VERTICAL_ALIGN } from "../constants";
+import { getNonDeletedElements, isTextElement } from "../element";
 import { mutateElement } from "../element/mutateElement";
 import {
-  computeBoundTextPosition,
-  computeContainerDimensionForBoundText,
  getBoundTextElement,
  measureText,
  redrawTextBoundingBox,
@@ -16,21 +9,16 @@ import {
 import {
  getOriginalContainerHeightFromCache,
  resetOriginalContainerCache,
-  updateOriginalContainerCache,
 } from "../element/textWysiwyg";
 import {
  hasBoundTextElement,
  isTextBindableContainer,
-  isUsingAdaptiveRadius,
 } from "../element/typeChecks";
 import {
-  ExcalidrawElement,
-  ExcalidrawLinearElement,
  ExcalidrawTextContainer,
  ExcalidrawTextElement,
 } from "../element/types";
 import { getSelectedElements } from "../scene";
-import { AppState } from "../types";
 import { getFontString } from "../utils";
 import { register } from "./register";

@@ -40,7 +28,6 @@ export const actionUnbindText = register({
  trackEvent: { category: "element" },
  predicate: (elements, appState) => {
    const selectedElements = getSelectedElements(elements, appState);
-
    return selectedElements.some((element) => hasBoundTextElement(element));
  },
  perform: (elements, appState) => {
@@ -54,21 +41,18 @@ export const actionUnbindText = register({
        const { width, height, baseline } = measureText(
          boundTextElement.originalText,
          getFontString(boundTextElement),
-          boundTextElement.lineHeight,
        );
        const originalContainerHeight = getOriginalContainerHeightFromCache(
          element.id,
        );
        resetOriginalContainerCache(element.id);
-        const { x, y } = computeBoundTextPosition(element, boundTextElement);
+
        mutateElement(boundTextElement as ExcalidrawTextElement, {
          containerId: null,
          width,
          height,
          baseline,
          text: boundTextElement.originalText,
-          x,
-          y,
        });
        mutateElement(element, {
          boundElements: element.boundElements?.filter(
@@ -138,7 +122,6 @@ export const actionBindText = register({
    mutateElement(textElement, {
      containerId: container.id,
      verticalAlign: VERTICAL_ALIGN.MIDDLE,
-      textAlign: TEXT_ALIGN.CENTER,
    });
    mutateElement(container, {
      boundElements: (container.boundElements || []).concat({
@@ -146,168 +129,20 @@ export const actionBindText = register({
        id: textElement.id,
      }),
    });
-    const originalContainerHeight = container.height;
    redrawTextBoundingBox(textElement, container);
-    // overwritting the cache with original container height so
-    // it can be restored when unbind
-    updateOriginalContainerCache(container.id, originalContainerHeight);
-
+    const updatedElements = elements.slice();
+    const textElementIndex = updatedElements.findIndex(
+      (ele) => ele.id === textElement.id,
+    );
+    updatedElements.splice(textElementIndex, 1);
+    const containerIndex = updatedElements.findIndex(
+      (ele) => ele.id === container.id,
+    );
+    updatedElements.splice(containerIndex + 1, 0, textElement);
    return {
-      elements: pushTextAboveContainer(elements, container, textElement),
+      elements: updatedElements,
      appState: { ...appState, selectedElementIds: { [container.id]: true } },
      commitToHistory: true,
    };
  },
 });
-
-const pushTextAboveContainer = (
-  elements: readonly ExcalidrawElement[],
-  container: ExcalidrawElement,
-  textElement: ExcalidrawTextElement,
-) => {
-  const updatedElements = elements.slice();
-  const textElementIndex = updatedElements.findIndex(
-    (ele) => ele.id === textElement.id,
-  );
-  updatedElements.splice(textElementIndex, 1);
-
-  const containerIndex = updatedElements.findIndex(
-    (ele) => ele.id === container.id,
-  );
-  updatedElements.splice(containerIndex + 1, 0, textElement);
-  return updatedElements;
-};
-
-const pushContainerBelowText = (
-  elements: readonly ExcalidrawElement[],
-  container: ExcalidrawElement,
-  textElement: ExcalidrawTextElement,
-) => {
-  const updatedElements = elements.slice();
-  const containerIndex = updatedElements.findIndex(
-    (ele) => ele.id === container.id,
-  );
-  updatedElements.splice(containerIndex, 1);
-
-  const textElementIndex = updatedElements.findIndex(
-    (ele) => ele.id === textElement.id,
-  );
-  updatedElements.splice(textElementIndex, 0, container);
-  return updatedElements;
-};
-
-export const actionWrapTextInContainer = register({
-  name: "wrapTextInContainer",
-  contextItemLabel: "labels.createContainerFromText",
-  trackEvent: { category: "element" },
-  predicate: (elements, appState) => {
-    const selectedElements = getSelectedElements(elements, appState);
-    const areTextElements = selectedElements.every((el) => isTextElement(el));
-    return selectedElements.length > 0 && areTextElements;
-  },
-  perform: (elements, appState) => {
-    const selectedElements = getSelectedElements(
-      getNonDeletedElements(elements),
-      appState,
-    );
-    let updatedElements: readonly ExcalidrawElement[] = elements.slice();
-    const containerIds: AppState["selectedElementIds"] = {};
-
-    for (const textElement of selectedElements) {
-      if (isTextElement(textElement)) {
-        const container = newElement({
-          type: "rectangle",
-          backgroundColor: appState.currentItemBackgroundColor,
-          boundElements: [
-            ...(textElement.boundElements || []),
-            { id: textElement.id, type: "text" },
-          ],
-          angle: textElement.angle,
-          fillStyle: appState.currentItemFillStyle,
-          strokeColor: appState.currentItemStrokeColor,
-          roughness: appState.currentItemRoughness,
-          strokeWidth: appState.currentItemStrokeWidth,
-          strokeStyle: appState.currentItemStrokeStyle,
-          roundness:
-            appState.currentItemRoundness === "round"
-              ? {
-                  type: isUsingAdaptiveRadius("rectangle")
-                    ? ROUNDNESS.ADAPTIVE_RADIUS
-                    : ROUNDNESS.PROPORTIONAL_RADIUS,
-                }
-              : null,
-          opacity: 100,
-          locked: false,
-          x: textElement.x - BOUND_TEXT_PADDING,
-          y: textElement.y - BOUND_TEXT_PADDING,
-          width: computeContainerDimensionForBoundText(
-            textElement.width,
-            "rectangle",
-          ),
-          height: computeContainerDimensionForBoundText(
-            textElement.height,
-            "rectangle",
-          ),
-          groupIds: textElement.groupIds,
-        });
-
-        // update bindings
-        if (textElement.boundElements?.length) {
-          const linearElementIds = textElement.boundElements
-            .filter((ele) => ele.type === "arrow")
-            .map((el) => el.id);
-          const linearElements = updatedElements.filter((ele) =>
-            linearElementIds.includes(ele.id),
-          ) as ExcalidrawLinearElement[];
-          linearElements.forEach((ele) => {
-            let startBinding = ele.startBinding;
-            let endBinding = ele.endBinding;
-
-            if (startBinding?.elementId === textElement.id) {
-              startBinding = {
-                ...startBinding,
-                elementId: container.id,
-              };
-            }
-
-            if (endBinding?.elementId === textElement.id) {
-              endBinding = { ...endBinding, elementId: container.id };
-            }
-
-            if (startBinding || endBinding) {
-              mutateElement(ele, { startBinding, endBinding }, false);
-            }
-          });
-        }
-
-        mutateElement(
-          textElement,
-          {
-            containerId: container.id,
-            verticalAlign: VERTICAL_ALIGN.MIDDLE,
-            boundElements: null,
-            textAlign: TEXT_ALIGN.CENTER,
-          },
-          false,
-        );
-        redrawTextBoundingBox(textElement, container);
-
-        updatedElements = pushContainerBelowText(
-          [...updatedElements, container],
-          container,
-          textElement,
-        );
-        containerIds[container.id] = true;
-      }
-    }
-
-    return {
-      elements: updatedElements,
-      appState: {
-        ...appState,
-        selectedElementIds: containerIds,
-      },
-      commitToHistory: true,
-    };
-  },
-});
--- a/src/actions/actionCanvas.tsx
+++ b/src/actions/actionCanvas.tsx
@@ -226,7 +226,7 @@ const zoomValueToFitBoundsOnViewport = (
  return clampedZoomValueToFitElements as NormalizedZoomValue;
 };

-export const zoomToFitElements = (
+const zoomToFitElements = (
  elements: readonly ExcalidrawElement[],
  appState: Readonly<AppState>,
  zoomToSelection: boolean,
--- a/src/actions/actionClipboard.tsx
+++ b/src/actions/actionClipboard.tsx
@@ -18,7 +18,7 @@ export const actionCopy = register({
  perform: (elements, appState, _, app) => {
    const selectedElements = getSelectedElements(elements, appState, true);

-    copyToClipboard(selectedElements, app.files);
+    copyToClipboard(selectedElements, appState, app.files);

    return {
      commitToHistory: false,
--- a/src/actions/actionProperties.tsx
+++ b/src/actions/actionProperties.tsx
@@ -1,5 +1,4 @@
 import { AppState } from "../../src/types";
-import { trackEvent } from "../analytics";
 import { ButtonIconSelect } from "../components/ButtonIconSelect";
 import { ColorPicker } from "../components/ColorPicker";
 import { IconPicker } from "../components/IconPicker";
@@ -38,7 +37,6 @@ import {
  TextAlignLeftIcon,
  TextAlignCenterIcon,
  TextAlignRightIcon,
-  FillZigZagIcon,
 } from "../components/icons";
 import {
  DEFAULT_FONT_FAMILY,
@@ -56,7 +54,6 @@ import { mutateElement, newElementWith } from "../element/mutateElement";
 import {
  getBoundTextElement,
  getContainerElement,
-  getDefaultLineHeight,
 } from "../element/textElement";
 import {
  isBoundToContainer,
@@ -84,7 +81,7 @@ import {
  isSomeElementSelected,
 } from "../scene";
 import { hasStrokeColor } from "../scene/comparisons";
-import { arrayToMap, getShortcutKey } from "../utils";
+import { arrayToMap } from "../utils";
 import { register } from "./register";

 const FONT_SIZE_RELATIVE_INCREASE_STEP = 0.1;
@@ -296,12 +293,7 @@ export const actionChangeBackgroundColor = register({
 export const actionChangeFillStyle = register({
  name: "changeFillStyle",
  trackEvent: false,
-  perform: (elements, appState, value, app) => {
-    trackEvent(
-      "element",
-      "changeFillStyle",
-      `${value} (${app.device.isMobile ? "mobile" : "desktop"})`,
-    );
+  perform: (elements, appState, value) => {
    return {
      elements: changeProperty(elements, appState, (el) =>
        newElementWith(el, {
@@ -312,57 +304,40 @@ export const actionChangeFillStyle = register({
      commitToHistory: true,
    };
  },
-  PanelComponent: ({ elements, appState, updateData }) => {
-    const selectedElements = getSelectedElements(elements, appState);
-    const allElementsZigZag =
-      selectedElements.length > 0 &&
-      selectedElements.every((el) => el.fillStyle === "zigzag");
-
-    return (
-      <fieldset>
-        <legend>{t("labels.fill")}</legend>
-        <ButtonIconSelect
-          type="button"
-          options={[
-            {
-              value: "hachure",
-              text: `${
-                allElementsZigZag ? t("labels.zigzag") : t("labels.hachure")
-              } (${getShortcutKey("Alt-Click")})`,
-              icon: allElementsZigZag ? FillZigZagIcon : FillHachureIcon,
-              active: allElementsZigZag ? true : undefined,
-            },
-            {
-              value: "cross-hatch",
-              text: t("labels.crossHatch"),
-              icon: FillCrossHatchIcon,
-            },
-            {
-              value: "solid",
-              text: t("labels.solid"),
-              icon: FillSolidIcon,
-            },
-          ]}
-          value={getFormValue(
-            elements,
-            appState,
-            (element) => element.fillStyle,
-            appState.currentItemFillStyle,
-          )}
-          onClick={(value, event) => {
-            const nextValue =
-              event.altKey &&
-              value === "hachure" &&
-              selectedElements.every((el) => el.fillStyle === "hachure")
-                ? "zigzag"
-                : value;
-
-            updateData(nextValue);
-          }}
-        />
-      </fieldset>
-    );
-  },
+  PanelComponent: ({ elements, appState, updateData }) => (
+    <fieldset>
+      <legend>{t("labels.fill")}</legend>
+      <ButtonIconSelect
+        options={[
+          {
+            value: "hachure",
+            text: t("labels.hachure"),
+            icon: FillHachureIcon,
+          },
+          {
+            value: "cross-hatch",
+            text: t("labels.crossHatch"),
+            icon: FillCrossHatchIcon,
+          },
+          {
+            value: "solid",
+            text: t("labels.solid"),
+            icon: FillSolidIcon,
+          },
+        ]}
+        group="fill"
+        value={getFormValue(
+          elements,
+          appState,
+          (element) => element.fillStyle,
+          appState.currentItemFillStyle,
+        )}
+        onChange={(value) => {
+          updateData(value);
+        }}
+      />
+    </fieldset>
+  ),
 });

 export const actionChangeStrokeWidth = register({
@@ -662,7 +637,6 @@ export const actionChangeFontFamily = register({
              oldElement,
              {
                fontFamily: value,
-                lineHeight: getDefaultLineHeight(value),
              },
            );
            redrawTextBoundingBox(newElement, getContainerElement(oldElement));
@@ -771,19 +745,16 @@ export const actionChangeTextAlign = register({
              value: "left",
              text: t("labels.left"),
              icon: TextAlignLeftIcon,
-              testId: "align-left",
            },
            {
              value: "center",
              text: t("labels.center"),
              icon: TextAlignCenterIcon,
-              testId: "align-horizontal-center",
            },
            {
              value: "right",
              text: t("labels.right"),
              icon: TextAlignRightIcon,
-              testId: "align-right",
            },
          ]}
          value={getFormValue(
--- a/src/actions/actionStyles.ts
+++ b/src/actions/actionStyles.ts
@@ -12,10 +12,7 @@ import {
  DEFAULT_FONT_FAMILY,
  DEFAULT_TEXT_ALIGN,
 } from "../constants";
-import {
-  getBoundTextElement,
-  getDefaultLineHeight,
-} from "../element/textElement";
+import { getBoundTextElement } from "../element/textElement";
 import {
  hasBoundTextElement,
  canApplyRoundnessTypeToElement,
@@ -95,18 +92,12 @@ export const actionPasteStyles = register({
          });

          if (isTextElement(newElement)) {
-            const fontSize =
-              elementStylesToCopyFrom?.fontSize || DEFAULT_FONT_SIZE;
-            const fontFamily =
-              elementStylesToCopyFrom?.fontFamily || DEFAULT_FONT_FAMILY;
            newElement = newElementWith(newElement, {
-              fontSize,
-              fontFamily,
+              fontSize: elementStylesToCopyFrom?.fontSize || DEFAULT_FONT_SIZE,
+              fontFamily:
+                elementStylesToCopyFrom?.fontFamily || DEFAULT_FONT_FAMILY,
              textAlign:
                elementStylesToCopyFrom?.textAlign || DEFAULT_TEXT_ALIGN,
-              lineHeight:
-                elementStylesToCopyFrom.lineHeight ||
-                getDefaultLineHeight(fontFamily),
            });
            let container = null;
            if (newElement.containerId) {
--- a/src/actions/shortcuts.ts
+++ b/src/actions/shortcuts.ts
@@ -1,6 +1,5 @@
 import { isDarwin } from "../constants";
 import { t } from "../i18n";
-import { SubtypeOf } from "../utility-types";
 import { getShortcutKey } from "../utils";
 import { ActionName } from "./types";

--- a/src/actions/types.ts
+++ b/src/actions/types.ts
@@ -6,7 +6,6 @@ import {
  ExcalidrawProps,
  BinaryFiles,
 } from "../types";
-import { MarkOptional } from "../utility-types";

 export type ActionSource = "ui" | "keyboard" | "contextMenu" | "api";

@@ -114,8 +113,7 @@ export type ActionName =
  | "toggleLock"
  | "toggleLinearEditor"
  | "toggleEraserTool"
-  | "toggleHandTool"
-  | "wrapTextInContainer";
+  | "toggleHandTool";

 export type PanelComponentProps = {
  elements: readonly ExcalidrawElement[];
--- a/src/analytics.ts
+++ b/src/analytics.ts
@@ -1,41 +1,22 @@
-export const trackEvent = (
-  category: string,
-  action: string,
-  label?: string,
-  value?: number,
-) => {
-  try {
-    // Uncomment the next line to track locally
-    // console.log("Track Event", { category, action, label, value });
-
-    if (typeof window === "undefined" || process.env.JEST_WORKER_ID) {
-      return;
-    }
-
-    if (process.env.REACT_APP_GOOGLE_ANALYTICS_ID && window.gtag) {
-      window.gtag("event", action, {
-        event_category: category,
-        event_label: label,
-        value,
-      });
-    }
-
-    if (window.sa_event) {
-      window.sa_event(action, {
-        category,
-        label,
-        value,
-      });
-    }
-
-    if (window.fathom) {
-      window.fathom.trackEvent(action, {
-        category,
-        label,
-        value,
-      });
-    }
-  } catch (error) {
-    console.error("error during analytics", error);
-  }
-};
+export const trackEvent =
+  typeof process !== "undefined" &&
+  process.env?.REACT_APP_GOOGLE_ANALYTICS_ID &&
+  typeof window !== "undefined" &&
+  window.gtag
+    ? (category: string, action: string, label?: string, value?: number) => {
+        try {
+          window.gtag("event", action, {
+            event_category: category,
+            event_label: label,
+            value,
+          });
+        } catch (error) {
+          console.error("error logging to ga", error);
+        }
+      }
+    : typeof process !== "undefined" && process.env?.JEST_WORKER_ID
+    ? (category: string, action: string, label?: string, value?: number) => {}
+    : (category: string, action: string, label?: string, value?: number) => {
+        // Uncomment the next line to track locally
+        // console.log("Track Event", { category, action, label, value });
+      };
--- a/src/appState.ts
+++ b/src/appState.ts
@@ -1,6 +1,5 @@
 import oc from "open-color";
 import {
-  DEFAULT_ELEMENT_PROPS,
  DEFAULT_FONT_FAMILY,
  DEFAULT_FONT_SIZE,
  DEFAULT_TEXT_ALIGN,
@@ -24,18 +23,18 @@ export const getDefaultAppState = (): Omit<
    theme: THEME.LIGHT,
    collaborators: new Map(),
    currentChartType: "bar",
-    currentItemBackgroundColor: DEFAULT_ELEMENT_PROPS.backgroundColor,
+    currentItemBackgroundColor: "transparent",
    currentItemEndArrowhead: "arrow",
-    currentItemFillStyle: DEFAULT_ELEMENT_PROPS.fillStyle,
+    currentItemFillStyle: "hachure",
    currentItemFontFamily: DEFAULT_FONT_FAMILY,
    currentItemFontSize: DEFAULT_FONT_SIZE,
-    currentItemOpacity: DEFAULT_ELEMENT_PROPS.opacity,
-    currentItemRoughness: DEFAULT_ELEMENT_PROPS.roughness,
+    currentItemOpacity: 100,
+    currentItemRoughness: 1,
    currentItemStartArrowhead: null,
-    currentItemStrokeColor: DEFAULT_ELEMENT_PROPS.strokeColor,
+    currentItemStrokeColor: oc.black,
    currentItemRoundness: "round",
-    currentItemStrokeStyle: DEFAULT_ELEMENT_PROPS.strokeStyle,
-    currentItemStrokeWidth: DEFAULT_ELEMENT_PROPS.strokeWidth,
+    currentItemStrokeStyle: "solid",
+    currentItemStrokeWidth: 1,
    currentItemTextAlign: DEFAULT_TEXT_ALIGN,
    cursorButton: "up",
    draggingElement: null,
@@ -45,7 +44,7 @@ export const getDefaultAppState = (): Omit<
    activeTool: {
      type: "selection",
      customType: null,
-      locked: DEFAULT_ELEMENT_PROPS.locked,
+      locked: false,
      lastActiveTool: null,
    },
    penMode: false,
@@ -58,7 +57,7 @@ export const getDefaultAppState = (): Omit<
    fileHandle: null,
    gridSize: null,
    isBindingEnabled: true,
-    defaultSidebarDockedPreference: false,
+    isSidebarDocked: false,
    isLoading: false,
    isResizing: false,
    isRotating: false,
@@ -150,11 +149,7 @@ const APP_STATE_STORAGE_CONF = (<
  gridSize: { browser: true, export: true, server: true },
  height: { browser: false, export: false, server: false },
  isBindingEnabled: { browser: false, export: false, server: false },
-  defaultSidebarDockedPreference: {
-    browser: true,
-    export: false,
-    server: false,
-  },
+  isSidebarDocked: { browser: true, export: false, server: false },
  isLoading: { browser: false, export: false, server: false },
  isResizing: { browser: false, export: false, server: false },
  isRotating: { browser: false, export: false, server: false },
--- a/src/charts.ts
+++ b/src/charts.ts
@@ -1,5 +1,10 @@
 import colors from "./colors";
-import { DEFAULT_FONT_SIZE, ENV } from "./constants";
+import {
+  DEFAULT_FONT_FAMILY,
+  DEFAULT_FONT_SIZE,
+  ENV,
+  VERTICAL_ALIGN,
+} from "./constants";
 import { newElement, newLinearElement, newTextElement } from "./element";
 import { NonDeletedExcalidrawElement } from "./element/types";
 import { randomId } from "./random";
@@ -161,7 +166,17 @@ const bgColors = colors.elementBackground.slice(
 // Put all the common properties here so when the whole chart is selected
 // the properties dialog shows the correct selected values
 const commonProps = {
+  fillStyle: "hachure",
+  fontFamily: DEFAULT_FONT_FAMILY,
+  fontSize: DEFAULT_FONT_SIZE,
+  opacity: 100,
+  roughness: 1,
  strokeColor: colors.elementStroke[0],
+  roundness: null,
+  strokeStyle: "solid",
+  strokeWidth: 1,
+  verticalAlign: VERTICAL_ALIGN.MIDDLE,
+  locked: false,
 } as const;

 const getChartDimentions = (spreadsheet: Spreadsheet) => {
@@ -308,6 +323,7 @@ const chartBaseElements = (
        x: x + chartWidth / 2,
        y: y - BAR_HEIGHT - BAR_GAP * 2 - DEFAULT_FONT_SIZE,
        roundness: null,
+        strokeStyle: "solid",
        textAlign: "center",
      })
    : null;
--- a/src/clipboard.ts
+++ b/src/clipboard.ts
@@ -2,12 +2,12 @@ import {
  ExcalidrawElement,
  NonDeletedExcalidrawElement,
 } from "./element/types";
-import { BinaryFiles } from "./types";
+import { AppState, BinaryFiles } from "./types";
 import { SVG_EXPORT_TAG } from "./scene/export";
 import { tryParseSpreadsheet, Spreadsheet, VALID_SPREADSHEET } from "./charts";
 import { EXPORT_DATA_TYPES, MIME_TYPES } from "./constants";
 import { isInitializedImageElement } from "./element/typeChecks";
-import { isPromiseLike, isTestEnv } from "./utils";
+import { isPromiseLike } from "./utils";

 type ElementsClipboard = {
  type: typeof EXPORT_DATA_TYPES.excalidrawClipboard;
@@ -55,40 +55,24 @@ const clipboardContainsElements = (

 export const copyToClipboard = async (
  elements: readonly NonDeletedExcalidrawElement[],
+  appState: AppState,
  files: BinaryFiles | null,
 ) => {
-  let foundFile = false;
-
-  const _files = elements.reduce((acc, element) => {
-    if (isInitializedImageElement(element)) {
-      foundFile = true;
-      if (files && files[element.fileId]) {
-        acc[element.fileId] = files[element.fileId];
-      }
-    }
-    return acc;
-  }, {} as BinaryFiles);
-
-  if (foundFile && !files) {
-    console.warn(
-      "copyToClipboard: attempting to file element(s) without providing associated `files` object.",
-    );
-  }
-
  // select binded text elements when copying
  const contents: ElementsClipboard = {
    type: EXPORT_DATA_TYPES.excalidrawClipboard,
    elements,
-    files: files ? _files : undefined,
+    files: files
+      ? elements.reduce((acc, element) => {
+          if (isInitializedImageElement(element) && files[element.fileId]) {
+            acc[element.fileId] = files[element.fileId];
+          }
+          return acc;
+        }, {} as BinaryFiles)
+      : undefined,
  };
  const json = JSON.stringify(contents);
-
-  if (isTestEnv()) {
-    return json;
-  }
-
  CLIPBOARD = json;
-
  try {
    PREFER_APP_CLIPBOARD = false;
    await copyTextToSystemClipboard(json);
--- a/src/components/Actions.tsx
+++ b/src/components/Actions.tsx
@@ -14,7 +14,7 @@ import {
  hasText,
 } from "../scene";
 import { SHAPES } from "../shapes";
-import { UIAppState, Zoom } from "../types";
+import { AppState, Zoom } from "../types";
 import {
  capitalizeString,
  isTransparent,
@@ -28,20 +28,16 @@ import { trackEvent } from "../analytics";
 import { hasBoundTextElement } from "../element/typeChecks";
 import clsx from "clsx";
 import { actionToggleZenMode } from "../actions";
-import { Tooltip } from "./Tooltip";
-import {
-  shouldAllowVerticalAlign,
-  suppportsHorizontalAlign,
-} from "../element/textElement";
-
 import "./Actions.scss";
+import { Tooltip } from "./Tooltip";
+import { shouldAllowVerticalAlign } from "../element/textElement";

 export const SelectedShapeActions = ({
  appState,
  elements,
  renderAction,
 }: {
-  appState: UIAppState;
+  appState: AppState;
  elements: readonly ExcalidrawElement[];
  renderAction: ActionManager["renderAction"];
 }) => {
@@ -126,8 +122,7 @@ export const SelectedShapeActions = ({

          {renderAction("changeFontFamily")}

-          {suppportsHorizontalAlign(targetElements) &&
-            renderAction("changeTextAlign")}
+          {renderAction("changeTextAlign")}
        </>
      )}

@@ -216,10 +211,10 @@ export const ShapesSwitcher = ({
  appState,
 }: {
  canvas: HTMLCanvasElement | null;
-  activeTool: UIAppState["activeTool"];
-  setAppState: React.Component<any, UIAppState>["setState"];
+  activeTool: AppState["activeTool"];
+  setAppState: React.Component<any, AppState>["setState"];
  onImageAction: (data: { pointerType: PointerType | null }) => void;
-  appState: UIAppState;
+  appState: AppState;
 }) => (
  <>
    {SHAPES.map(({ value, icon, key, numericKey, fillable }, index) => {
--- a/src/components/ActiveConfirmDialog.tsx
+++ b/src/components/ActiveConfirmDialog.tsx
@@ -1,7 +1,6 @@
 import { atom, useAtom } from "jotai";
 import { actionClearCanvas } from "../actions";
 import { t } from "../i18n";
-import { jotaiScope } from "../jotai";
 import { useExcalidrawActionManager } from "./App";
 import ConfirmDialog from "./ConfirmDialog";

@@ -10,7 +9,6 @@ export const activeConfirmDialogAtom = atom<"clearCanvas" | null>(null);
 export const ActiveConfirmDialog = () => {
  const [activeConfirmDialog, setActiveConfirmDialog] = useAtom(
    activeConfirmDialogAtom,
-    jotaiScope,
  );
  const actionManager = useExcalidrawActionManager();

--- a/src/components/App.test.tsx
+++ b/src/components/App.test.tsx
@@ -1,45 +0,0 @@
-import ReactDOM from "react-dom";
-import * as Renderer from "../renderer/renderScene";
-import { reseed } from "../random";
-import { render, queryByTestId } from "../tests/test-utils";
-
-import ExcalidrawApp from "../excalidraw-app";
-
-const renderScene = jest.spyOn(Renderer, "renderScene");
-
-describe("Test <App/>", () => {
-  beforeEach(async () => {
-    // Unmount ReactDOM from root
-    ReactDOM.unmountComponentAtNode(document.getElementById("root")!);
-    localStorage.clear();
-    renderScene.mockClear();
-    reseed(7);
-  });
-
-  it("should show error modal when using brave and measureText API is not working", async () => {
-    (global.navigator as any).brave = {
-      isBrave: {
-        name: "isBrave",
-      },
-    };
-
-    const originalContext = global.HTMLCanvasElement.prototype.getContext("2d");
-    //@ts-ignore
-    global.HTMLCanvasElement.prototype.getContext = (contextId) => {
-      return {
-        ...originalContext,
-        measureText: () => ({
-          width: 0,
-        }),
-      };
-    };
-
-    await render(<ExcalidrawApp />);
-    expect(
-      queryByTestId(
-        document.querySelector(".excalidraw-modal-container")!,
-        "brave-measure-text-error",
-      ),
-    ).toMatchSnapshot();
-  });
-});
--- a/src/components/App.tsx
+++ b/src/components/App.tsx
@@ -60,10 +60,8 @@ import {
  ENV,
  EVENT,
  GRID_SIZE,
-  IMAGE_MIME_TYPES,
  IMAGE_RENDER_TIMEOUT,
  isAndroid,
-  isBrave,
  LINE_CONFIRM_THRESHOLD,
  MAX_ALLOWED_FILE_BYTES,
  MIME_TYPES,
@@ -110,7 +108,6 @@ import {
  textWysiwyg,
  transformElements,
  updateTextElement,
-  redrawTextBoundingBox,
 } from "../element";
 import {
  bindOrUnbindLinearElement,
@@ -128,11 +125,7 @@ import {
 } from "../element/binding";
 import { LinearElementEditor } from "../element/linearElementEditor";
 import { mutateElement, newElementWith } from "../element/mutateElement";
-import {
-  deepCopyElement,
-  duplicateElements,
-  newFreeDrawElement,
-} from "../element/newElement";
+import { deepCopyElement, newFreeDrawElement } from "../element/newElement";
 import {
  hasBoundTextElement,
  isArrowElement,
@@ -210,8 +203,6 @@ import {
  PointerDownState,
  SceneData,
  Device,
-  SidebarName,
-  SidebarTabName,
 } from "../types";
 import {
  debounce,
@@ -236,7 +227,6 @@ import {
  updateActiveTool,
  getShortcutKey,
  isTransparent,
-  easeToValuesRAF,
 } from "../utils";
 import {
  ContextMenu,
@@ -268,16 +258,13 @@ import throttle from "lodash.throttle";
 import { fileOpen, FileSystemHandle } from "../data/filesystem";
 import {
  bindTextToShapeAfterDuplication,
+  getApproxLineHeight,
  getApproxMinLineHeight,
  getApproxMinLineWidth,
  getBoundTextElement,
  getContainerCenter,
  getContainerDims,
-  getContainerElement,
-  getDefaultLineHeight,
-  getLineHeightInPx,
  getTextBindableContainerAtPosition,
-  isMeasureTextSupported,
  isValidTextContainer,
 } from "../element/textElement";
 import { isHittingElementNotConsideringBoundingBox } from "../element/collision";
@@ -292,17 +279,9 @@ import {
 import { shouldShowBoundingBox } from "../element/transformHandles";
 import { Fonts } from "../scene/Fonts";
 import { actionPaste } from "../actions/actionClipboard";
-import {
-  actionToggleHandTool,
-  zoomToFitElements,
-} from "../actions/actionCanvas";
+import { actionToggleHandTool } from "../actions/actionCanvas";
 import { jotaiStore } from "../jotai";
 import { activeConfirmDialogAtom } from "./ActiveConfirmDialog";
-import { actionWrapTextInContainer } from "../actions/actionBoundText";
-import BraveMeasureTextError from "./BraveMeasureTextError";
-
-const AppContext = React.createContext<AppClassProperties>(null!);
-const AppPropsContext = React.createContext<AppProps>(null!);

 const deviceContextInitialValue = {
  isSmScreen: false,
@@ -345,8 +324,6 @@ const ExcalidrawActionManagerContext = React.createContext<ActionManager>(
 );
 ExcalidrawActionManagerContext.displayName = "ExcalidrawActionManagerContext";

-export const useApp = () => useContext(AppContext);
-export const useAppProps = () => useContext(AppPropsContext);
 export const useDevice = () => useContext<Device>(DeviceContext);
 export const useExcalidrawContainer = () =>
  useContext(ExcalidrawContainerContext);
@@ -407,7 +384,7 @@ class App extends React.Component<AppProps, AppState> {
  private nearestScrollableContainer: HTMLElement | Document | undefined;
  public library: AppClassProperties["library"];
  public libraryItemsFromStorage: LibraryItems | undefined;
-  public id: string;
+  private id: string;
  private history: History;
  private excalidrawContainerValue: {
    container: HTMLDivElement | null;
@@ -445,10 +422,11 @@ class App extends React.Component<AppProps, AppState> {
      width: window.innerWidth,
      height: window.innerHeight,
      showHyperlinkPopup: false,
-      defaultSidebarDockedPreference: false,
+      isSidebarDocked: false,
    };

    this.id = nanoid();
+
    this.library = new Library(this);
    if (excalidrawRef) {
      const readyPromise =
@@ -476,7 +454,7 @@ class App extends React.Component<AppProps, AppState> {
        setActiveTool: this.setActiveTool,
        setCursor: this.setCursor,
        resetCursor: this.resetCursor,
-        toggleSidebar: this.toggleSidebar,
+        toggleMenu: this.toggleMenu,
      } as const;
      if (typeof excalidrawRef === "function") {
        excalidrawRef(api);
@@ -584,91 +562,101 @@ class App extends React.Component<AppProps, AppState> {
          this.props.handleKeyboardGlobally ? undefined : this.onKeyDown
        }
      >
-        <AppContext.Provider value={this}>
-          <AppPropsContext.Provider value={this.props}>
-            <ExcalidrawContainerContext.Provider
-              value={this.excalidrawContainerValue}
-            >
-              <DeviceContext.Provider value={this.device}>
-                <ExcalidrawSetAppStateContext.Provider value={this.setAppState}>
-                  <ExcalidrawAppStateContext.Provider value={this.state}>
-                    <ExcalidrawElementsContext.Provider
-                      value={this.scene.getNonDeletedElements()}
+        <ExcalidrawContainerContext.Provider
+          value={this.excalidrawContainerValue}
+        >
+          <DeviceContext.Provider value={this.device}>
+            <ExcalidrawSetAppStateContext.Provider value={this.setAppState}>
+              <ExcalidrawAppStateContext.Provider value={this.state}>
+                <ExcalidrawElementsContext.Provider
+                  value={this.scene.getNonDeletedElements()}
+                >
+                  <ExcalidrawActionManagerContext.Provider
+                    value={this.actionManager}
+                  >
+                    <LayerUI
+                      canvas={this.canvas}
+                      appState={this.state}
+                      files={this.files}
+                      setAppState={this.setAppState}
+                      actionManager={this.actionManager}
+                      elements={this.scene.getNonDeletedElements()}
+                      onLockToggle={this.toggleLock}
+                      onPenModeToggle={this.togglePenMode}
+                      onHandToolToggle={this.onHandToolToggle}
+                      onInsertElements={(elements) =>
+                        this.addElementsFromPasteOrLibrary({
+                          elements,
+                          position: "center",
+                          files: null,
+                        })
+                      }
+                      langCode={getLanguage().code}
+                      renderTopRightUI={renderTopRightUI}
+                      renderCustomStats={renderCustomStats}
+                      renderCustomSidebar={this.props.renderSidebar}
+                      showExitZenModeBtn={
+                        typeof this.props?.zenModeEnabled === "undefined" &&
+                        this.state.zenModeEnabled
+                      }
+                      libraryReturnUrl={this.props.libraryReturnUrl}
+                      UIOptions={this.props.UIOptions}
+                      focusContainer={this.focusContainer}
+                      library={this.library}
+                      id={this.id}
+                      onImageAction={this.onImageAction}
+                      renderWelcomeScreen={
+                        !this.state.isLoading &&
+                        this.state.showWelcomeScreen &&
+                        this.state.activeTool.type === "selection" &&
+                        !this.scene.getElementsIncludingDeleted().length
+                      }
                    >
-                      <ExcalidrawActionManagerContext.Provider
-                        value={this.actionManager}
-                      >
-                        <LayerUI
-                          canvas={this.canvas}
-                          appState={this.state}
-                          files={this.files}
+                      {this.props.children}
+                    </LayerUI>
+                    <div className="excalidraw-textEditorContainer" />
+                    <div className="excalidraw-contextMenuContainer" />
+                    {selectedElement.length === 1 &&
+                      !this.state.contextMenu &&
+                      this.state.showHyperlinkPopup && (
+                        <Hyperlink
+                          key={selectedElement[0].id}
+                          element={selectedElement[0]}
                          setAppState={this.setAppState}
-                          actionManager={this.actionManager}
-                          elements={this.scene.getNonDeletedElements()}
-                          onLockToggle={this.toggleLock}
-                          onPenModeToggle={this.togglePenMode}
-                          onHandToolToggle={this.onHandToolToggle}
-                          langCode={getLanguage().code}
-                          renderTopRightUI={renderTopRightUI}
-                          renderCustomStats={renderCustomStats}
-                          showExitZenModeBtn={
-                            typeof this.props?.zenModeEnabled === "undefined" &&
-                            this.state.zenModeEnabled
-                          }
-                          UIOptions={this.props.UIOptions}
-                          onImageAction={this.onImageAction}
-                          renderWelcomeScreen={
-                            !this.state.isLoading &&
-                            this.state.showWelcomeScreen &&
-                            this.state.activeTool.type === "selection" &&
-                            !this.scene.getElementsIncludingDeleted().length
-                          }
-                        >
-                          {this.props.children}
-                        </LayerUI>
-                        <div className="excalidraw-textEditorContainer" />
-                        <div className="excalidraw-contextMenuContainer" />
-                        {selectedElement.length === 1 &&
-                          !this.state.contextMenu &&
-                          this.state.showHyperlinkPopup && (
-                            <Hyperlink
-                              key={selectedElement[0].id}
-                              element={selectedElement[0]}
-                              setAppState={this.setAppState}
-                              onLinkOpen={this.props.onLinkOpen}
-                            />
-                          )}
-                        {this.state.toast !== null && (
-                          <Toast
-                            message={this.state.toast.message}
-                            onClose={() => this.setToast(null)}
-                            duration={this.state.toast.duration}
-                            closable={this.state.toast.closable}
-                          />
-                        )}
-                        {this.state.contextMenu && (
-                          <ContextMenu
-                            items={this.state.contextMenu.items}
-                            top={this.state.contextMenu.top}
-                            left={this.state.contextMenu.left}
-                            actionManager={this.actionManager}
-                          />
-                        )}
-                        <main>{this.renderCanvas()}</main>
-                      </ExcalidrawActionManagerContext.Provider>
-                    </ExcalidrawElementsContext.Provider>{" "}
-                  </ExcalidrawAppStateContext.Provider>
-                </ExcalidrawSetAppStateContext.Provider>
-              </DeviceContext.Provider>
-            </ExcalidrawContainerContext.Provider>
-          </AppPropsContext.Provider>
-        </AppContext.Provider>
+                          onLinkOpen={this.props.onLinkOpen}
+                        />
+                      )}
+                    {this.state.toast !== null && (
+                      <Toast
+                        message={this.state.toast.message}
+                        onClose={() => this.setToast(null)}
+                        duration={this.state.toast.duration}
+                        closable={this.state.toast.closable}
+                      />
+                    )}
+                    {this.state.contextMenu && (
+                      <ContextMenu
+                        items={this.state.contextMenu.items}
+                        top={this.state.contextMenu.top}
+                        left={this.state.contextMenu.left}
+                        actionManager={this.actionManager}
+                      />
+                    )}
+                    <main>{this.renderCanvas()}</main>
+                  </ExcalidrawActionManagerContext.Provider>
+                </ExcalidrawElementsContext.Provider>{" "}
+              </ExcalidrawAppStateContext.Provider>
+            </ExcalidrawSetAppStateContext.Provider>
+          </DeviceContext.Provider>
+        </ExcalidrawContainerContext.Provider>
      </div>
    );
  }

  public focusContainer: AppClassProperties["focusContainer"] = () => {
-    this.excalidrawContainerRef.current?.focus();
+    if (this.props.autoFocus) {
+      this.excalidrawContainerRef.current?.focus();
+    }
  };

  public getSceneElementsIncludingDeleted = () => {
@@ -679,14 +667,6 @@ class App extends React.Component<AppProps, AppState> {
    return this.scene.getNonDeletedElements();
  };

-  public onInsertElements = (elements: readonly ExcalidrawElement[]) => {
-    this.addElementsFromPasteOrLibrary({
-      elements,
-      position: "center",
-      files: null,
-    });
-  };
-
  private syncActionResult = withBatchedUpdates(
    (actionResult: ActionResult) => {
      if (this.unmounted || actionResult === false) {
@@ -728,8 +708,6 @@ class App extends React.Component<AppProps, AppState> {
        const theme =
          actionResult?.appState?.theme || this.props.theme || THEME.LIGHT;
        let name = actionResult?.appState?.name ?? this.state.name;
-        const errorMessage =
-          actionResult?.appState?.errorMessage ?? this.state.errorMessage;
        if (typeof this.props.viewModeEnabled !== "undefined") {
          viewModeEnabled = this.props.viewModeEnabled;
        }
@@ -745,6 +723,7 @@ class App extends React.Component<AppProps, AppState> {
        if (typeof this.props.name !== "undefined") {
          name = this.props.name;
        }
+
        this.setState(
          (state) => {
            // using Object.assign instead of spread to fool TS 4.2.2+ into
@@ -762,7 +741,6 @@ class App extends React.Component<AppProps, AppState> {
              gridSize,
              theme,
              name,
-              errorMessage,
            });
          },
          () => {
@@ -891,6 +869,7 @@ class App extends React.Component<AppProps, AppState> {
        ),
      };
    }
+
    // FontFaceSet loadingdone event we listen on may not always fire
    // (looking at you Safari), so on init we manually load fonts for current
    // text elements on canvas, and rerender them once done. This also
@@ -956,7 +935,7 @@ class App extends React.Component<AppProps, AppState> {
    this.scene.addCallback(this.onSceneUpdated);
    this.addEventListeners();

-    if (this.props.autoFocus && this.excalidrawContainerRef.current) {
+    if (this.excalidrawContainerRef.current) {
      this.focusContainer();
    }

@@ -1018,13 +997,6 @@ class App extends React.Component<AppProps, AppState> {
    } else {
      this.updateDOMRect(this.initializeScene);
    }
-
-    // note that this check seems to always pass in localhost
-    if (isBrave() && !isMeasureTextSupported()) {
-      this.setState({
-        errorMessage: <BraveMeasureTextError />,
-      });
-    }
  }

  public componentWillUnmount() {
@@ -1595,7 +1567,6 @@ class App extends React.Component<AppProps, AppState> {
          elements: data.elements,
          files: data.files || null,
          position: "cursor",
-          retainSeed: isPlainPaste,
        });
      } else if (data.text) {
        this.addTextFromPaste(data.text, isPlainPaste);
@@ -1609,7 +1580,6 @@ class App extends React.Component<AppProps, AppState> {
    elements: readonly ExcalidrawElement[];
    files: BinaryFiles | null;
    position: { clientX: number; clientY: number } | "cursor" | "center";
-    retainSeed?: boolean;
  }) => {
    const elements = restoreElements(opts.elements, null);
    const [minX, minY, maxX, maxY] = getCommonBounds(elements);
@@ -1637,39 +1607,36 @@ class App extends React.Component<AppProps, AppState> {

    const dx = x - elementsCenterX;
    const dy = y - elementsCenterY;
+    const groupIdMap = new Map();

    const [gridX, gridY] = getGridPoint(dx, dy, this.state.gridSize);

-    const newElements = duplicateElements(
-      elements.map((element) => {
-        return newElementWith(element, {
+    const oldIdToDuplicatedId = new Map();
+    const newElements = elements.map((element) => {
+      const newElement = duplicateElement(
+        this.state.editingGroupId,
+        groupIdMap,
+        element,
+        {
          x: element.x + gridX - minX,
          y: element.y + gridY - minY,
-        });
-      }),
-      {
-        randomizeSeed: !opts.retainSeed,
-      },
-    );
-
+        },
+      );
+      oldIdToDuplicatedId.set(element.id, newElement.id);
+      return newElement;
+    });
+    bindTextToShapeAfterDuplication(newElements, elements, oldIdToDuplicatedId);
    const nextElements = [
      ...this.scene.getElementsIncludingDeleted(),
      ...newElements,
    ];
-
-    this.scene.replaceAllElements(nextElements);
-
-    newElements.forEach((newElement) => {
-      if (isTextElement(newElement) && isBoundToContainer(newElement)) {
-        const container = getContainerElement(newElement);
-        redrawTextBoundingBox(newElement, container);
-      }
-    });
+    fixBindingsAfterDuplication(nextElements, elements, oldIdToDuplicatedId);

    if (opts.files) {
      this.files = { ...this.files, ...opts.files };
    }

+    this.scene.replaceAllElements(nextElements);
    this.history.resumeRecording();

    this.setState(
@@ -1684,7 +1651,7 @@ class App extends React.Component<AppProps, AppState> {
          openSidebar:
            this.state.openSidebar &&
            this.device.canDeviceFitSidebar &&
-            this.state.defaultSidebarDockedPreference
+            this.state.isSidebarDocked
              ? this.state.openSidebar
              : null,
          selectedElementIds: newElements.reduce(
@@ -1742,14 +1709,12 @@ class App extends React.Component<AppProps, AppState> {
      (acc: ExcalidrawTextElement[], line, idx) => {
        const text = line.trim();

-        const lineHeight = getDefaultLineHeight(textElementProps.fontFamily);
        if (text.length) {
          const element = newTextElement({
            ...textElementProps,
            x,
            y: currentY,
            text,
-            lineHeight,
          });
          acc.push(element);
          currentY += element.height + LINE_GAP;
@@ -1758,9 +1723,14 @@ class App extends React.Component<AppProps, AppState> {
          // add paragraph only if previous line was not empty, IOW don't add
          // more than one empty line
          if (prevLine) {
-            currentY +=
-              getLineHeightInPx(textElementProps.fontSize, lineHeight) +
-              LINE_GAP;
+            const defaultLineHeight = getApproxLineHeight(
+              getFontString({
+                fontSize: textElementProps.fontSize,
+                fontFamily: textElementProps.fontFamily,
+              }),
+            );
+
+            currentY += defaultLineHeight + LINE_GAP;
          }
        }

@@ -1853,89 +1823,18 @@ class App extends React.Component<AppProps, AppState> {
    this.actionManager.executeAction(actionToggleHandTool);
  };

-  /**
-   * Zooms on canvas viewport center
-   */
-  zoomCanvas = (
-    /** decimal fraction between 0.1 (10% zoom) and 30 (3000% zoom) */
-    value: number,
-  ) => {
-    this.setState({
-      ...getStateForZoom(
-        {
-          viewportX: this.state.width / 2 + this.state.offsetLeft,
-          viewportY: this.state.height / 2 + this.state.offsetTop,
-          nextZoom: getNormalizedZoom(value),
-        },
-        this.state,
-      ),
-    });
-  };
-
-  private cancelInProgresAnimation: (() => void) | null = null;
-
  scrollToContent = (
    target:
      | ExcalidrawElement
      | readonly ExcalidrawElement[] = this.scene.getNonDeletedElements(),
-    opts?: { fitToContent?: boolean; animate?: boolean; duration?: number },
  ) => {
-    this.cancelInProgresAnimation?.();
-
-    // convert provided target into ExcalidrawElement[] if necessary
-    const targets = Array.isArray(target) ? target : [target];
-
-    let zoom = this.state.zoom;
-    let scrollX = this.state.scrollX;
-    let scrollY = this.state.scrollY;
-
-    if (opts?.fitToContent) {
-      // compute an appropriate viewport location (scroll X, Y) and zoom level
-      // that fit the target elements on the scene
-      const { appState } = zoomToFitElements(targets, this.state, false);
-      zoom = appState.zoom;
-      scrollX = appState.scrollX;
-      scrollY = appState.scrollY;
-    } else {
-      // compute only the viewport location, without any zoom adjustment
-      const scroll = calculateScrollCenter(targets, this.state, this.canvas);
-      scrollX = scroll.scrollX;
-      scrollY = scroll.scrollY;
-    }
-
-    // when animating, we use RequestAnimationFrame to prevent the animation
-    // from slowing down other processes
-    if (opts?.animate) {
-      const origScrollX = this.state.scrollX;
-      const origScrollY = this.state.scrollY;
-
-      // zoom animation could become problematic on scenes with large number
-      // of elements, setting it to its final value to improve user experience.
-      //
-      // using zoomCanvas() to zoom on current viewport center
-      this.zoomCanvas(zoom.value);
-
-      const cancel = easeToValuesRAF(
-        [origScrollX, origScrollY],
-        [scrollX, scrollY],
-        (scrollX, scrollY) => this.setState({ scrollX, scrollY }),
-        { duration: opts?.duration ?? 500 },
-      );
-      this.cancelInProgresAnimation = () => {
-        cancel();
-        this.cancelInProgresAnimation = null;
-      };
-    } else {
-      this.setState({ scrollX, scrollY, zoom });
-    }
-  };
-
-  /** use when changing scrollX/scrollY/zoom based on user interaction */
-  private translateCanvas: React.Component<any, AppState>["setState"] = (
-    state,
-  ) => {
-    this.cancelInProgresAnimation?.();
-    this.setState(state);
+    this.setState({
+      ...calculateScrollCenter(
+        Array.isArray(target) ? target : [target],
+        this.state,
+        this.canvas,
+      ),
+    });
  };

  setToast = (
@@ -2022,24 +1921,30 @@ class App extends React.Component<AppProps, AppState> {
  /**
   * @returns whether the menu was toggled on or off
   */
-  public toggleSidebar = ({
-    name,
-    tab,
-    force,
-  }: {
-    name: SidebarName;
-    tab?: SidebarTabName;
-    force?: boolean;
-  }): boolean => {
-    let nextName;
-    if (force === undefined) {
-      nextName = this.state.openSidebar?.name === name ? null : name;
-    } else {
-      nextName = force ? name : null;
+  public toggleMenu = (
+    type: "library" | "customSidebar",
+    force?: boolean,
+  ): boolean => {
+    if (type === "customSidebar" && !this.props.renderSidebar) {
+      console.warn(
+        `attempting to toggle "customSidebar", but no "props.renderSidebar" is defined`,
+      );
+      return false;
    }
-    this.setState({ openSidebar: nextName ? { name: nextName, tab } : null });

-    return !!nextName;
+    if (type === "library" || type === "customSidebar") {
+      let nextValue;
+      if (force === undefined) {
+        nextValue = this.state.openSidebar === type ? null : type;
+      } else {
+        nextValue = force ? type : null;
+      }
+      this.setState({ openSidebar: nextValue });
+
+      return !!nextValue;
+    }
+
+    return false;
  };

  private updateCurrentCursorPosition = withBatchedUpdates(
@@ -2130,13 +2035,9 @@ class App extends React.Component<AppProps, AppState> {
          offset = -offset;
        }
        if (event.shiftKey) {
-          this.translateCanvas((state) => ({
-            scrollX: state.scrollX + offset,
-          }));
+          this.setState((state) => ({ scrollX: state.scrollX + offset }));
        } else {
-          this.translateCanvas((state) => ({
-            scrollY: state.scrollY + offset,
-          }));
+          this.setState((state) => ({ scrollY: state.scrollY + offset }));
        }
      }

@@ -2684,13 +2585,6 @@ class App extends React.Component<AppProps, AppState> {
      existingTextElement = this.getTextElementAtPosition(sceneX, sceneY);
    }

-    const fontFamily =
-      existingTextElement?.fontFamily || this.state.currentItemFontFamily;
-
-    const lineHeight =
-      existingTextElement?.lineHeight || getDefaultLineHeight(fontFamily);
-    const fontSize = this.state.currentItemFontSize;
-
    if (
      !existingTextElement &&
      shouldBindToContainer &&
@@ -2698,14 +2592,11 @@ class App extends React.Component<AppProps, AppState> {
      !isArrowElement(container)
    ) {
      const fontString = {
-        fontSize,
-        fontFamily,
+        fontSize: this.state.currentItemFontSize,
+        fontFamily: this.state.currentItemFontFamily,
      };
-      const minWidth = getApproxMinLineWidth(
-        getFontString(fontString),
-        lineHeight,
-      );
-      const minHeight = getApproxMinLineHeight(fontSize, lineHeight);
+      const minWidth = getApproxMinLineWidth(getFontString(fontString));
+      const minHeight = getApproxMinLineHeight(getFontString(fontString));
      const containerDims = getContainerDims(container);
      const newHeight = Math.max(containerDims.height, minHeight);
      const newWidth = Math.max(containerDims.width, minWidth);
@@ -2737,9 +2628,10 @@ class App extends React.Component<AppProps, AppState> {
          strokeStyle: this.state.currentItemStrokeStyle,
          roughness: this.state.currentItemRoughness,
          opacity: this.state.currentItemOpacity,
+          roundness: null,
          text: "",
-          fontSize,
-          fontFamily,
+          fontSize: this.state.currentItemFontSize,
+          fontFamily: this.state.currentItemFontFamily,
          textAlign: parentCenterPosition
            ? "center"
            : this.state.currentItemTextAlign,
@@ -2748,8 +2640,7 @@ class App extends React.Component<AppProps, AppState> {
            : DEFAULT_VERTICAL_ALIGN,
          containerId: shouldBindToContainer ? container?.id : undefined,
          groupIds: container?.groupIds ?? [],
-          lineHeight,
-          angle: container?.angle ?? 0,
+          locked: false,
        });

    if (!existingTextElement && shouldBindToContainer && container) {
@@ -2772,6 +2663,14 @@ class App extends React.Component<AppProps, AppState> {
          element,
        ]);
      }
+
+      // case: creating new text not centered to parent element → offset Y
+      // so that the text is centered to cursor position
+      if (!parentCenterPosition) {
+        mutateElement(element, {
+          y: element.y - element.baseline / 2,
+        });
+      }
    }

    this.setState({
@@ -2865,6 +2764,7 @@ class App extends React.Component<AppProps, AppState> {
      );
      if (container) {
        if (
+          isArrowElement(container) ||
          hasBoundTextElement(container) ||
          !isTransparent(container.backgroundColor) ||
          isHittingElementNotConsideringBoundingBox(container, this.state, [
@@ -3016,12 +2916,12 @@ class App extends React.Component<AppProps, AppState> {
          state,
        );

-        this.translateCanvas({
+        return {
          zoom: zoomState.zoom,
          scrollX: zoomState.scrollX + deltaX / nextZoom,
          scrollY: zoomState.scrollY + deltaY / nextZoom,
          shouldCacheIgnoreZoom: true,
-        });
+        };
      });
      this.resetShouldCacheIgnoreZoomDebounced();
    } else {
@@ -3499,43 +3399,6 @@ class App extends React.Component<AppProps, AppState> {
      this.setState({ contextMenu: null });
    }

-    this.updateGestureOnPointerDown(event);
-
-    // if dragging element is freedraw and another pointerdown event occurs
-    // a second finger is on the screen
-    // discard the freedraw element if it is very short because it is likely
-    // just a spike, otherwise finalize the freedraw element when the second
-    // finger is lifted
-    if (
-      event.pointerType === "touch" &&
-      this.state.draggingElement &&
-      this.state.draggingElement.type === "freedraw"
-    ) {
-      const element = this.state.draggingElement as ExcalidrawFreeDrawElement;
-      this.updateScene({
-        ...(element.points.length < 10
-          ? {
-              elements: this.scene
-                .getElementsIncludingDeleted()
-                .filter((el) => el.id !== element.id),
-            }
-          : {}),
-        appState: {
-          draggingElement: null,
-          editingElement: null,
-          startBoundElement: null,
-          suggestedBindings: [],
-          selectedElementIds: Object.keys(this.state.selectedElementIds)
-            .filter((key) => key !== element.id)
-            .reduce((obj: { [id: string]: boolean }, key) => {
-              obj[key] = this.state.selectedElementIds[key];
-              return obj;
-            }, {}),
-        },
-      });
-      return;
-    }
-
    // remove any active selection when we start to interact with canvas
    // (mainly, we care about removing selection outside the component which
    //  would prevent our copy handling otherwise)
@@ -3575,6 +3438,8 @@ class App extends React.Component<AppProps, AppState> {
    });
    this.savePointer(event.clientX, event.clientY, "down");

+    this.updateGestureOnPointerDown(event);
+
    if (this.handleCanvasPanUsingWheelOrSpaceDrag(event)) {
      return;
    }
@@ -3832,7 +3697,7 @@ class App extends React.Component<AppProps, AppState> {
        window.addEventListener(EVENT.POINTER_UP, enableNextPaste);
      }

-      this.translateCanvas({
+      this.setState({
        scrollX: this.state.scrollX - deltaX / this.state.zoom.value,
        scrollY: this.state.scrollY - deltaY / this.state.zoom.value,
      });
@@ -4725,12 +4590,7 @@ class App extends React.Component<AppProps, AppState> {
        pointerDownState.drag.hasOccurred = true;
        // prevent dragging even if we're no longer holding cmd/ctrl otherwise
        // it would have weird results (stuff jumping all over the screen)
-        // Checking for editingElement to avoid jump while editing on mobile #6503
-        if (
-          selectedElements.length > 0 &&
-          !pointerDownState.withCmdOrCtrl &&
-          !this.state.editingElement
-        ) {
+        if (selectedElements.length > 0 && !pointerDownState.withCmdOrCtrl) {
          const [dragX, dragY] = getGridPoint(
            pointerCoords.x - pointerDownState.drag.offset.x,
            pointerCoords.y - pointerDownState.drag.offset.y,
@@ -4983,7 +4843,7 @@ class App extends React.Component<AppProps, AppState> {
    if (pointerDownState.scrollbars.isOverHorizontal) {
      const x = event.clientX;
      const dx = x - pointerDownState.lastCoords.x;
-      this.translateCanvas({
+      this.setState({
        scrollX: this.state.scrollX - dx / this.state.zoom.value,
      });
      pointerDownState.lastCoords.x = x;
@@ -4993,7 +4853,7 @@ class App extends React.Component<AppProps, AppState> {
    if (pointerDownState.scrollbars.isOverVertical) {
      const y = event.clientY;
      const dy = y - pointerDownState.lastCoords.y;
-      this.translateCanvas({
+      this.setState({
        scrollY: this.state.scrollY - dy / this.state.zoom.value,
      });
      pointerDownState.lastCoords.y = y;
@@ -5753,9 +5613,7 @@ class App extends React.Component<AppProps, AppState> {

      const imageFile = await fileOpen({
        description: "Image",
-        extensions: Object.keys(
-          IMAGE_MIME_TYPES,
-        ) as (keyof typeof IMAGE_MIME_TYPES)[],
+        extensions: ["jpg", "png", "svg", "gif"],
      });

      const imageElement = this.createImageElement({
@@ -6377,7 +6235,6 @@ class App extends React.Component<AppProps, AppState> {
      actionGroup,
      actionUnbindText,
      actionBindText,
-      actionWrapTextInContainer,
      actionUngroup,
      CONTEXT_MENU_SEPARATOR,
      actionAddToLibrary,
@@ -6424,7 +6281,7 @@ class App extends React.Component<AppProps, AppState> {
        // reduced amplification for small deltas (small movements on a trackpad)
        Math.min(1, absDelta / 20);

-      this.translateCanvas((state) => ({
+      this.setState((state) => ({
        ...getStateForZoom(
          {
            viewportX: cursorX,
@@ -6441,14 +6298,14 @@ class App extends React.Component<AppProps, AppState> {

    // scroll horizontally when shift pressed
    if (event.shiftKey) {
-      this.translateCanvas(({ zoom, scrollX }) => ({
+      this.setState(({ zoom, scrollX }) => ({
        // on Mac, shift+wheel tends to result in deltaX
        scrollX: scrollX - (deltaY || deltaX) / zoom.value,
      }));
      return;
    }

-    this.translateCanvas(({ zoom, scrollX, scrollY }) => ({
+    this.setState(({ zoom, scrollX, scrollY }) => ({
      scrollX: scrollX - deltaX / zoom.value,
      scrollY: scrollY - deltaY / zoom.value,
    }));
--- a/src/components/BraveMeasureTextError.tsx
+++ b/src/components/BraveMeasureTextError.tsx
@@ -1,43 +0,0 @@
-import Trans from "./Trans";
-
-const BraveMeasureTextError = () => {
-  return (
-    <div data-testid="brave-measure-text-error">
-      <p>
-        <Trans
-          i18nKey="errors.brave_measure_text_error.line1"
-          bold={(el) => <span style={{ fontWeight: 600 }}>{el}</span>}
-        />
-      </p>
-      <p>
-        <Trans
-          i18nKey="errors.brave_measure_text_error.line2"
-          bold={(el) => <span style={{ fontWeight: 600 }}>{el}</span>}
-        />
-      </p>
-      <p>
-        <Trans
-          i18nKey="errors.brave_measure_text_error.line3"
-          link={(el) => (
-            <a href="http://docs.excalidraw.com/docs/@excalidraw/excalidraw/faq#turning-off-aggresive-block-fingerprinting-in-brave-browser">
-              {el}
-            </a>
-          )}
-        />
-      </p>
-      <p>
-        <Trans
-          i18nKey="errors.brave_measure_text_error.line4"
-          issueLink={(el) => (
-            <a href="https://github.com/excalidraw/excalidraw/issues/new">
-              {el}
-            </a>
-          )}
-          discordLink={(el) => <a href="https://discord.gg/UexuTaE">{el}.</a>}
-        />
-      </p>
-    </div>
-  );
-};
-
-export default BraveMeasureTextError;
--- a/src/components/Button.tsx
+++ b/src/components/Button.tsx
@@ -1,12 +1,8 @@
-import clsx from "clsx";
-import { composeEventHandlers } from "../utils";
 import "./Button.scss";

 interface ButtonProps extends React.HTMLAttributes<HTMLButtonElement> {
  type?: "button" | "submit" | "reset";
  onSelect: () => any;
-  /** whether button is in active state */
-  selected?: boolean;
  children: React.ReactNode;
  className?: string;
 }
@@ -19,18 +15,18 @@ interface ButtonProps extends React.HTMLAttributes<HTMLButtonElement> {
 export const Button = ({
  type = "button",
  onSelect,
-  selected,
  children,
  className = "",
  ...rest
 }: ButtonProps) => {
  return (
    <button
-      onClick={composeEventHandlers(rest.onClick, (event) => {
+      onClick={(event) => {
        onSelect();
-      })}
+        rest.onClick?.(event);
+      }}
      type={type}
-      className={clsx("excalidraw-button", className, { selected })}
+      className={`excalidraw-button ${className}`}
      {...rest}
    >
      {children}
--- a/src/components/ButtonIconSelect.tsx
+++ b/src/components/ButtonIconSelect.tsx
@@ -1,59 +1,33 @@
 import clsx from "clsx";

 // TODO: It might be "clever" to add option.icon to the existing component <ButtonSelect />
-export const ButtonIconSelect = <T extends Object>(
-  props: {
-    options: {
-      value: T;
-      text: string;
-      icon: JSX.Element;
-      testId?: string;
-      /** if not supplied, defaults to value identity check */
-      active?: boolean;
-    }[];
-    value: T | null;
-    type?: "radio" | "button";
-  } & (
-    | { type?: "radio"; group: string; onChange: (value: T) => void }
-    | {
-        type: "button";
-        onClick: (
-          value: T,
-          event: React.MouseEvent<HTMLButtonElement, MouseEvent>,
-        ) => void;
-      }
-  ),
-) => (
+export const ButtonIconSelect = <T extends Object>({
+  options,
+  value,
+  onChange,
+  group,
+}: {
+  options: { value: T; text: string; icon: JSX.Element; testId?: string }[];
+  value: T | null;
+  onChange: (value: T) => void;
+  group: string;
+}) => (
  <div className="buttonList buttonListIcon">
-    {props.options.map((option) =>
-      props.type === "button" ? (
-        <button
-          key={option.text}
-          onClick={(event) => props.onClick(option.value, event)}
-          className={clsx({
-            active: option.active ?? props.value === option.value,
-          })}
+    {options.map((option) => (
+      <label
+        key={option.text}
+        className={clsx({ active: value === option.value })}
+        title={option.text}
+      >
+        <input
+          type="radio"
+          name={group}
+          onChange={() => onChange(option.value)}
+          checked={value === option.value}
          data-testid={option.testId}
-          title={option.text}
-        >
-          {option.icon}
-        </button>
-      ) : (
-        <label
-          key={option.text}
-          className={clsx({ active: props.value === option.value })}
-          title={option.text}
-        >
-          <input
-            type="radio"
-            name={props.group}
-            onChange={() => props.onChange(option.value)}
-            checked={props.value === option.value}
-            data-testid={option.testId}
-          />
-          {option.icon}
-        </label>
-      ),
-    )}
+        />
+        {option.icon}
+      </label>
+    ))}
  </div>
 );
--- a/src/components/ColorPicker.scss
+++ b/src/components/ColorPicker.scss
@@ -183,7 +183,6 @@
    width: 100%;
    margin: 0;
    font-size: 0.875rem;
-    font-family: inherit;
    background-color: transparent;
    color: var(--text-primary-color);
    border: 0;
--- a/src/components/ConfirmDialog.tsx
+++ b/src/components/ConfirmDialog.tsx
@@ -4,9 +4,8 @@ import { Dialog, DialogProps } from "./Dialog";
 import "./ConfirmDialog.scss";
 import DialogActionButton from "./DialogActionButton";
 import { useSetAtom } from "jotai";
-import { isLibraryMenuOpenAtom } from "./LibraryMenu";
-import { useExcalidrawContainer, useExcalidrawSetAppState } from "./App";
-import { jotaiScope } from "../jotai";
+import { isLibraryMenuOpenAtom } from "./LibraryMenuHeaderContent";
+import { useExcalidrawSetAppState } from "./App";

 interface Props extends Omit<DialogProps, "onCloseRequest"> {
  onConfirm: () => void;
@@ -25,8 +24,7 @@ const ConfirmDialog = (props: Props) => {
    ...rest
  } = props;
  const setAppState = useExcalidrawSetAppState();
-  const setIsLibraryMenuOpen = useSetAtom(isLibraryMenuOpenAtom, jotaiScope);
-  const { container } = useExcalidrawContainer();
+  const setIsLibraryMenuOpen = useSetAtom(isLibraryMenuOpenAtom);

  return (
    <Dialog
@@ -43,7 +41,6 @@ const ConfirmDialog = (props: Props) => {
            setAppState({ openMenu: null });
            setIsLibraryMenuOpen(false);
            onCancel();
-            container?.focus();
          }}
        />
        <DialogActionButton
@@ -52,7 +49,6 @@ const ConfirmDialog = (props: Props) => {
            setAppState({ openMenu: null });
            setIsLibraryMenuOpen(false);
            onConfirm();
-            container?.focus();
          }}
          actionType="danger"
        />
--- a/src/components/ContextMenu.scss
+++ b/src/components/ContextMenu.scss
@@ -30,7 +30,6 @@
    background-color: transparent;
    border: none;
    white-space: nowrap;
-    font-family: inherit;

    display: grid;
    grid-template-columns: 1fr 0.2fr;
--- a/src/components/DefaultSidebar.test.tsx
+++ b/src/components/DefaultSidebar.test.tsx
@@ -1,144 +0,0 @@
-import React from "react";
-import { DEFAULT_SIDEBAR } from "../constants";
-import { DefaultSidebar } from "../packages/excalidraw/index";
-import {
-  fireEvent,
-  waitFor,
-  withExcalidrawDimensions,
-} from "../tests/test-utils";
-import {
-  assertExcalidrawWithSidebar,
-  assertSidebarDockButton,
-} from "./Sidebar/Sidebar.test";
-
-const { h } = window;
-
-describe("DefaultSidebar", () => {
-  it("when `docked={undefined}` & `onDock={undefined}`, should allow docking", async () => {
-    await assertExcalidrawWithSidebar(
-      <DefaultSidebar />,
-      DEFAULT_SIDEBAR.name,
-      async () => {
-        expect(h.state.defaultSidebarDockedPreference).toBe(false);
-
-        const { dockButton } = await assertSidebarDockButton(true);
-
-        fireEvent.click(dockButton);
-        await waitFor(() => {
-          expect(h.state.defaultSidebarDockedPreference).toBe(true);
-          expect(dockButton).toHaveClass("selected");
-        });
-
-        fireEvent.click(dockButton);
-        await waitFor(() => {
-          expect(h.state.defaultSidebarDockedPreference).toBe(false);
-          expect(dockButton).not.toHaveClass("selected");
-        });
-      },
-    );
-  });
-
-  it("when `docked={undefined}` & `onDock`, should allow docking", async () => {
-    await assertExcalidrawWithSidebar(
-      <DefaultSidebar onDock={() => {}} />,
-      DEFAULT_SIDEBAR.name,
-      async () => {
-        expect(h.state.defaultSidebarDockedPreference).toBe(false);
-
-        const { dockButton } = await assertSidebarDockButton(true);
-
-        fireEvent.click(dockButton);
-        await waitFor(() => {
-          expect(h.state.defaultSidebarDockedPreference).toBe(true);
-          expect(dockButton).toHaveClass("selected");
-        });
-
-        fireEvent.click(dockButton);
-        await waitFor(() => {
-          expect(h.state.defaultSidebarDockedPreference).toBe(false);
-          expect(dockButton).not.toHaveClass("selected");
-        });
-      },
-    );
-  });
-
-  it("when `docked={true}` & `onDock`, should allow docking", async () => {
-    await assertExcalidrawWithSidebar(
-      <DefaultSidebar onDock={() => {}} />,
-      DEFAULT_SIDEBAR.name,
-      async () => {
-        expect(h.state.defaultSidebarDockedPreference).toBe(false);
-
-        const { dockButton } = await assertSidebarDockButton(true);
-
-        fireEvent.click(dockButton);
-        await waitFor(() => {
-          expect(h.state.defaultSidebarDockedPreference).toBe(true);
-          expect(dockButton).toHaveClass("selected");
-        });
-
-        fireEvent.click(dockButton);
-        await waitFor(() => {
-          expect(h.state.defaultSidebarDockedPreference).toBe(false);
-          expect(dockButton).not.toHaveClass("selected");
-        });
-      },
-    );
-  });
-
-  it("when `onDock={false}`, should disable docking", async () => {
-    await assertExcalidrawWithSidebar(
-      <DefaultSidebar onDock={false} />,
-      DEFAULT_SIDEBAR.name,
-      async () => {
-        await withExcalidrawDimensions(
-          { width: 1920, height: 1080 },
-          async () => {
-            expect(h.state.defaultSidebarDockedPreference).toBe(false);
-
-            await assertSidebarDockButton(false);
-          },
-        );
-      },
-    );
-  });
-
-  it("when `docked={true}` & `onDock={false}`, should force-dock sidebar", async () => {
-    await assertExcalidrawWithSidebar(
-      <DefaultSidebar docked onDock={false} />,
-      DEFAULT_SIDEBAR.name,
-      async () => {
-        expect(h.state.defaultSidebarDockedPreference).toBe(false);
-
-        const { sidebar } = await assertSidebarDockButton(false);
-        expect(sidebar).toHaveClass("sidebar--docked");
-      },
-    );
-  });
-
-  it("when `docked={true}` & `onDock={undefined}`, should force-dock sidebar", async () => {
-    await assertExcalidrawWithSidebar(
-      <DefaultSidebar docked />,
-      DEFAULT_SIDEBAR.name,
-      async () => {
-        expect(h.state.defaultSidebarDockedPreference).toBe(false);
-
-        const { sidebar } = await assertSidebarDockButton(false);
-        expect(sidebar).toHaveClass("sidebar--docked");
-      },
-    );
-  });
-
-  it("when `docked={false}` & `onDock={undefined}`, should force-undock sidebar", async () => {
-    await assertExcalidrawWithSidebar(
-      <DefaultSidebar docked={false} />,
-      DEFAULT_SIDEBAR.name,
-      async () => {
-        expect(h.state.defaultSidebarDockedPreference).toBe(false);
-
-        const { sidebar } = await assertSidebarDockButton(false);
-        expect(sidebar).not.toHaveClass("sidebar--docked");
-      },
-    );
-  });
-});
--- a/src/components/DefaultSidebar.tsx
+++ b/src/components/DefaultSidebar.tsx
@@ -1,118 +0,0 @@
-import clsx from "clsx";
-import { DEFAULT_SIDEBAR, LIBRARY_SIDEBAR_TAB } from "../constants";
-import { useTunnels } from "../context/tunnels";
-import { useUIAppState } from "../context/ui-appState";
-import { t } from "../i18n";
-import { MarkOptional, Merge } from "../utility-types";
-import { composeEventHandlers } from "../utils";
-import { useExcalidrawSetAppState } from "./App";
-import { withInternalFallback } from "./hoc/withInternalFallback";
-import { LibraryMenu } from "./LibraryMenu";
-import { SidebarProps, SidebarTriggerProps } from "./Sidebar/common";
-import { Sidebar } from "./Sidebar/Sidebar";
-
-const DefaultSidebarTrigger = withInternalFallback(
-  "DefaultSidebarTrigger",
-  (
-    props: Omit<SidebarTriggerProps, "name"> &
-      React.HTMLAttributes<HTMLDivElement>,
-  ) => {
-    const { DefaultSidebarTriggerTunnel } = useTunnels();
-    return (
-      <DefaultSidebarTriggerTunnel.In>
-        <Sidebar.Trigger
-          {...props}
-          className="default-sidebar-trigger"
-          name={DEFAULT_SIDEBAR.name}
-        />
-      </DefaultSidebarTriggerTunnel.In>
-    );
-  },
-);
-DefaultSidebarTrigger.displayName = "DefaultSidebarTrigger";
-
-const DefaultTabTriggers = ({
-  children,
-  ...rest
-}: { children: React.ReactNode } & React.HTMLAttributes<HTMLDivElement>) => {
-  const { DefaultSidebarTabTriggersTunnel } = useTunnels();
-  return (
-    <DefaultSidebarTabTriggersTunnel.In>
-      <Sidebar.TabTriggers {...rest}>{children}</Sidebar.TabTriggers>
-    </DefaultSidebarTabTriggersTunnel.In>
-  );
-};
-DefaultTabTriggers.displayName = "DefaultTabTriggers";
-
-export const DefaultSidebar = Object.assign(
-  withInternalFallback(
-    "DefaultSidebar",
-    ({
-      children,
-      className,
-      onDock,
-      docked,
-      ...rest
-    }: Merge<
-      MarkOptional<Omit<SidebarProps, "name">, "children">,
-      {
-        /** pass `false` to disable docking */
-        onDock?: SidebarProps["onDock"] | false;
-      }
-    >) => {
-      const appState = useUIAppState();
-      const setAppState = useExcalidrawSetAppState();
-
-      const { DefaultSidebarTabTriggersTunnel } = useTunnels();
-
-      return (
-        <Sidebar
-          {...rest}
-          name="default"
-          key="default"
-          className={clsx("default-sidebar", className)}
-          docked={docked ?? appState.defaultSidebarDockedPreference}
-          onDock={
-            // `onDock=false` disables docking.
-            // if `docked` passed, but no onDock passed, disable manual docking.
-            onDock === false || (!onDock && docked != null)
-              ? undefined
-              : // compose to allow the host app to listen on default behavior
-                composeEventHandlers(onDock, (docked) => {
-                  setAppState({ defaultSidebarDockedPreference: docked });
-                })
-          }
-        >
-          <Sidebar.Tabs>
-            <Sidebar.Header>
-              {rest.__fallback && (
-                <div
-                  style={{
-                    color: "var(--color-primary)",
-                    fontSize: "1.2em",
-                    fontWeight: "bold",
-                    textOverflow: "ellipsis",
-                    overflow: "hidden",
-                    whiteSpace: "nowrap",
-                    paddingRight: "1em",
-                  }}
-                >
-                  {t("toolBar.library")}
-                </div>
-              )}
-              <DefaultSidebarTabTriggersTunnel.Out />
-            </Sidebar.Header>
-            <Sidebar.Tab tab={LIBRARY_SIDEBAR_TAB}>
-              <LibraryMenu />
-            </Sidebar.Tab>
-            {children}
-          </Sidebar.Tabs>
-        </Sidebar>
-      );
-    },
-  ),
-  {
-    Trigger: DefaultSidebarTrigger,
-    TabTriggers: DefaultTabTriggers,
-  },
-);
--- a/src/components/Dialog.tsx
+++ b/src/components/Dialog.tsx
@@ -15,8 +15,7 @@ import { Modal } from "./Modal";
 import { AppState } from "../types";
 import { queryFocusableElements } from "../utils";
 import { useSetAtom } from "jotai";
-import { isLibraryMenuOpenAtom } from "./LibraryMenu";
-import { jotaiScope } from "../jotai";
+import { isLibraryMenuOpenAtom } from "./LibraryMenuHeaderContent";

 export interface DialogProps {
  children: React.ReactNode;
@@ -73,7 +72,7 @@ export const Dialog = (props: DialogProps) => {
  }, [islandNode, props.autofocus]);

  const setAppState = useExcalidrawSetAppState();
-  const setIsLibraryMenuOpen = useSetAtom(isLibraryMenuOpenAtom, jotaiScope);
+  const setIsLibraryMenuOpen = useSetAtom(isLibraryMenuOpenAtom);

  const onClose = () => {
    setAppState({ openMenu: null });
--- a/src/components/ErrorDialog.tsx
+++ b/src/components/ErrorDialog.tsx
@@ -5,13 +5,13 @@ import { Dialog } from "./Dialog";
 import { useExcalidrawContainer } from "./App";

 export const ErrorDialog = ({
-  children,
+  message,
  onClose,
 }: {
-  children?: React.ReactNode;
+  message: string;
  onClose?: () => void;
 }) => {
-  const [modalIsShown, setModalIsShown] = useState(!!children);
+  const [modalIsShown, setModalIsShown] = useState(!!message);
  const { container: excalidrawContainer } = useExcalidrawContainer();

  const handleClose = React.useCallback(() => {
@@ -32,7 +32,7 @@ export const ErrorDialog = ({
          onCloseRequest={handleClose}
          title={t("errorDialog.title")}
        >
-          <div style={{ whiteSpace: "pre-wrap" }}>{children}</div>
+          <div style={{ whiteSpace: "pre-wrap" }}>{message}</div>
        </Dialog>
      )}
    </>
--- a/src/components/ExportDialog.scss
+++ b/src/components/ExportDialog.scss
@@ -9,10 +9,6 @@
    text-align: center;
    padding: var(--preview-padding);
    margin-bottom: calc(var(--space-factor) * 3);
-
-    display: flex;
-    justify-content: center;
-    align-items: center;
  }

  .ExportDialog__preview canvas {
--- a/src/components/HelpButton.tsx
+++ b/src/components/HelpButton.tsx
@@ -1,7 +1,7 @@
-import { t } from "../i18n";
 import { HelpIcon } from "./icons";

 type HelpButtonProps = {
+  title?: string;
  name?: string;
  id?: string;
  onClick?(): void;
@@ -12,8 +12,8 @@ export const HelpButton = (props: HelpButtonProps) => (
    className="help-icon"
    onClick={props.onClick}
    type="button"
-    title={`${t("helpDialog.title")} — ?`}
-    aria-label={t("helpDialog.title")}
+    title={`${props.title} — ?`}
+    aria-label={props.title}
  >
    {HelpIcon}
  </button>
--- a/src/components/HelpDialog.tsx
+++ b/src/components/HelpDialog.tsx
@@ -165,12 +165,11 @@ export const HelpDialog = ({ onClose }: { onClose?: () => void }) => {
              shortcuts={[KEYS.E, KEYS["0"]]}
            />
            <Shortcut
-              label={t("helpDialog.editLineArrowPoints")}
-              shortcuts={[getShortcutKey("CtrlOrCmd+Enter")]}
-            />
-            <Shortcut
-              label={t("helpDialog.editText")}
-              shortcuts={[getShortcutKey("Enter")]}
+              label={t("helpDialog.editSelectedShape")}
+              shortcuts={[
+                getShortcutKey("CtrlOrCmd+Enter"),
+                getShortcutKey(`CtrlOrCmd + ${t("helpDialog.doubleClick")}`),
+              ]}
            />
            <Shortcut
              label={t("helpDialog.textNewLine")}
--- a/src/components/HintViewer.tsx
+++ b/src/components/HintViewer.tsx
@@ -1,7 +1,9 @@
 import { t } from "../i18n";
 import { NonDeletedExcalidrawElement } from "../element/types";
 import { getSelectedElements } from "../scene";
-import { Device, UIAppState } from "../types";
+
+import "./HintViewer.scss";
+import { AppState, Device } from "../types";
 import {
  isImageElement,
  isLinearElement,
@@ -11,10 +13,8 @@ import {
 import { getShortcutKey } from "../utils";
 import { isEraserActive } from "../appState";

-import "./HintViewer.scss";
-
 interface HintViewerProps {
-  appState: UIAppState;
+  appState: AppState;
  elements: readonly NonDeletedExcalidrawElement[];
  isMobile: boolean;
  device: Device;
@@ -29,7 +29,7 @@ const getHints = ({
  const { activeTool, isResizing, isRotating, lastPointerDownWith } = appState;
  const multiMode = appState.multiElement !== null;

-  if (appState.openSidebar && !device.canDeviceFitSidebar) {
+  if (appState.openSidebar === "library" && !device.canDeviceFitSidebar) {
    return null;
  }

--- a/src/components/ImageExportDialog.tsx
+++ b/src/components/ImageExportDialog.tsx
@@ -4,18 +4,17 @@ import { canvasToBlob } from "../data/blob";
 import { NonDeletedExcalidrawElement } from "../element/types";
 import { t } from "../i18n";
 import { getSelectedElements, isSomeElementSelected } from "../scene";
-import { BinaryFiles, UIAppState } from "../types";
+import { exportToCanvas } from "../scene/export";
+import { AppState, BinaryFiles } from "../types";
 import { Dialog } from "./Dialog";
 import { clipboard } from "./icons";
 import Stack from "./Stack";
+import "./ExportDialog.scss";
 import OpenColor from "open-color";
 import { CheckboxItem } from "./CheckboxItem";
 import { DEFAULT_EXPORT_PADDING, isFirefox } from "../constants";
 import { nativeFileSystemSupported } from "../data/filesystem";
 import { ActionManager } from "../actions/manager";
-import { exportToCanvas } from "../packages/utils";
-
-import "./ExportDialog.scss";

 const supportsContextFilters =
  "filter" in document.createElement("canvas").getContext("2d")!;
@@ -71,7 +70,7 @@ const ImageExportModal = ({
  onExportToSvg,
  onExportToClipboard,
 }: {
-  appState: UIAppState;
+  appState: AppState;
  elements: readonly NonDeletedExcalidrawElement[];
  files: BinaryFiles;
  exportPadding?: number;
@@ -84,6 +83,7 @@ const ImageExportModal = ({
  const someElementIsSelected = isSomeElementSelected(elements, appState);
  const [exportSelected, setExportSelected] = useState(someElementIsSelected);
  const previewRef = useRef<HTMLDivElement>(null);
+  const { exportBackground, viewBackgroundColor } = appState;
  const [renderError, setRenderError] = useState<Error | null>(null);

  const exportedElements = exportSelected
@@ -99,16 +99,10 @@ const ImageExportModal = ({
    if (!previewNode) {
      return;
    }
-    const maxWidth = previewNode.offsetWidth;
-    if (!maxWidth) {
-      return;
-    }
-    exportToCanvas({
-      elements: exportedElements,
-      appState,
-      files,
+    exportToCanvas(exportedElements, appState, files, {
+      exportBackground,
+      viewBackgroundColor,
      exportPadding,
-      maxWidthOrHeight: maxWidth,
    })
      .then((canvas) => {
        setRenderError(null);
@@ -122,7 +116,14 @@ const ImageExportModal = ({
        console.error(error);
        setRenderError(error);
      });
-  }, [appState, files, exportedElements, exportPadding]);
+  }, [
+    appState,
+    files,
+    exportedElements,
+    exportBackground,
+    exportPadding,
+    viewBackgroundColor,
+  ]);

  return (
    <div className="ExportDialog">
@@ -217,8 +218,8 @@ export const ImageExportDialog = ({
  onExportToSvg,
  onExportToClipboard,
 }: {
-  appState: UIAppState;
-  setAppState: React.Component<any, UIAppState>["setState"];
+  appState: AppState;
+  setAppState: React.Component<any, AppState>["setState"];
  elements: readonly NonDeletedExcalidrawElement[];
  files: BinaryFiles;
  exportPadding?: number;
--- a/src/components/JSONExportDialog.tsx
+++ b/src/components/JSONExportDialog.tsx
@@ -2,7 +2,7 @@ import React from "react";
 import { NonDeletedExcalidrawElement } from "../element/types";
 import { t } from "../i18n";

-import { ExportOpts, BinaryFiles, UIAppState } from "../types";
+import { AppState, ExportOpts, BinaryFiles } from "../types";
 import { Dialog } from "./Dialog";
 import { exportToFileIcon, LinkIcon } from "./icons";
 import { ToolButton } from "./ToolButton";
@@ -28,7 +28,7 @@ const JSONExportModal = ({
  exportOpts,
  canvas,
 }: {
-  appState: UIAppState;
+  appState: AppState;
  files: BinaryFiles;
  elements: readonly NonDeletedExcalidrawElement[];
  actionManager: ActionManager;
@@ -96,12 +96,12 @@ export const JSONExportDialog = ({
  setAppState,
 }: {
  elements: readonly NonDeletedExcalidrawElement[];
-  appState: UIAppState;
+  appState: AppState;
  files: BinaryFiles;
  actionManager: ActionManager;
  exportOpts: ExportOpts;
  canvas: HTMLCanvasElement | null;
-  setAppState: React.Component<any, UIAppState>["setState"];
+  setAppState: React.Component<any, AppState>["setState"];
 }) => {
  const handleClose = React.useCallback(() => {
    setAppState({ openDialog: null });
--- a/src/components/LayerUI.tsx
+++ b/src/components/LayerUI.tsx
@@ -1,21 +1,15 @@
 import clsx from "clsx";
 import React from "react";
 import { ActionManager } from "../actions/manager";
-import { CLASSES, DEFAULT_SIDEBAR, LIBRARY_SIDEBAR_WIDTH } from "../constants";
+import { CLASSES, LIBRARY_SIDEBAR_WIDTH } from "../constants";
 import { exportCanvas } from "../data";
 import { isTextElement, showSelectedShapeActions } from "../element";
 import { NonDeletedExcalidrawElement } from "../element/types";
 import { Language, t } from "../i18n";
 import { calculateScrollCenter } from "../scene";
 import { ExportType } from "../scene/types";
-import {
-  AppProps,
-  AppState,
-  ExcalidrawProps,
-  BinaryFiles,
-  UIAppState,
-} from "../types";
-import { capitalizeString, isShallowEqual, muteFSAbortError } from "../utils";
+import { AppProps, AppState, ExcalidrawProps, BinaryFiles } from "../types";
+import { isShallowEqual, muteFSAbortError } from "../utils";
 import { SelectedShapeActions, ShapesSwitcher } from "./Actions";
 import { ErrorDialog } from "./ErrorDialog";
 import { ExportCB, ImageExportDialog } from "./ImageExportDialog";
@@ -30,32 +24,32 @@ import { Section } from "./Section";
 import { HelpDialog } from "./HelpDialog";
 import Stack from "./Stack";
 import { UserList } from "./UserList";
+import Library from "../data/library";
 import { JSONExportDialog } from "./JSONExportDialog";
+import { LibraryButton } from "./LibraryButton";
 import { isImageFileHandle } from "../data/blob";
+import { LibraryMenu } from "./LibraryMenu";
+
+import "./LayerUI.scss";
+import "./Toolbar.scss";
 import { PenModeButton } from "./PenModeButton";
 import { trackEvent } from "../analytics";
 import { useDevice } from "../components/App";
 import { Stats } from "./Stats";
 import { actionToggleStats } from "../actions/actionToggleStats";
 import Footer from "./footer/Footer";
-import { isSidebarDockedAtom } from "./Sidebar/Sidebar";
+import { hostSidebarCountersAtom } from "./Sidebar/Sidebar";
 import { jotaiScope } from "../jotai";
-import { Provider, useAtomValue } from "jotai";
+import { Provider, useAtom } from "jotai";
 import MainMenu from "./main-menu/MainMenu";
 import { ActiveConfirmDialog } from "./ActiveConfirmDialog";
 import { HandButton } from "./HandButton";
 import { isHandToolActive } from "../appState";
-import { TunnelsContext, useInitializeTunnels } from "../context/tunnels";
-import { LibraryIcon } from "./icons";
-import { UIAppStateContext } from "../context/ui-appState";
-import { DefaultSidebar } from "./DefaultSidebar";
-
-import "./LayerUI.scss";
-import "./Toolbar.scss";
+import { TunnelsContext, useInitializeTunnels } from "./context/tunnels";

 interface LayerUIProps {
  actionManager: ActionManager;
-  appState: UIAppState;
+  appState: AppState;
  files: BinaryFiles;
  canvas: HTMLCanvasElement | null;
  setAppState: React.Component<any, AppState>["setState"];
@@ -63,11 +57,17 @@ interface LayerUIProps {
  onLockToggle: () => void;
  onHandToolToggle: () => void;
  onPenModeToggle: () => void;
+  onInsertElements: (elements: readonly NonDeletedExcalidrawElement[]) => void;
  showExitZenModeBtn: boolean;
  langCode: Language["code"];
  renderTopRightUI?: ExcalidrawProps["renderTopRightUI"];
  renderCustomStats?: ExcalidrawProps["renderCustomStats"];
+  renderCustomSidebar?: ExcalidrawProps["renderSidebar"];
+  libraryReturnUrl: ExcalidrawProps["libraryReturnUrl"];
  UIOptions: AppProps["UIOptions"];
+  focusContainer: () => void;
+  library: Library;
+  id: string;
  onImageAction: (data: { insertOnCanvasDirectly: boolean }) => void;
  renderWelcomeScreen: boolean;
  children?: React.ReactNode;
@@ -109,10 +109,16 @@ const LayerUI = ({
  onLockToggle,
  onHandToolToggle,
  onPenModeToggle,
+  onInsertElements,
  showExitZenModeBtn,
  renderTopRightUI,
  renderCustomStats,
+  renderCustomSidebar,
+  libraryReturnUrl,
  UIOptions,
+  focusContainer,
+  library,
+  id,
  onImageAction,
  renderWelcomeScreen,
  children,
@@ -150,8 +156,7 @@ const LayerUI = ({
        const fileHandle = await exportCanvas(
          type,
          exportedElements,
-          // FIXME once we split UI canvas from element canvas
-          appState as AppState,
+          appState,
          files,
          {
            exportBackground: appState.exportBackground,
@@ -192,8 +197,8 @@ const LayerUI = ({
    <div style={{ position: "relative" }}>
      {/* wrapping to Fragment stops React from occasionally complaining
                about identical Keys */}
-      <tunnels.MainMenuTunnel.Out />
-      {renderWelcomeScreen && <tunnels.WelcomeScreenMenuHintTunnel.Out />}
+      <tunnels.mainMenuTunnel.Out />
+      {renderWelcomeScreen && <tunnels.welcomeScreenMenuHintTunnel.Out />}
    </div>
  );

@@ -245,7 +250,7 @@ const LayerUI = ({
              {(heading: React.ReactNode) => (
                <div style={{ position: "relative" }}>
                  {renderWelcomeScreen && (
-                    <tunnels.WelcomeScreenToolbarHintTunnel.Out />
+                    <tunnels.welcomeScreenToolbarHintTunnel.Out />
                  )}
                  <Stack.Col gap={4} align="start">
                    <Stack.Row
@@ -319,12 +324,9 @@ const LayerUI = ({
          >
            <UserList collaborators={appState.collaborators} />
            {renderTopRightUI?.(device.isMobile, appState)}
-            {!appState.viewModeEnabled &&
-              // hide button when sidebar docked
-              (!isSidebarDocked ||
-                appState.openSidebar?.name !== DEFAULT_SIDEBAR.name) && (
-                <tunnels.DefaultSidebarTriggerTunnel.Out />
-              )}
+            {!appState.viewModeEnabled && (
+              <LibraryButton appState={appState} setAppState={setAppState} />
+            )}
          </div>
        </div>
      </FixedSideContainer>
@@ -332,21 +334,21 @@ const LayerUI = ({
  };

  const renderSidebars = () => {
-    return (
-      <DefaultSidebar
-        __fallback
-        onDock={(docked) => {
-          trackEvent(
-            "sidebar",
-            `toggleDock (${docked ? "dock" : "undock"})`,
-            `(${device.isMobile ? "mobile" : "desktop"})`,
-          );
-        }}
+    return appState.openSidebar === "customSidebar" ? (
+      renderCustomSidebar?.() || null
+    ) : appState.openSidebar === "library" ? (
+      <LibraryMenu
+        appState={appState}
+        onInsertElements={onInsertElements}
+        libraryReturnUrl={libraryReturnUrl}
+        focusContainer={focusContainer}
+        library={library}
+        id={id}
      />
-    );
+    ) : null;
  };

-  const isSidebarDocked = useAtomValue(isSidebarDockedAtom, jotaiScope);
+  const [hostSidebarCounters] = useAtom(hostSidebarCountersAtom, jotaiScope);

  const layerUIJSX = (
    <>
@@ -356,32 +358,16 @@ const LayerUI = ({
      {children}
      {/* render component fallbacks. Can be rendered anywhere as they'll be
          tunneled away. We only render tunneled components that actually
-        have defaults when host do not render anything. */}
+          have defaults when host do not render anything. */}
      <DefaultMainMenu UIOptions={UIOptions} />
-      <DefaultSidebar.Trigger
-        __fallback
-        icon={LibraryIcon}
-        title={capitalizeString(t("toolBar.library"))}
-        onToggle={(open) => {
-          if (open) {
-            trackEvent(
-              "sidebar",
-              `${DEFAULT_SIDEBAR.name} (open)`,
-              `button (${device.isMobile ? "mobile" : "desktop"})`,
-            );
-          }
-        }}
-        tab={DEFAULT_SIDEBAR.defaultTab}
-      >
-        {t("toolBar.library")}
-      </DefaultSidebar.Trigger>
      {/* ------------------------------------------------------------------ */}

      {appState.isLoading && <LoadingMessage delay={250} />}
      {appState.errorMessage && (
-        <ErrorDialog onClose={() => setAppState({ errorMessage: null })}>
-          {appState.errorMessage}
-        </ErrorDialog>
+        <ErrorDialog
+          message={appState.errorMessage}
+          onClose={() => setAppState({ errorMessage: null })}
+        />
      )}
      {appState.openDialog === "help" && (
        <HelpDialog
@@ -397,6 +383,7 @@ const LayerUI = ({
        <PasteChartDialog
          setAppState={setAppState}
          appState={appState}
+          onInsertChart={onInsertElements}
          onClose={() =>
            setAppState({
              pasteDialog: { shown: false, data: null },
@@ -424,6 +411,7 @@ const LayerUI = ({
          renderWelcomeScreen={renderWelcomeScreen}
        />
      )}
+
      {!device.isMobile && (
        <>
          <div
@@ -435,14 +423,15 @@ const LayerUI = ({
                  !isTextElement(appState.editingElement)),
            })}
            style={
-              appState.openSidebar &&
-              isSidebarDocked &&
+              ((appState.openSidebar === "library" &&
+                appState.isSidebarDocked) ||
+                hostSidebarCounters.docked) &&
              device.canDeviceFitSidebar
                ? { width: `calc(100% - ${LIBRARY_SIDEBAR_WIDTH}px)` }
                : {}
            }
          >
-            {renderWelcomeScreen && <tunnels.WelcomeScreenCenterTunnel.Out />}
+            {renderWelcomeScreen && <tunnels.welcomeScreenCenterTunnel.Out />}
            {renderFixedSideContainer()}
            <Footer
              appState={appState}
@@ -465,9 +454,9 @@ const LayerUI = ({
              <button
                className="scroll-back-to-content"
                onClick={() => {
-                  setAppState((appState) => ({
+                  setAppState({
                    ...calculateScrollCenter(elements, appState, canvas),
-                  }));
+                  });
                }}
              >
                {t("buttons.scrollBackToContent")}
@@ -481,25 +470,19 @@ const LayerUI = ({
  );

  return (
-    <UIAppStateContext.Provider value={appState}>
-      <Provider scope={tunnels.jotaiScope}>
-        <TunnelsContext.Provider value={tunnels}>
-          {layerUIJSX}
-        </TunnelsContext.Provider>
-      </Provider>
-    </UIAppStateContext.Provider>
+    <Provider scope={tunnels.jotaiScope}>
+      <TunnelsContext.Provider value={tunnels}>
+        {layerUIJSX}
+      </TunnelsContext.Provider>
+    </Provider>
  );
 };

-const stripIrrelevantAppStateProps = (appState: AppState): UIAppState => {
-  const {
-    suggestedBindings,
-    startBoundElement,
-    cursorButton,
-    scrollX,
-    scrollY,
-    ...ret
-  } = appState;
+const stripIrrelevantAppStateProps = (
+  appState: AppState,
+): Partial<AppState> => {
+  const { suggestedBindings, startBoundElement, cursorButton, ...ret } =
+    appState;
  return ret;
 };

@@ -509,19 +492,24 @@ const areEqual = (prevProps: LayerUIProps, nextProps: LayerUIProps) => {
    return false;
  }

-  const { canvas: _prevCanvas, appState: prevAppState, ...prev } = prevProps;
-  const { canvas: _nextCanvas, appState: nextAppState, ...next } = nextProps;
+  const {
+    canvas: _prevCanvas,
+    // not stable, but shouldn't matter in our case
+    onInsertElements: _prevOnInsertElements,
+    appState: prevAppState,
+    ...prev
+  } = prevProps;
+  const {
+    canvas: _nextCanvas,
+    onInsertElements: _nextOnInsertElements,
+    appState: nextAppState,
+    ...next
+  } = nextProps;

  return (
    isShallowEqual(
-      // asserting AppState because we're being passed the whole AppState
-      // but resolve to only the UI-relevant props
-      stripIrrelevantAppStateProps(prevAppState as AppState),
-      stripIrrelevantAppStateProps(nextAppState as AppState),
-      {
-        selectedElementIds: isShallowEqual,
-        selectedGroupIds: isShallowEqual,
-      },
+      stripIrrelevantAppStateProps(prevAppState),
+      stripIrrelevantAppStateProps(nextAppState),
    ) && isShallowEqual(prev, next)
  );
 };
--- a/src/components/LibraryButton.scss
+++ b/src/components/LibraryButton.scss
@@ -0,0 +1,32 @@
+@import "../css/variables.module";
+
+.library-button {
+  @include outlineButtonStyles;
+
+  background-color: var(--island-bg-color);
+
+  width: auto;
+  height: var(--lg-button-size);
+
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+
+  line-height: 0;
+
+  font-size: 0.75rem;
+  letter-spacing: 0.4px;
+
+  svg {
+    width: var(--lg-icon-size);
+    height: var(--lg-icon-size);
+  }
+
+  &__label {
+    display: none;
+
+    @media screen and (min-width: 1024px) {
+      display: block;
+    }
+  }
+}
--- a/src/components/LibraryButton.tsx
+++ b/src/components/LibraryButton.tsx
@@ -0,0 +1,57 @@
+import React from "react";
+import { t } from "../i18n";
+import { AppState } from "../types";
+import { capitalizeString } from "../utils";
+import { trackEvent } from "../analytics";
+import { useDevice } from "./App";
+import "./LibraryButton.scss";
+import { LibraryIcon } from "./icons";
+
+export const LibraryButton: React.FC<{
+  appState: AppState;
+  setAppState: React.Component<any, AppState>["setState"];
+  isMobile?: boolean;
+}> = ({ appState, setAppState, isMobile }) => {
+  const device = useDevice();
+  const showLabel = !isMobile;
+
+  // TODO barnabasmolnar/redesign
+  // not great, toolbar jumps in a jarring manner
+  if (appState.isSidebarDocked && appState.openSidebar === "library") {
+    return null;
+  }
+
+  return (
+    <label title={`${capitalizeString(t("toolBar.library"))}`}>
+      <input
+        className="ToolIcon_type_checkbox"
+        type="checkbox"
+        name="editor-library"
+        onChange={(event) => {
+          document
+            .querySelector(".layer-ui__wrapper")
+            ?.classList.remove("animate");
+          const isOpen = event.target.checked;
+          setAppState({ openSidebar: isOpen ? "library" : null });
+          // track only openings
+          if (isOpen) {
+            trackEvent(
+              "library",
+              "toggleLibrary (open)",
+              `toolbar (${device.isMobile ? "mobile" : "desktop"})`,
+            );
+          }
+        }}
+        checked={appState.openSidebar === "library"}
+        aria-label={capitalizeString(t("toolBar.library"))}
+        aria-keyshortcuts="0"
+      />
+      <div className="library-button">
+        <div>{LibraryIcon}</div>
+        {showLabel && (
+          <div className="library-button__label">{t("toolBar.library")}</div>
+        )}
+      </div>
+    </label>
+  );
+};
--- a/src/components/LibraryMenu.scss
+++ b/src/components/LibraryMenu.scss
@@ -1,9 +1,9 @@
@import "open-color/open-color";

 .excalidraw {
-  .library-menu-items-container {
-    height: 100%;
-    width: 100%;
+  .layer-ui__library-sidebar {
+    display: flex;
+    flex-direction: column;
  }

  .layer-ui__library {
@@ -11,6 +11,28 @@
    flex-direction: column;

    flex: 1 1 auto;
+
+    .layer-ui__library-header {
+      display: flex;
+      align-items: center;
+      width: 100%;
+      margin: 2px 0 15px 0;
+      .Spinner {
+        margin-right: 1rem;
+      }
+
+      button {
+        // 2px from the left to account for focus border of left-most button
+        margin: 0 2px;
+      }
+    }
+  }
+
+  .layer-ui__sidebar {
+    .library-menu-items-container {
+      height: 100%;
+      width: 100%;
+    }
  }

  .library-actions-counter {
@@ -65,17 +87,10 @@
    }
  }

-  .library-menu-control-buttons {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    gap: 0.625rem;
-  }
-
  .library-menu-browse-button {
-    flex: 1;
+    margin: 1rem auto;

-    height: var(--lg-button-size);
+    padding: 0.875rem 1rem;

    display: flex;
    align-items: center;
@@ -107,19 +122,30 @@
    }
  }

-  &.excalidraw--mobile .library-menu-browse-button {
-    height: var(--default-button-size);
+  .library-menu-browse-button--mobile {
+    min-height: 22px;
+    margin-left: auto;
+    a {
+      padding-right: 0;
+    }
  }

-  .layer-ui__library .dropdown-menu {
-    width: auto;
-    top: initial;
-    right: 0;
-    left: initial;
-    bottom: 100%;
-    margin-bottom: 0.625rem;
-
+  .layer-ui__sidebar__header .dropdown-menu {
+    &.dropdown-menu--mobile {
+      top: 100%;
+    }
    .dropdown-menu-container {
+      --gap: 0;
+      z-index: 1;
+      position: absolute;
+      top: 100%;
+      left: 0;
+
+      :root[dir="rtl"] & {
+        right: 0;
+        left: auto;
+      }
+
      width: 196px;
      box-shadow: var(--library-dropdown-shadow);
      border-radius: var(--border-radius-lg);
--- a/src/components/LibraryMenu.tsx
+++ b/src/components/LibraryMenu.tsx
@@ -1,39 +1,77 @@
-import React, { useState, useCallback } from "react";
+import {
+  useRef,
+  useState,
+  useEffect,
+  useCallback,
+  RefObject,
+  forwardRef,
+} from "react";
 import Library, {
  distributeLibraryItemsOnSquareGrid,
  libraryItemsAtom,
 } from "../data/library";
 import { t } from "../i18n";
 import { randomId } from "../random";
-import {
-  LibraryItems,
-  LibraryItem,
-  ExcalidrawProps,
-  UIAppState,
-} from "../types";
+import { LibraryItems, LibraryItem, AppState, ExcalidrawProps } from "../types";
+
+import "./LibraryMenu.scss";
 import LibraryMenuItems from "./LibraryMenuItems";
+import { EVENT } from "../constants";
+import { KEYS } from "../keys";
 import { trackEvent } from "../analytics";
-import { atom, useAtom } from "jotai";
+import { useAtom } from "jotai";
 import { jotaiScope } from "../jotai";
 import Spinner from "./Spinner";
 import {
-  useApp,
-  useAppProps,
+  useDevice,
  useExcalidrawElements,
  useExcalidrawSetAppState,
 } from "./App";
+import { Sidebar } from "./Sidebar/Sidebar";
 import { getSelectedElements } from "../scene";
-import { useUIAppState } from "../context/ui-appState";
+import { NonDeletedExcalidrawElement } from "../element/types";
+import { LibraryMenuHeader } from "./LibraryMenuHeaderContent";
+import LibraryMenuBrowseButton from "./LibraryMenuBrowseButton";

-import "./LibraryMenu.scss";
-import { LibraryMenuControlButtons } from "./LibraryMenuControlButtons";
+const useOnClickOutside = (
+  ref: RefObject<HTMLElement>,
+  cb: (event: MouseEvent) => void,
+) => {
+  useEffect(() => {
+    const listener = (event: MouseEvent) => {
+      if (!ref.current) {
+        return;
+      }

-export const isLibraryMenuOpenAtom = atom(false);
+      if (
+        event.target instanceof Element &&
+        (ref.current.contains(event.target) ||
+          !document.body.contains(event.target))
+      ) {
+        return;
+      }

-const LibraryMenuWrapper = ({ children }: { children: React.ReactNode }) => {
-  return <div className="layer-ui__library">{children}</div>;
+      cb(event);
+    };
+    document.addEventListener("pointerdown", listener, false);
+
+    return () => {
+      document.removeEventListener("pointerdown", listener);
+    };
+  }, [ref, cb]);
 };

+const LibraryMenuWrapper = forwardRef<
+  HTMLDivElement,
+  { children: React.ReactNode }
+>(({ children }, ref) => {
+  return (
+    <div ref={ref} className="layer-ui__library">
+      {children}
+    </div>
+  );
+});
+
 export const LibraryMenuContent = ({
  onInsertLibraryItems,
  pendingElements,
@@ -49,11 +87,11 @@ export const LibraryMenuContent = ({
  pendingElements: LibraryItem["elements"];
  onInsertLibraryItems: (libraryItems: LibraryItems) => void;
  onAddToLibrary: () => void;
-  setAppState: React.Component<any, UIAppState>["setState"];
+  setAppState: React.Component<any, AppState>["setState"];
  libraryReturnUrl: ExcalidrawProps["libraryReturnUrl"];
  library: Library;
  id: string;
-  appState: UIAppState;
+  appState: AppState;
  selectedItems: LibraryItem["id"][];
  onSelectItems: (id: LibraryItem["id"][]) => void;
 }) => {
@@ -120,31 +158,81 @@ export const LibraryMenuContent = ({
        theme={appState.theme}
      />
      {showBtn && (
-        <LibraryMenuControlButtons
-          style={{ padding: "16px 12px 0 12px" }}
+        <LibraryMenuBrowseButton
          id={id}
          libraryReturnUrl={libraryReturnUrl}
          theme={appState.theme}
-          selectedItems={selectedItems}
-          onSelectItems={onSelectItems}
        />
      )}
    </LibraryMenuWrapper>
  );
 };

-/**
- * This component is meant to be rendered inside <Sidebar.Tab/> inside our
- * <DefaultSidebar/> or host apps Sidebar components.
- */
-export const LibraryMenu = () => {
-  const { library, id, onInsertElements } = useApp();
-  const appProps = useAppProps();
-  const appState = useUIAppState();
+export const LibraryMenu: React.FC<{
+  appState: AppState;
+  onInsertElements: (elements: readonly NonDeletedExcalidrawElement[]) => void;
+  libraryReturnUrl: ExcalidrawProps["libraryReturnUrl"];
+  focusContainer: () => void;
+  library: Library;
+  id: string;
+}> = ({
+  appState,
+  onInsertElements,
+  libraryReturnUrl,
+  focusContainer,
+  library,
+  id,
+}) => {
  const setAppState = useExcalidrawSetAppState();
  const elements = useExcalidrawElements();
+  const device = useDevice();

  const [selectedItems, setSelectedItems] = useState<LibraryItem["id"][]>([]);
+  const [libraryItemsData] = useAtom(libraryItemsAtom, jotaiScope);
+
+  const ref = useRef<HTMLDivElement | null>(null);
+
+  const closeLibrary = useCallback(() => {
+    const isDialogOpen = !!document.querySelector(".Dialog");
+
+    // Prevent closing if any dialog is open
+    if (isDialogOpen) {
+      return;
+    }
+    setAppState({ openSidebar: null });
+  }, [setAppState]);
+
+  useOnClickOutside(
+    ref,
+    useCallback(
+      (event) => {
+        // If click on the library icon, do nothing so that LibraryButton
+        // can toggle library menu
+        if ((event.target as Element).closest(".ToolIcon__library")) {
+          return;
+        }
+        if (!appState.isSidebarDocked || !device.canDeviceFitSidebar) {
+          closeLibrary();
+        }
+      },
+      [closeLibrary, appState.isSidebarDocked, device.canDeviceFitSidebar],
+    ),
+  );
+
+  useEffect(() => {
+    const handleKeyDown = (event: KeyboardEvent) => {
+      if (
+        event.key === KEYS.ESCAPE &&
+        (!appState.isSidebarDocked || !device.canDeviceFitSidebar)
+      ) {
+        closeLibrary();
+      }
+    };
+    document.addEventListener(EVENT.KEYDOWN, handleKeyDown);
+    return () => {
+      document.removeEventListener(EVENT.KEYDOWN, handleKeyDown);
+    };
+  }, [closeLibrary, appState.isSidebarDocked, device.canDeviceFitSidebar]);

  const deselectItems = useCallback(() => {
    setAppState({
@@ -153,20 +241,69 @@ export const LibraryMenu = () => {
    });
  }, [setAppState]);

+  const removeFromLibrary = useCallback(
+    async (libraryItems: LibraryItems) => {
+      const nextItems = libraryItems.filter(
+        (item) => !selectedItems.includes(item.id),
+      );
+      library.setLibrary(nextItems).catch(() => {
+        setAppState({ errorMessage: t("alerts.errorRemovingFromLibrary") });
+      });
+      setSelectedItems([]);
+    },
+    [library, setAppState, selectedItems, setSelectedItems],
+  );
+
+  const resetLibrary = useCallback(() => {
+    library.resetLibrary();
+    focusContainer();
+  }, [library, focusContainer]);
+
  return (
-    <LibraryMenuContent
-      pendingElements={getSelectedElements(elements, appState, true)}
-      onInsertLibraryItems={(libraryItems) => {
-        onInsertElements(distributeLibraryItemsOnSquareGrid(libraryItems));
+    <Sidebar
+      __isInternal
+      // necessary to remount when switching between internal
+      // and custom (host app) sidebar, so that the `props.onClose`
+      // is colled correctly
+      key="library"
+      className="layer-ui__library-sidebar"
+      initialDockedState={appState.isSidebarDocked}
+      onDock={(docked) => {
+        trackEvent(
+          "library",
+          `toggleLibraryDock (${docked ? "dock" : "undock"})`,
+          `sidebar (${device.isMobile ? "mobile" : "desktop"})`,
+        );
      }}
-      onAddToLibrary={deselectItems}
-      setAppState={setAppState}
-      libraryReturnUrl={appProps.libraryReturnUrl}
-      library={library}
-      id={id}
-      appState={appState}
-      selectedItems={selectedItems}
-      onSelectItems={setSelectedItems}
-    />
+      ref={ref}
+    >
+      <Sidebar.Header className="layer-ui__library-header">
+        <LibraryMenuHeader
+          appState={appState}
+          setAppState={setAppState}
+          selectedItems={selectedItems}
+          onSelectItems={setSelectedItems}
+          library={library}
+          onRemoveFromLibrary={() =>
+            removeFromLibrary(libraryItemsData.libraryItems)
+          }
+          resetLibrary={resetLibrary}
+        />
+      </Sidebar.Header>
+      <LibraryMenuContent
+        pendingElements={getSelectedElements(elements, appState, true)}
+        onInsertLibraryItems={(libraryItems) => {
+          onInsertElements(distributeLibraryItemsOnSquareGrid(libraryItems));
+        }}
+        onAddToLibrary={deselectItems}
+        setAppState={setAppState}
+        libraryReturnUrl={libraryReturnUrl}
+        library={library}
+        id={id}
+        appState={appState}
+        selectedItems={selectedItems}
+        onSelectItems={setSelectedItems}
+      />
+    </Sidebar>
  );
 };
--- a/src/components/LibraryMenuBrowseButton.tsx
+++ b/src/components/LibraryMenuBrowseButton.tsx
@@ -1,6 +1,6 @@
 import { VERSIONS } from "../constants";
 import { t } from "../i18n";
-import { ExcalidrawProps, UIAppState } from "../types";
+import { AppState, ExcalidrawProps } from "../types";

 const LibraryMenuBrowseButton = ({
  theme,
@@ -8,7 +8,7 @@ const LibraryMenuBrowseButton = ({
  libraryReturnUrl,
 }: {
  libraryReturnUrl: ExcalidrawProps["libraryReturnUrl"];
-  theme: UIAppState["theme"];
+  theme: AppState["theme"];
  id: string;
 }) => {
  const referrer =
--- a/src/components/LibraryMenuControlButtons.tsx
+++ b/src/components/LibraryMenuControlButtons.tsx
@@ -1,33 +0,0 @@
-import { LibraryItem, ExcalidrawProps, UIAppState } from "../types";
-import LibraryMenuBrowseButton from "./LibraryMenuBrowseButton";
-import { LibraryDropdownMenu } from "./LibraryMenuHeaderContent";
-
-export const LibraryMenuControlButtons = ({
-  selectedItems,
-  onSelectItems,
-  libraryReturnUrl,
-  theme,
-  id,
-  style,
-}: {
-  selectedItems: LibraryItem["id"][];
-  onSelectItems: (id: LibraryItem["id"][]) => void;
-  libraryReturnUrl: ExcalidrawProps["libraryReturnUrl"];
-  theme: UIAppState["theme"];
-  id: string;
-  style: React.CSSProperties;
-}) => {
-  return (
-    <div className="library-menu-control-buttons" style={style}>
-      <LibraryMenuBrowseButton
-        id={id}
-        libraryReturnUrl={libraryReturnUrl}
-        theme={theme}
-      />
-      <LibraryDropdownMenu
-        selectedItems={selectedItems}
-        onSelectItems={onSelectItems}
-      />
-    </div>
-  );
-};
--- a/src/components/LibraryMenuHeaderContent.tsx
+++ b/src/components/LibraryMenuHeaderContent.tsx
@@ -1,11 +1,8 @@
-import { useCallback, useState } from "react";
-import { t } from "../i18n";
-import Trans from "./Trans";
-import { jotaiScope } from "../jotai";
-import { LibraryItem, LibraryItems, UIAppState } from "../types";
-import { useApp, useExcalidrawSetAppState } from "./App";
+import React, { useCallback, useState } from "react";
 import { saveLibraryAsJSON } from "../data/json";
 import Library, { libraryItemsAtom } from "../data/library";
+import { t } from "../i18n";
+import { AppState, LibraryItem, LibraryItems } from "../types";
 import {
  DotsIcon,
  ExportIcon,
@@ -16,27 +13,29 @@ import {
 import { ToolButton } from "./ToolButton";
 import { fileOpen } from "../data/filesystem";
 import { muteFSAbortError } from "../utils";
-import { useAtom } from "jotai";
+import { atom, useAtom } from "jotai";
+import { jotaiScope } from "../jotai";
 import ConfirmDialog from "./ConfirmDialog";
 import PublishLibrary from "./PublishLibrary";
 import { Dialog } from "./Dialog";
+
 import DropdownMenu from "./dropdownMenu/DropdownMenu";
-import { isLibraryMenuOpenAtom } from "./LibraryMenu";
-import { useUIAppState } from "../context/ui-appState";
+
+export const isLibraryMenuOpenAtom = atom(false);

 const getSelectedItems = (
  libraryItems: LibraryItems,
  selectedItems: LibraryItem["id"][],
 ) => libraryItems.filter((item) => selectedItems.includes(item.id));

-export const LibraryDropdownMenuButton: React.FC<{
-  setAppState: React.Component<any, UIAppState>["setState"];
+export const LibraryMenuHeader: React.FC<{
+  setAppState: React.Component<any, AppState>["setState"];
  selectedItems: LibraryItem["id"][];
  library: Library;
  onRemoveFromLibrary: () => void;
  resetLibrary: () => void;
  onSelectItems: (items: LibraryItem["id"][]) => void;
-  appState: UIAppState;
+  appState: AppState;
 }> = ({
  setAppState,
  selectedItems,
@@ -49,9 +48,7 @@ export const LibraryDropdownMenuButton: React.FC<{
  const [libraryItemsData] = useAtom(libraryItemsAtom, jotaiScope);
  const [isLibraryMenuOpen, setIsLibraryMenuOpen] = useAtom(
    isLibraryMenuOpenAtom,
-    jotaiScope,
  );
-
  const renderRemoveLibAlert = useCallback(() => {
    const content = selectedItems.length
      ? t("alerts.removeItemsFromsLibrary", { count: selectedItems.length })
@@ -106,19 +103,16 @@ export const LibraryDropdownMenuButton: React.FC<{
        small={true}
      >
        <p>
-          <Trans
-            i18nKey="publishSuccessDialog.content"
-            authorName={publishLibSuccess!.authorName}
-            link={(el) => (
-              <a
-                href={publishLibSuccess?.url}
-                target="_blank"
-                rel="noopener noreferrer"
-              >
-                {el}
-              </a>
-            )}
-          />
+          {t("publishSuccessDialog.content", {
+            authorName: publishLibSuccess!.authorName,
+          })}{" "}
+          <a
+            href={publishLibSuccess?.url}
+            target="_blank"
+            rel="noopener noreferrer"
+          >
+            {t("publishSuccessDialog.link")}
+          </a>
        </p>
        <ToolButton
          type="button"
@@ -186,6 +180,7 @@ export const LibraryDropdownMenuButton: React.FC<{
    return (
      <DropdownMenu open={isLibraryMenuOpen}>
        <DropdownMenu.Trigger
+          className="Sidebar__dropdown-btn"
          onToggle={() => setIsLibraryMenuOpen(!isLibraryMenuOpen)}
        >
          {DotsIcon}
@@ -234,7 +229,6 @@ export const LibraryDropdownMenuButton: React.FC<{
      </DropdownMenu>
    );
  };
-
  return (
    <div style={{ position: "relative" }}>
      {renderLibraryMenu()}
@@ -266,48 +260,3 @@ export const LibraryDropdownMenuButton: React.FC<{
    </div>
  );
 };
-
-export const LibraryDropdownMenu = ({
-  selectedItems,
-  onSelectItems,
-}: {
-  selectedItems: LibraryItem["id"][];
-  onSelectItems: (id: LibraryItem["id"][]) => void;
-}) => {
-  const { library } = useApp();
-  const appState = useUIAppState();
-  const setAppState = useExcalidrawSetAppState();
-
-  const [libraryItemsData] = useAtom(libraryItemsAtom, jotaiScope);
-
-  const removeFromLibrary = useCallback(
-    async (libraryItems: LibraryItems) => {
-      const nextItems = libraryItems.filter(
-        (item) => !selectedItems.includes(item.id),
-      );
-      library.setLibrary(nextItems).catch(() => {
-        setAppState({ errorMessage: t("alerts.errorRemovingFromLibrary") });
-      });
-      onSelectItems([]);
-    },
-    [library, setAppState, selectedItems, onSelectItems],
-  );
-
-  const resetLibrary = useCallback(() => {
-    library.resetLibrary();
-  }, [library]);
-
-  return (
-    <LibraryDropdownMenuButton
-      appState={appState}
-      setAppState={setAppState}
-      selectedItems={selectedItems}
-      onSelectItems={onSelectItems}
-      library={library}
-      onRemoveFromLibrary={() =>
-        removeFromLibrary(libraryItemsData.libraryItems)
-      }
-      resetLibrary={resetLibrary}
-    />
-  );
-};
--- a/src/components/LibraryMenuItems.scss
+++ b/src/components/LibraryMenuItems.scss
@@ -47,7 +47,7 @@

    &__items {
      row-gap: 0.5rem;
-      padding: var(--container-padding-y) 0;
+      padding: var(--container-padding-y) var(--container-padding-x);
      flex: 1;
      overflow-y: auto;
      overflow-x: hidden;
@@ -61,7 +61,7 @@
      margin-bottom: 0.75rem;

      &--excal {
-        margin-top: 2rem;
+        margin-top: 2.5rem;
      }
    }

--- a/src/components/LibraryMenuItems.tsx
+++ b/src/components/LibraryMenuItems.tsx
@@ -2,21 +2,16 @@ import React, { useState } from "react";
 import { serializeLibraryAsJSON } from "../data/json";
 import { ExcalidrawElement, NonDeleted } from "../element/types";
 import { t } from "../i18n";
-import {
-  ExcalidrawProps,
-  LibraryItem,
-  LibraryItems,
-  UIAppState,
-} from "../types";
+import { AppState, ExcalidrawProps, LibraryItem, LibraryItems } from "../types";
 import { arrayToMap, chunk } from "../utils";
 import { LibraryUnit } from "./LibraryUnit";
 import Stack from "./Stack";
-import { MIME_TYPES } from "../constants";
-import Spinner from "./Spinner";
-import { duplicateElements } from "../element/newElement";
-import { LibraryMenuControlButtons } from "./LibraryMenuControlButtons";

 import "./LibraryMenuItems.scss";
+import { MIME_TYPES } from "../constants";
+import Spinner from "./Spinner";
+import LibraryMenuBrowseButton from "./LibraryMenuBrowseButton";
+import clsx from "clsx";

 const CELLS_PER_ROW = 4;

@@ -40,7 +35,7 @@ const LibraryMenuItems = ({
  selectedItems: LibraryItem["id"][];
  onSelectItems: (id: LibraryItem["id"][]) => void;
  libraryReturnUrl: ExcalidrawProps["libraryReturnUrl"];
-  theme: UIAppState["theme"];
+  theme: AppState["theme"];
  id: string;
 }) => {
  const [lastSelectedItem, setLastSelectedItem] = useState<
@@ -101,14 +96,7 @@ const LibraryMenuItems = ({
    } else {
      targetElements = libraryItems.filter((item) => item.id === id);
    }
-    return targetElements.map((item) => {
-      return {
-        ...item,
-        // duplicate each library item before inserting on canvas to confine
-        // ids and bindings to each library item. See #6465
-        elements: duplicateElements(item.elements, { randomizeSeed: true }),
-      };
-    });
+    return targetElements;
  };

  const createLibraryItemCompo = (params: {
@@ -205,7 +193,11 @@ const LibraryMenuItems = ({
    (item) => item.status === "published",
  );

-  const showBtn = !libraryItems.length && !pendingElements.length;
+  const showBtn =
+    !libraryItems.length &&
+    !unpublishedItems.length &&
+    !publishedItems.length &&
+    !pendingElements.length;

  return (
    <div
@@ -215,7 +207,7 @@ const LibraryMenuItems = ({
        unpublishedItems.length ||
        publishedItems.length
          ? { justifyContent: "flex-start" }
-          : { borderBottom: 0 }
+          : {}
      }
    >
      <Stack.Col
@@ -251,7 +243,11 @@ const LibraryMenuItems = ({
          </div>
          {!pendingElements.length && !unpublishedItems.length ? (
            <div className="library-menu-items__no-items">
-              <div className="library-menu-items__no-items__label">
+              <div
+                className={clsx({
+                  "library-menu-items__no-items__label": showBtn,
+                })}
+              >
                {t("library.noItems")}
              </div>
              <div className="library-menu-items__no-items__hint">
@@ -299,13 +295,10 @@ const LibraryMenuItems = ({
        </>

        {showBtn && (
-          <LibraryMenuControlButtons
-            style={{ padding: "16px 0", width: "100%" }}
+          <LibraryMenuBrowseButton
            id={id}
            libraryReturnUrl={libraryReturnUrl}
            theme={theme}
-            selectedItems={selectedItems}
-            onSelectItems={onSelectItems}
          />
        )}
      </Stack.Col>
--- a/src/components/LibraryUnit.tsx
+++ b/src/components/LibraryUnit.tsx
@@ -2,7 +2,7 @@ import clsx from "clsx";
 import oc from "open-color";
 import { useEffect, useRef, useState } from "react";
 import { useDevice } from "../components/App";
-import { exportToSvg } from "../packages/utils";
+import { exportToSvg } from "../scene/export";
 import { LibraryItem } from "../types";
 import "./LibraryUnit.scss";
 import { CheckboxItem } from "./CheckboxItem";
@@ -36,14 +36,14 @@ export const LibraryUnit = ({
      if (!elements) {
        return;
      }
-      const svg = await exportToSvg({
+      const svg = await exportToSvg(
        elements,
-        appState: {
+        {
          exportBackground: false,
          viewBackgroundColor: oc.white,
        },
-        files: null,
-      });
+        null,
+      );
      svg.querySelector(".style-fonts")?.remove();
      node.innerHTML = svg.outerHTML;
    })();
--- a/src/components/MobileMenu.tsx
+++ b/src/components/MobileMenu.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { AppState, Device, ExcalidrawProps, UIAppState } from "../types";
+import { AppState, Device, ExcalidrawProps } from "../types";
 import { ActionManager } from "../actions/manager";
 import { t } from "../i18n";
 import Stack from "./Stack";
@@ -13,15 +13,16 @@ import { SelectedShapeActions, ShapesSwitcher } from "./Actions";
 import { Section } from "./Section";
 import { SCROLLBAR_WIDTH, SCROLLBAR_MARGIN } from "../scene/scrollbars";
 import { LockButton } from "./LockButton";
+import { LibraryButton } from "./LibraryButton";
 import { PenModeButton } from "./PenModeButton";
 import { Stats } from "./Stats";
 import { actionToggleStats } from "../actions";
 import { HandButton } from "./HandButton";
 import { isHandToolActive } from "../appState";
-import { useTunnels } from "../context/tunnels";
+import { useTunnels } from "./context/tunnels";

 type MobileMenuProps = {
-  appState: UIAppState;
+  appState: AppState;
  actionManager: ActionManager;
  renderJSONExportDialog: () => React.ReactNode;
  renderImageExportDialog: () => React.ReactNode;
@@ -35,7 +36,7 @@ type MobileMenuProps = {
  onImageAction: (data: { insertOnCanvasDirectly: boolean }) => void;
  renderTopRightUI?: (
    isMobile: boolean,
-    appState: UIAppState,
+    appState: AppState,
  ) => JSX.Element | null;
  renderCustomStats?: ExcalidrawProps["renderCustomStats"];
  renderSidebars: () => JSX.Element | null;
@@ -59,15 +60,11 @@ export const MobileMenu = ({
  device,
  renderWelcomeScreen,
 }: MobileMenuProps) => {
-  const {
-    WelcomeScreenCenterTunnel,
-    MainMenuTunnel,
-    DefaultSidebarTriggerTunnel,
-  } = useTunnels();
+  const { welcomeScreenCenterTunnel, mainMenuTunnel } = useTunnels();
  const renderToolbar = () => {
    return (
      <FixedSideContainer side="top" className="App-top-bar">
-        {renderWelcomeScreen && <WelcomeScreenCenterTunnel.Out />}
+        {renderWelcomeScreen && <welcomeScreenCenterTunnel.Out />}
        <Section heading="shapes">
          {(heading: React.ReactNode) => (
            <Stack.Col gap={4} align="center">
@@ -91,7 +88,11 @@ export const MobileMenu = ({
                {renderTopRightUI && renderTopRightUI(true, appState)}
                <div className="mobile-misc-tools-container">
                  {!appState.viewModeEnabled && (
-                    <DefaultSidebarTriggerTunnel.Out />
+                    <LibraryButton
+                      appState={appState}
+                      setAppState={setAppState}
+                      isMobile
+                    />
                  )}
                  <PenModeButton
                    checked={appState.penMode}
@@ -131,14 +132,14 @@ export const MobileMenu = ({
    if (appState.viewModeEnabled) {
      return (
        <div className="App-toolbar-content">
-          <MainMenuTunnel.Out />
+          <mainMenuTunnel.Out />
        </div>
      );
    }

    return (
      <div className="App-toolbar-content">
-        <MainMenuTunnel.Out />
+        <mainMenuTunnel.Out />
        {actionManager.renderAction("toggleEditMenu")}
        {actionManager.renderAction("undo")}
        {actionManager.renderAction("redo")}
@@ -189,13 +190,13 @@ export const MobileMenu = ({
            {renderAppToolbar()}
            {appState.scrolledOutside &&
              !appState.openMenu &&
-              !appState.openSidebar && (
+              appState.openSidebar !== "library" && (
                <button
                  className="scroll-back-to-content"
                  onClick={() => {
-                    setAppState((appState) => ({
+                    setAppState({
                      ...calculateScrollCenter(elements, appState, canvas),
-                    }));
+                    });
                  }}
                >
                  {t("buttons.scrollBackToContent")}
--- a/src/components/PasteChartDialog.tsx
+++ b/src/components/PasteChartDialog.tsx
@@ -5,10 +5,8 @@ import { ChartElements, renderSpreadsheet, Spreadsheet } from "../charts";
 import { ChartType } from "../element/types";
 import { t } from "../i18n";
 import { exportToSvg } from "../scene/export";
-import { UIAppState } from "../types";
-import { useApp } from "./App";
+import { AppState, LibraryItem } from "../types";
 import { Dialog } from "./Dialog";
-
 import "./PasteChartDialog.scss";

 type OnInsertChart = (chartType: ChartType, elements: ChartElements) => void;
@@ -80,12 +78,13 @@ export const PasteChartDialog = ({
  setAppState,
  appState,
  onClose,
+  onInsertChart,
 }: {
-  appState: UIAppState;
+  appState: AppState;
  onClose: () => void;
-  setAppState: React.Component<any, UIAppState>["setState"];
+  setAppState: React.Component<any, AppState>["setState"];
+  onInsertChart: (elements: LibraryItem["elements"]) => void;
 }) => {
-  const { onInsertElements } = useApp();
  const handleClose = React.useCallback(() => {
    if (onClose) {
      onClose();
@@ -93,7 +92,7 @@ export const PasteChartDialog = ({
  }, [onClose]);

  const handleChartClick = (chartType: ChartType, elements: ChartElements) => {
-    onInsertElements(elements);
+    onInsertChart(elements);
    trackEvent("magic", "chart", chartType);
    setAppState({
      currentChartType: chartType,
--- a/src/components/Popover.scss
+++ b/src/components/Popover.scss
@@ -3,6 +3,5 @@
    position: absolute;
    z-index: 10;
    padding: 5px 0 5px;
-    outline: none;
  }
 }
--- a/src/components/Popover.tsx
+++ b/src/components/Popover.tsx
@@ -29,21 +29,13 @@ export const Popover = ({
 }: Props) => {
  const popoverRef = useRef<HTMLDivElement>(null);

-  useEffect(() => {
-    const container = popoverRef.current;
+  const container = popoverRef.current;

+  useEffect(() => {
    if (!container) {
      return;
    }

-    // focus popover only if the caller didn't focus on something else nested
-    // within the popover, which should take precedence. Fixes cases
-    // like color picker listening to keydown events on containers nested
-    // in the popover.
-    if (!container.contains(document.activeElement)) {
-      container.focus();
-    }
-
    const handleKeyDown = (event: KeyboardEvent) => {
      if (event.key === KEYS.TAB) {
        const focusableElements = queryFocusableElements(container);
@@ -52,23 +44,15 @@ export const Popover = ({
          (element) => element === activeElement,
        );

-        if (activeElement === container) {
-          if (event.shiftKey) {
-            focusableElements[focusableElements.length - 1]?.focus();
-          } else {
-            focusableElements[0].focus();
-          }
-          event.preventDefault();
-          event.stopImmediatePropagation();
-        } else if (currentIndex === 0 && event.shiftKey) {
-          focusableElements[focusableElements.length - 1]?.focus();
+        if (currentIndex === 0 && event.shiftKey) {
+          focusableElements[focusableElements.length - 1].focus();
          event.preventDefault();
          event.stopImmediatePropagation();
        } else if (
          currentIndex === focusableElements.length - 1 &&
          !event.shiftKey
        ) {
-          focusableElements[0]?.focus();
+          focusableElements[0].focus();
          event.preventDefault();
          event.stopImmediatePropagation();
        }
@@ -78,59 +62,35 @@ export const Popover = ({
    container.addEventListener("keydown", handleKeyDown);

    return () => container.removeEventListener("keydown", handleKeyDown);
-  }, []);
-
-  const lastInitializedPosRef = useRef<{ top: number; left: number } | null>(
-    null,
-  );
+  }, [container]);

  // ensure the popover doesn't overflow the viewport
  useLayoutEffect(() => {
-    if (fitInViewport && popoverRef.current && top != null && left != null) {
-      const container = popoverRef.current;
-      const { width, height } = container.getBoundingClientRect();
+    if (fitInViewport && popoverRef.current) {
+      const element = popoverRef.current;
+      const { x, y, width, height } = element.getBoundingClientRect();

-      // hack for StrictMode so this effect only runs once for
-      // the same top/left position, otherwise
-      // we'd potentically reposition twice (once for viewport overflow)
-      // and once for top/left position afterwards
-      if (
-        lastInitializedPosRef.current?.top === top &&
-        lastInitializedPosRef.current?.left === left
-      ) {
-        return;
+      //Position correctly when clicked on rightmost part or the bottom part of viewport
+      if (x + width - offsetLeft > viewportWidth) {
+        element.style.left = `${viewportWidth - width - 10}px`;
      }
-      lastInitializedPosRef.current = { top, left };
-
-      if (width >= viewportWidth) {
-        container.style.width = `${viewportWidth}px`;
-        container.style.left = "0px";
-        container.style.overflowX = "scroll";
-      } else if (left + width - offsetLeft > viewportWidth) {
-        container.style.left = `${viewportWidth - width - 10}px`;
-      } else {
-        container.style.left = `${left}px`;
+      if (y + height - offsetTop > viewportHeight) {
+        element.style.top = `${viewportHeight - height}px`;
      }

+      //Resize to fit viewport on smaller screens
      if (height >= viewportHeight) {
-        container.style.height = `${viewportHeight - 20}px`;
-        container.style.top = "10px";
-        container.style.overflowY = "scroll";
-      } else if (top + height - offsetTop > viewportHeight) {
-        container.style.top = `${viewportHeight - height}px`;
-      } else {
-        container.style.top = `${top}px`;
+        element.style.height = `${viewportHeight - 20}px`;
+        element.style.top = "10px";
+        element.style.overflowY = "scroll";
+      }
+      if (width >= viewportWidth) {
+        element.style.width = `${viewportWidth}px`;
+        element.style.left = "0px";
+        element.style.overflowX = "scroll";
      }
    }
-  }, [
-    top,
-    left,
-    fitInViewport,
-    viewportWidth,
-    viewportHeight,
-    offsetLeft,
-    offsetTop,
-  ]);
+  }, [fitInViewport, viewportWidth, viewportHeight, offsetLeft, offsetTop]);

  useEffect(() => {
    if (onCloseRequest) {
@@ -145,7 +105,7 @@ export const Popover = ({
  }, [onCloseRequest]);

  return (
-    <div className="popover" ref={popoverRef} tabIndex={-1}>
+    <div className="popover" style={{ top, left }} ref={popoverRef}>
      {children}
    </div>
  );
--- a/src/components/PublishLibrary.scss
+++ b/src/components/PublishLibrary.scss
@@ -93,80 +93,4 @@
      display: block;
    }
  }
-
-  .single-library-item {
-    position: relative;
-
-    &-status {
-      position: absolute;
-      top: 0.3rem;
-      left: 0.3rem;
-      font-size: 0.7rem;
-      color: $oc-red-7;
-      background: rgba(255, 255, 255, 0.9);
-      padding: 0.1rem 0.2rem;
-      border-radius: 0.2rem;
-    }
-
-    &__svg {
-      background-color: $oc-white;
-      padding: 0.3rem;
-      width: 7.5rem;
-      height: 7.5rem;
-      border: 1px solid var(--button-gray-2);
-      svg {
-        width: 100%;
-        height: 100%;
-      }
-    }
-
-    .ToolIcon__icon {
-      background-color: $oc-white;
-      width: auto;
-      height: auto;
-      margin: 0 0.5rem;
-    }
-    .ToolIcon,
-    .ToolIcon_type_button:hover {
-      background-color: white;
-    }
-    .required,
-    .error {
-      color: $oc-red-8;
-      font-weight: bold;
-      font-size: 1rem;
-      margin: 0.2rem;
-    }
-    .error {
-      font-weight: 500;
-      margin: 0;
-      padding: 0.3em 0;
-    }
-
-    &--remove {
-      position: absolute;
-      top: 0.2rem;
-      right: 1rem;
-
-      .ToolIcon__icon {
-        margin: 0;
-      }
-      .ToolIcon__icon {
-        background-color: $oc-red-6;
-        &:hover {
-          background-color: $oc-red-7;
-        }
-        &:active {
-          background-color: $oc-red-8;
-        }
-      }
-      svg {
-        color: $oc-white;
-        padding: 0.26rem;
-        border-radius: 0.3em;
-        width: 1rem;
-        height: 1rem;
-      }
-    }
-  }
 }
--- a/src/components/PublishLibrary.tsx
+++ b/src/components/PublishLibrary.tsx
@@ -1,12 +1,11 @@
-import { ReactNode, useCallback, useEffect, useRef, useState } from "react";
+import { ReactNode, useCallback, useEffect, useState } from "react";
 import OpenColor from "open-color";

 import { Dialog } from "./Dialog";
 import { t } from "../i18n";
-import Trans from "./Trans";

-import { LibraryItems, LibraryItem, UIAppState } from "../types";
-import { exportToCanvas, exportToSvg } from "../packages/utils";
+import { AppState, LibraryItems, LibraryItem } from "../types";
+import { exportToCanvas } from "../packages/utils";
 import {
  EXPORT_DATA_TYPES,
  EXPORT_SOURCE,
@@ -14,13 +13,12 @@ import {
  VERSIONS,
 } from "../constants";
 import { ExportedLibraryData } from "../data/types";
+
+import "./PublishLibrary.scss";
+import SingleLibraryItem from "./SingleLibraryItem";
 import { canvasToBlob, resizeImageFile } from "../data/blob";
 import { chunk } from "../utils";
 import DialogActionButton from "./DialogActionButton";
-import { CloseIcon } from "./icons";
-import { ToolButton } from "./ToolButton";
-
-import "./PublishLibrary.scss";

 interface PublishLibraryDataParams {
  authorName: string;
@@ -128,99 +126,6 @@ const generatePreviewImage = async (libraryItems: LibraryItems) => {
  );
 };

-const SingleLibraryItem = ({
-  libItem,
-  appState,
-  index,
-  onChange,
-  onRemove,
-}: {
-  libItem: LibraryItem;
-  appState: UIAppState;
-  index: number;
-  onChange: (val: string, index: number) => void;
-  onRemove: (id: string) => void;
-}) => {
-  const svgRef = useRef<HTMLDivElement | null>(null);
-  const inputRef = useRef<HTMLInputElement | null>(null);
-
-  useEffect(() => {
-    const node = svgRef.current;
-    if (!node) {
-      return;
-    }
-    (async () => {
-      const svg = await exportToSvg({
-        elements: libItem.elements,
-        appState: {
-          ...appState,
-          viewBackgroundColor: OpenColor.white,
-          exportBackground: true,
-        },
-        files: null,
-      });
-      node.innerHTML = svg.outerHTML;
-    })();
-  }, [libItem.elements, appState]);
-
-  return (
-    <div className="single-library-item">
-      {libItem.status === "published" && (
-        <span className="single-library-item-status">
-          {t("labels.statusPublished")}
-        </span>
-      )}
-      <div ref={svgRef} className="single-library-item__svg" />
-      <ToolButton
-        aria-label={t("buttons.remove")}
-        type="button"
-        icon={CloseIcon}
-        className="single-library-item--remove"
-        onClick={onRemove.bind(null, libItem.id)}
-        title={t("buttons.remove")}
-      />
-      <div
-        style={{
-          display: "flex",
-          margin: "0.8rem 0",
-          width: "100%",
-          fontSize: "14px",
-          fontWeight: 500,
-          flexDirection: "column",
-        }}
-      >
-        <label
-          style={{
-            display: "flex",
-            justifyContent: "space-between",
-            flexDirection: "column",
-          }}
-        >
-          <div style={{ padding: "0.5em 0" }}>
-            <span style={{ fontWeight: 500, color: OpenColor.gray[6] }}>
-              {t("publishDialog.itemName")}
-            </span>
-            <span aria-hidden="true" className="required">
-              *
-            </span>
-          </div>
-          <input
-            type="text"
-            ref={inputRef}
-            style={{ width: "80%", padding: "0.2rem" }}
-            defaultValue={libItem.name}
-            placeholder="Item name"
-            onChange={(event) => {
-              onChange(event.target.value, index);
-            }}
-          />
-        </label>
-        <span className="error">{libItem.error}</span>
-      </div>
-    </div>
-  );
-};
-
 const PublishLibrary = ({
  onClose,
  libraryItems,
@@ -232,7 +137,7 @@ const PublishLibrary = ({
 }: {
  onClose: () => void;
  libraryItems: LibraryItems;
-  appState: UIAppState;
+  appState: AppState;
  onSuccess: (data: {
    url: string;
    authorName: string;
@@ -403,32 +308,26 @@ const PublishLibrary = ({
      {shouldRenderForm ? (
        <form onSubmit={onSubmit}>
          <div className="publish-library-note">
-            <Trans
-              i18nKey="publishDialog.noteDescription"
-              link={(el) => (
-                <a
-                  href="https://libraries.excalidraw.com"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  {el}
-                </a>
-              )}
-            />
+            {t("publishDialog.noteDescription.pre")}
+            <a
+              href="https://libraries.excalidraw.com"
+              target="_blank"
+              rel="noopener noreferrer"
+            >
+              {t("publishDialog.noteDescription.link")}
+            </a>{" "}
+            {t("publishDialog.noteDescription.post")}
          </div>
          <span className="publish-library-note">
-            <Trans
-              i18nKey="publishDialog.noteGuidelines"
-              link={(el) => (
-                <a
-                  href="https://github.com/excalidraw/excalidraw-libraries#guidelines"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  {el}
-                </a>
-              )}
-            />
+            {t("publishDialog.noteGuidelines.pre")}
+            <a
+              href="https://github.com/excalidraw/excalidraw-libraries#guidelines"
+              target="_blank"
+              rel="noopener noreferrer"
+            >
+              {t("publishDialog.noteGuidelines.link")}
+            </a>
+            {t("publishDialog.noteGuidelines.post")}
          </span>

          <div className="publish-library-note">
@@ -522,18 +421,15 @@ const PublishLibrary = ({
              />
            </label>
            <span className="publish-library-note">
-              <Trans
-                i18nKey="publishDialog.noteLicense"
-                link={(el) => (
-                  <a
-                    href="https://github.com/excalidraw/excalidraw-libraries/blob/main/LICENSE"
-                    target="_blank"
-                    rel="noopener noreferrer"
-                  >
-                    {el}
-                  </a>
-                )}
-              />
+              {t("publishDialog.noteLicense.pre")}
+              <a
+                href="https://github.com/excalidraw/excalidraw-libraries/blob/main/LICENSE"
+                target="_blank"
+                rel="noopener noreferrer"
+              >
+                {t("publishDialog.noteLicense.link")}
+              </a>
+              {t("publishDialog.noteLicense.post")}
            </span>
          </div>
          <div className="publish-library__buttons">
--- a/src/components/Sidebar/Sidebar.scss
+++ b/src/components/Sidebar/Sidebar.scss
@@ -2,26 +2,67 @@
@import "../../css/variables.module";

 .excalidraw {
-  .sidebar {
-    display: flex;
-    flex-direction: column;
+  .Sidebar {
+    &__close-btn,
+    &__pin-btn,
+    &__dropdown-btn {
+      @include outlineButtonStyles;
+      width: var(--lg-button-size);
+      height: var(--lg-button-size);
+      padding: 0;
+
+      svg {
+        width: var(--lg-icon-size);
+        height: var(--lg-icon-size);
+      }
+    }
+
+    &__pin-btn {
+      &--pinned {
+        background-color: var(--color-primary);
+        border-color: var(--color-primary);
+
+        svg {
+          color: #fff;
+        }
+
+        &:hover,
+        &:active {
+          background-color: var(--color-primary-darker);
+        }
+      }
+    }
+  }
+
+  &.theme--dark {
+    .Sidebar {
+      &__pin-btn {
+        &--pinned {
+          svg {
+            color: var(--color-gray-90);
+          }
+        }
+      }
+    }
+  }
+
+  .layer-ui__sidebar {
    position: absolute;
    top: 0;
    bottom: 0;
    right: 0;
    z-index: 5;
    margin: 0;
-    padding: 0;
-    box-sizing: border-box;
-
-    background-color: var(--sidebar-bg-color);
-    box-shadow: var(--sidebar-shadow);

    :root[dir="rtl"] & {
      left: 0;
      right: auto;
    }

+    background-color: var(--sidebar-bg-color);
+
+    box-shadow: var(--sidebar-shadow);
+
    &--docked {
      box-shadow: none;
    }
@@ -36,134 +77,52 @@
      border-right: 1px solid var(--sidebar-border-color);
      border-left: 0;
    }
+
+    padding: 0;
+    box-sizing: border-box;
+
+    .Island {
+      box-shadow: none;
+    }
+
+    .ToolIcon__icon {
+      border-radius: var(--border-radius-md);
+    }
+
+    .ToolIcon__icon__close {
+      .Modal__close {
+        width: calc(var(--space-factor) * 7);
+        height: calc(var(--space-factor) * 7);
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        color: var(--color-text);
+      }
+    }
+
+    .Island {
+      --padding: 0;
+      background-color: var(--island-bg-color);
+      border-radius: var(--border-radius-lg);
+      padding: calc(var(--padding) * var(--space-factor));
+      position: relative;
+      transition: box-shadow 0.5s ease-in-out;
+    }
  }

-  // ---------------------------- sidebar header ------------------------------
-
-  .sidebar__header {
+  .layer-ui__sidebar__header {
    box-sizing: border-box;
    display: flex;
    justify-content: space-between;
    align-items: center;
    width: 100%;
-    padding-top: 1rem;
-    padding-bottom: 1rem;
+    padding: 1rem;
+    border-bottom: 1px solid var(--sidebar-border-color);
  }

-  .sidebar__header__buttons {
-    gap: 0;
+  .layer-ui__sidebar__header__buttons {
    display: flex;
    align-items: center;
-    margin-left: auto;
-
-    button {
-      @include outlineButtonStyles;
-      --button-bg: transparent;
-      border: 0 !important;
-
-      width: var(--lg-button-size);
-      height: var(--lg-button-size);
-      padding: 0;
-
-      svg {
-        width: var(--lg-icon-size);
-        height: var(--lg-icon-size);
-      }
-
-      &:hover {
-        background: var(--button-hover-bg, var(--island-bg-color));
-      }
-    }
-
-    .sidebar__dock.selected {
-      svg {
-        stroke: var(--color-primary);
-        fill: var(--color-primary);
-      }
-    }
-  }
-
-  // ---------------------------- sidebar tabs ------------------------------
-
-  .sidebar-tabs-root {
-    display: flex;
-    flex-direction: column;
-    flex: 1 1 auto;
-    padding: 1rem 0.75rem;
-
-    [role="tabpanel"] {
-      flex: 1;
-      outline: none;
-
-      flex: 1 1 auto;
-      display: flex;
-      flex-direction: column;
-      outline: none;
-    }
-
-    [role="tabpanel"][data-state="inactive"] {
-      display: none !important;
-    }
-
-    [role="tablist"] {
-      display: grid;
-      gap: 1rem;
-      grid-template-columns: repeat(auto-fit, minmax(0, 1fr));
-    }
-  }
-
-  .sidebar-tabs-root > .sidebar__header {
-    padding-top: 0;
-    padding-bottom: 1rem;
-  }
-
-  .sidebar-tab-trigger {
-    --button-width: auto;
-    --button-bg: transparent;
-    --button-hover-bg: transparent;
-    --button-active-bg: var(--color-primary);
-    --button-hover-color: var(--color-primary);
-    --button-hover-border: var(--color-primary);
-
-    &[data-state="active"] {
-      --button-bg: var(--color-primary);
-      --button-hover-bg: var(--color-primary-darker);
-      --button-hover-color: var(--color-icon-white);
-      --button-border: var(--color-primary);
-      color: var(--color-icon-white);
-    }
-  }
-
-  // ---------------------------- default sidebar ------------------------------
-
-  .default-sidebar {
-    display: flex;
-    flex-direction: column;
-
-    .sidebar-triggers {
-      $padding: 2px;
-      $border: 1px;
-      display: flex;
-      gap: 0;
-      padding: $padding;
-      // offset by padding + border to vertically center the list with sibling
-      // buttons (both from top and bototm, due to flex layout)
-      margin-top: -#{$padding + $border};
-      margin-bottom: -#{$padding + $border};
-      border: $border solid var(--sidebar-border-color);
-      background: var(--default-bg-color);
-      border-radius: 0.625rem;
-
-      .sidebar-tab-trigger {
-        height: var(--lg-button-size);
-        width: var(--lg-button-size);
-
-        border: none;
-      }
-    }
-
-    .sidebar__header {
-      border-bottom: 1px solid var(--sidebar-border-color);
-    }
+    gap: 0.625rem;
  }
 }
--- a/src/components/Sidebar/Sidebar.test.tsx
+++ b/src/components/Sidebar/Sidebar.test.tsx
@@ -1,9 +1,8 @@
 import React from "react";
-import { DEFAULT_SIDEBAR } from "../../constants";
 import { Excalidraw, Sidebar } from "../../packages/excalidraw/index";
 import {
+  act,
  fireEvent,
-  GlobalTestState,
  queryAllByTestId,
  queryByTestId,
  render,
@@ -11,321 +10,346 @@ import {
  withExcalidrawDimensions,
 } from "../../tests/test-utils";

-export const assertSidebarDockButton = async <T extends boolean>(
-  hasDockButton: T,
-): Promise<
-  T extends false
-    ? { dockButton: null; sidebar: HTMLElement }
-    : { dockButton: HTMLElement; sidebar: HTMLElement }
-> => {
-  const sidebar =
-    GlobalTestState.renderResult.container.querySelector<HTMLElement>(
-      ".sidebar",
-    );
-  expect(sidebar).not.toBe(null);
-  const dockButton = queryByTestId(sidebar!, "sidebar-dock");
-  if (hasDockButton) {
-    expect(dockButton).not.toBe(null);
-    return { dockButton: dockButton!, sidebar: sidebar! } as any;
-  }
-  expect(dockButton).toBe(null);
-  return { dockButton: null, sidebar: sidebar! } as any;
-};
-
-export const assertExcalidrawWithSidebar = async (
-  sidebar: React.ReactNode,
-  name: string,
-  test: () => void,
-) => {
-  await render(
-    <Excalidraw initialData={{ appState: { openSidebar: { name } } }}>
-      {sidebar}
-    </Excalidraw>,
-  );
-  await withExcalidrawDimensions({ width: 1920, height: 1080 }, test);
-};
-
 describe("Sidebar", () => {
-  describe("General behavior", () => {
-    it("should render custom sidebar", async () => {
-      const { container } = await render(
-        <Excalidraw
-          initialData={{ appState: { openSidebar: { name: "customSidebar" } } }}
-        >
-          <Sidebar name="customSidebar">
+  it("should render custom sidebar", async () => {
+    const { container } = await render(
+      <Excalidraw
+        initialData={{ appState: { openSidebar: "customSidebar" } }}
+        renderSidebar={() => (
+          <Sidebar>
            <div id="test-sidebar-content">42</div>
          </Sidebar>
-        </Excalidraw>,
-      );
+        )}
+      />,
+    );

-      const node = container.querySelector("#test-sidebar-content");
-      expect(node).not.toBe(null);
-    });
-
-    it("should render only one sidebar and prefer the custom one", async () => {
-      const { container } = await render(
-        <Excalidraw
-          initialData={{ appState: { openSidebar: { name: "customSidebar" } } }}
-        >
-          <Sidebar name="customSidebar">
-            <div id="test-sidebar-content">42</div>
-          </Sidebar>
-        </Excalidraw>,
-      );
-
-      await waitFor(() => {
-        // make sure the custom sidebar is rendered
-        const node = container.querySelector("#test-sidebar-content");
-        expect(node).not.toBe(null);
-
-        // make sure only one sidebar is rendered
-        const sidebars = container.querySelectorAll(".sidebar");
-        expect(sidebars.length).toBe(1);
-      });
-    });
-
-    it("should toggle sidebar using props.toggleMenu()", async () => {
-      const { container } = await render(
-        <Excalidraw>
-          <Sidebar name="customSidebar">
-            <div id="test-sidebar-content">42</div>
-          </Sidebar>
-        </Excalidraw>,
-      );
-
-      // sidebar isn't rendered initially
-      // -------------------------------------------------------------------------
-      await waitFor(() => {
-        const node = container.querySelector("#test-sidebar-content");
-        expect(node).toBe(null);
-      });
-
-      // toggle sidebar on
-      // -------------------------------------------------------------------------
-      expect(window.h.app.toggleSidebar({ name: "customSidebar" })).toBe(true);
-
-      await waitFor(() => {
-        const node = container.querySelector("#test-sidebar-content");
-        expect(node).not.toBe(null);
-      });
-
-      // toggle sidebar off
-      // -------------------------------------------------------------------------
-      expect(window.h.app.toggleSidebar({ name: "customSidebar" })).toBe(false);
-
-      await waitFor(() => {
-        const node = container.querySelector("#test-sidebar-content");
-        expect(node).toBe(null);
-      });
-
-      // force-toggle sidebar off (=> still hidden)
-      // -------------------------------------------------------------------------
-      expect(
-        window.h.app.toggleSidebar({ name: "customSidebar", force: false }),
-      ).toBe(false);
-
-      await waitFor(() => {
-        const node = container.querySelector("#test-sidebar-content");
-        expect(node).toBe(null);
-      });
-
-      // force-toggle sidebar on
-      // -------------------------------------------------------------------------
-      expect(
-        window.h.app.toggleSidebar({ name: "customSidebar", force: true }),
-      ).toBe(true);
-      expect(
-        window.h.app.toggleSidebar({ name: "customSidebar", force: true }),
-      ).toBe(true);
-
-      await waitFor(() => {
-        const node = container.querySelector("#test-sidebar-content");
-        expect(node).not.toBe(null);
-      });
-
-      // toggle library (= hide custom sidebar)
-      // -------------------------------------------------------------------------
-      expect(window.h.app.toggleSidebar({ name: DEFAULT_SIDEBAR.name })).toBe(
-        true,
-      );
-
-      await waitFor(() => {
-        const node = container.querySelector("#test-sidebar-content");
-        expect(node).toBe(null);
-
-        // make sure only one sidebar is rendered
-        const sidebars = container.querySelectorAll(".sidebar");
-        expect(sidebars.length).toBe(1);
-      });
-    });
+    const node = container.querySelector("#test-sidebar-content");
+    expect(node).not.toBe(null);
  });

-  describe("<Sidebar.Header/>", () => {
-    it("should render custom sidebar header", async () => {
-      const { container } = await render(
-        <Excalidraw
-          initialData={{ appState: { openSidebar: { name: "customSidebar" } } }}
-        >
-          <Sidebar name="customSidebar">
+  it("should render custom sidebar header", async () => {
+    const { container } = await render(
+      <Excalidraw
+        initialData={{ appState: { openSidebar: "customSidebar" } }}
+        renderSidebar={() => (
+          <Sidebar>
            <Sidebar.Header>
              <div id="test-sidebar-header-content">42</div>
            </Sidebar.Header>
          </Sidebar>
-        </Excalidraw>,
-      );
+        )}
+      />,
+    );

-      const node = container.querySelector("#test-sidebar-header-content");
+    const node = container.querySelector("#test-sidebar-header-content");
+    expect(node).not.toBe(null);
+    // make sure we don't render the default fallback header,
+    // just the custom one
+    expect(queryAllByTestId(container, "sidebar-header").length).toBe(1);
+  });
+
+  it("should render only one sidebar and prefer the custom one", async () => {
+    const { container } = await render(
+      <Excalidraw
+        initialData={{ appState: { openSidebar: "customSidebar" } }}
+        renderSidebar={() => (
+          <Sidebar>
+            <div id="test-sidebar-content">42</div>
+          </Sidebar>
+        )}
+      />,
+    );
+
+    await waitFor(() => {
+      // make sure the custom sidebar is rendered
+      const node = container.querySelector("#test-sidebar-content");
      expect(node).not.toBe(null);
-      // make sure we don't render the default fallback header,
-      // just the custom one
-      expect(queryAllByTestId(container, "sidebar-header").length).toBe(1);
-    });

-    it("should not render <Sidebar.Header> for custom sidebars by default", async () => {
-      const CustomExcalidraw = () => {
-        return (
-          <Excalidraw
-            initialData={{
-              appState: { openSidebar: { name: "customSidebar" } },
-            }}
-          >
-            <Sidebar name="customSidebar" className="test-sidebar">
+      // make sure only one sidebar is rendered
+      const sidebars = container.querySelectorAll(".layer-ui__sidebar");
+      expect(sidebars.length).toBe(1);
+    });
+  });
+
+  it("should always render custom sidebar with close button & close on click", async () => {
+    const onClose = jest.fn();
+    const CustomExcalidraw = () => {
+      return (
+        <Excalidraw
+          initialData={{ appState: { openSidebar: "customSidebar" } }}
+          renderSidebar={() => (
+            <Sidebar className="test-sidebar" onClose={onClose}>
              hello
            </Sidebar>
-          </Excalidraw>
-        );
-      };
+          )}
+        />
+      );
+    };

-      const { container } = await render(<CustomExcalidraw />);
+    const { container } = await render(<CustomExcalidraw />);

+    const sidebar = container.querySelector<HTMLElement>(".test-sidebar");
+    expect(sidebar).not.toBe(null);
+    const closeButton = queryByTestId(sidebar!, "sidebar-close")!;
+    expect(closeButton).not.toBe(null);
+
+    fireEvent.click(closeButton);
+    await waitFor(() => {
+      expect(container.querySelector<HTMLElement>(".test-sidebar")).toBe(null);
+      expect(onClose).toHaveBeenCalled();
+    });
+  });
+
+  it("should render custom sidebar with dock (irrespective of onDock prop)", async () => {
+    const CustomExcalidraw = () => {
+      return (
+        <Excalidraw
+          initialData={{ appState: { openSidebar: "customSidebar" } }}
+          renderSidebar={() => (
+            <Sidebar className="test-sidebar">hello</Sidebar>
+          )}
+        />
+      );
+    };
+
+    const { container } = await render(<CustomExcalidraw />);
+
+    // should show dock button when the sidebar fits to be docked
+    // -------------------------------------------------------------------------
+
+    await withExcalidrawDimensions({ width: 1920, height: 1080 }, () => {
      const sidebar = container.querySelector<HTMLElement>(".test-sidebar");
      expect(sidebar).not.toBe(null);
-      const closeButton = queryByTestId(sidebar!, "sidebar-close");
-      expect(closeButton).toBe(null);
+      const closeButton = queryByTestId(sidebar!, "sidebar-dock");
+      expect(closeButton).not.toBe(null);
    });

-    it("<Sidebar.Header> should render close button", async () => {
-      const onStateChange = jest.fn();
-      const CustomExcalidraw = () => {
-        return (
-          <Excalidraw
-            initialData={{
-              appState: { openSidebar: { name: "customSidebar" } },
-            }}
-          >
-            <Sidebar
-              name="customSidebar"
-              className="test-sidebar"
-              onStateChange={onStateChange}
-            >
-              <Sidebar.Header />
-            </Sidebar>
-          </Excalidraw>
-        );
-      };
-
-      const { container } = await render(<CustomExcalidraw />);
-
-      // initial open
-      expect(onStateChange).toHaveBeenCalledWith({ name: "customSidebar" });
+    // should not show dock button when the sidebar does not fit to be docked
+    // -------------------------------------------------------------------------

+    await withExcalidrawDimensions({ width: 400, height: 1080 }, () => {
      const sidebar = container.querySelector<HTMLElement>(".test-sidebar");
      expect(sidebar).not.toBe(null);
-      const closeButton = queryByTestId(sidebar!, "sidebar-close")!;
-      expect(closeButton).not.toBe(null);
+      const closeButton = queryByTestId(sidebar!, "sidebar-dock");
+      expect(closeButton).toBe(null);
+    });
+  });
+
+  it("should support controlled docking", async () => {
+    let _setDockable: (dockable: boolean) => void = null!;
+
+    const CustomExcalidraw = () => {
+      const [dockable, setDockable] = React.useState(false);
+      _setDockable = setDockable;
+      return (
+        <Excalidraw
+          initialData={{ appState: { openSidebar: "customSidebar" } }}
+          renderSidebar={() => (
+            <Sidebar
+              className="test-sidebar"
+              docked={false}
+              dockable={dockable}
+            >
+              hello
+            </Sidebar>
+          )}
+        />
+      );
+    };
+
+    const { container } = await render(<CustomExcalidraw />);
+
+    await withExcalidrawDimensions({ width: 1920, height: 1080 }, async () => {
+      // should not show dock button when `dockable` is `false`
+      // -------------------------------------------------------------------------
+
+      act(() => {
+        _setDockable(false);
+      });

-      fireEvent.click(closeButton);
      await waitFor(() => {
-        expect(container.querySelector<HTMLElement>(".test-sidebar")).toBe(
-          null,
-        );
-        expect(onStateChange).toHaveBeenCalledWith(null);
+        const sidebar = container.querySelector<HTMLElement>(".test-sidebar");
+        expect(sidebar).not.toBe(null);
+        const closeButton = queryByTestId(sidebar!, "sidebar-dock");
+        expect(closeButton).toBe(null);
+      });
+
+      // should show dock button when `dockable` is `true`, even if `docked`
+      // prop is set
+      // -------------------------------------------------------------------------
+
+      act(() => {
+        _setDockable(true);
+      });
+
+      await waitFor(() => {
+        const sidebar = container.querySelector<HTMLElement>(".test-sidebar");
+        expect(sidebar).not.toBe(null);
+        const closeButton = queryByTestId(sidebar!, "sidebar-dock");
+        expect(closeButton).not.toBe(null);
      });
    });
  });

-  describe("Docking behavior", () => {
-    it("shouldn't be user-dockable if `onDock` not supplied", async () => {
-      await assertExcalidrawWithSidebar(
-        <Sidebar name="customSidebar">
-          <Sidebar.Header />
-        </Sidebar>,
-        "customSidebar",
-        async () => {
-          await assertSidebarDockButton(false);
-        },
-      );
-    });
+  it("should support controlled docking", async () => {
+    let _setDocked: (docked?: boolean) => void = null!;

-    it("shouldn't be user-dockable if `onDock` not supplied & `docked={true}`", async () => {
-      await assertExcalidrawWithSidebar(
-        <Sidebar name="customSidebar" docked={true}>
-          <Sidebar.Header />
-        </Sidebar>,
-        "customSidebar",
-        async () => {
-          await assertSidebarDockButton(false);
-        },
-      );
-    });
-
-    it("shouldn't be user-dockable if `onDock` not supplied & docked={false}`", async () => {
-      await assertExcalidrawWithSidebar(
-        <Sidebar name="customSidebar" docked={false}>
-          <Sidebar.Header />
-        </Sidebar>,
-        "customSidebar",
-        async () => {
-          await assertSidebarDockButton(false);
-        },
-      );
-    });
-
-    it("should be user-dockable when both `onDock` and `docked` supplied", async () => {
-      await render(
+    const CustomExcalidraw = () => {
+      const [docked, setDocked] = React.useState<boolean | undefined>();
+      _setDocked = setDocked;
+      return (
        <Excalidraw
-          initialData={{ appState: { openSidebar: { name: "customSidebar" } } }}
-        >
-          <Sidebar
-            name="customSidebar"
-            className="test-sidebar"
-            onDock={() => {}}
-            docked
-          >
-            <Sidebar.Header />
-          </Sidebar>
-        </Excalidraw>,
+          initialData={{ appState: { openSidebar: "customSidebar" } }}
+          renderSidebar={() => (
+            <Sidebar className="test-sidebar" docked={docked}>
+              hello
+            </Sidebar>
+          )}
+        />
      );
+    };

-      await withExcalidrawDimensions(
-        { width: 1920, height: 1080 },
-        async () => {
-          await assertSidebarDockButton(true);
-        },
-      );
+    const { container } = await render(<CustomExcalidraw />);
+
+    const { h } = window;
+
+    await withExcalidrawDimensions({ width: 1920, height: 1080 }, async () => {
+      const dockButton = await waitFor(() => {
+        const sidebar = container.querySelector<HTMLElement>(".test-sidebar");
+        expect(sidebar).not.toBe(null);
+        const dockBotton = queryByTestId(sidebar!, "sidebar-dock");
+        expect(dockBotton).not.toBe(null);
+        return dockBotton!;
+      });
+
+      const dockButtonInput = dockButton.querySelector("input")!;
+
+      // should not show dock button when `dockable` is `false`
+      // -------------------------------------------------------------------------
+
+      expect(h.state.isSidebarDocked).toBe(false);
+
+      fireEvent.click(dockButtonInput);
+      await waitFor(() => {
+        expect(h.state.isSidebarDocked).toBe(true);
+        expect(dockButtonInput).toBeChecked();
+      });
+
+      fireEvent.click(dockButtonInput);
+      await waitFor(() => {
+        expect(h.state.isSidebarDocked).toBe(false);
+        expect(dockButtonInput).not.toBeChecked();
+      });
+
+      // shouldn't update `appState.isSidebarDocked` when the sidebar
+      // is controlled (`docked` prop is set), as host apps should handle
+      // the state themselves
+      // -------------------------------------------------------------------------
+
+      act(() => {
+        _setDocked(true);
+      });
+
+      await waitFor(() => {
+        expect(dockButtonInput).toBeChecked();
+        expect(h.state.isSidebarDocked).toBe(false);
+        expect(dockButtonInput).toBeChecked();
+      });
+
+      fireEvent.click(dockButtonInput);
+      await waitFor(() => {
+        expect(h.state.isSidebarDocked).toBe(false);
+        expect(dockButtonInput).toBeChecked();
+      });
+
+      // the `appState.isSidebarDocked` should remain untouched when
+      // `props.docked` is set to `false`, and user toggles
+      // -------------------------------------------------------------------------
+
+      act(() => {
+        _setDocked(false);
+        h.setState({ isSidebarDocked: true });
+      });
+
+      await waitFor(() => {
+        expect(h.state.isSidebarDocked).toBe(true);
+        expect(dockButtonInput).not.toBeChecked();
+      });
+
+      fireEvent.click(dockButtonInput);
+      await waitFor(() => {
+        expect(dockButtonInput).not.toBeChecked();
+        expect(h.state.isSidebarDocked).toBe(true);
+      });
+    });
+  });
+
+  it("should toggle sidebar using props.toggleMenu()", async () => {
+    const { container } = await render(
+      <Excalidraw
+        renderSidebar={() => (
+          <Sidebar>
+            <div id="test-sidebar-content">42</div>
+          </Sidebar>
+        )}
+      />,
+    );
+
+    // sidebar isn't rendered initially
+    // -------------------------------------------------------------------------
+    await waitFor(() => {
+      const node = container.querySelector("#test-sidebar-content");
+      expect(node).toBe(null);
    });

-    it("shouldn't be user-dockable when only `onDock` supplied w/o `docked`", async () => {
-      await render(
-        <Excalidraw
-          initialData={{ appState: { openSidebar: { name: "customSidebar" } } }}
-        >
-          <Sidebar
-            name="customSidebar"
-            className="test-sidebar"
-            onDock={() => {}}
-          >
-            <Sidebar.Header />
-          </Sidebar>
-        </Excalidraw>,
-      );
+    // toggle sidebar on
+    // -------------------------------------------------------------------------
+    expect(window.h.app.toggleMenu("customSidebar")).toBe(true);

-      await withExcalidrawDimensions(
-        { width: 1920, height: 1080 },
-        async () => {
-          await assertSidebarDockButton(false);
-        },
-      );
+    await waitFor(() => {
+      const node = container.querySelector("#test-sidebar-content");
+      expect(node).not.toBe(null);
+    });
+
+    // toggle sidebar off
+    // -------------------------------------------------------------------------
+    expect(window.h.app.toggleMenu("customSidebar")).toBe(false);
+
+    await waitFor(() => {
+      const node = container.querySelector("#test-sidebar-content");
+      expect(node).toBe(null);
+    });
+
+    // force-toggle sidebar off (=> still hidden)
+    // -------------------------------------------------------------------------
+    expect(window.h.app.toggleMenu("customSidebar", false)).toBe(false);
+
+    await waitFor(() => {
+      const node = container.querySelector("#test-sidebar-content");
+      expect(node).toBe(null);
+    });
+
+    // force-toggle sidebar on
+    // -------------------------------------------------------------------------
+    expect(window.h.app.toggleMenu("customSidebar", true)).toBe(true);
+    expect(window.h.app.toggleMenu("customSidebar", true)).toBe(true);
+
+    await waitFor(() => {
+      const node = container.querySelector("#test-sidebar-content");
+      expect(node).not.toBe(null);
+    });
+
+    // toggle library (= hide custom sidebar)
+    // -------------------------------------------------------------------------
+    expect(window.h.app.toggleMenu("library")).toBe(true);
+
+    await waitFor(() => {
+      const node = container.querySelector("#test-sidebar-content");
+      expect(node).toBe(null);
+
+      // make sure only one sidebar is rendered
+      const sidebars = container.querySelectorAll(".layer-ui__sidebar");
+      expect(sidebars.length).toBe(1);
    });
  });
 });
--- a/src/components/Sidebar/Sidebar.tsx
+++ b/src/components/Sidebar/Sidebar.tsx
@@ -1,246 +1,151 @@
-import React, {
+import {
  useEffect,
  useLayoutEffect,
  useRef,
  useState,
  forwardRef,
-  useImperativeHandle,
-  useCallback,
-  RefObject,
 } from "react";
 import { Island } from ".././Island";
-import { atom, useSetAtom } from "jotai";
+import { atom, useAtom } from "jotai";
 import { jotaiScope } from "../../jotai";
 import {
  SidebarPropsContext,
  SidebarProps,
  SidebarPropsContextValue,
 } from "./common";
-import { SidebarHeader } from "./SidebarHeader";
-import clsx from "clsx";
-import { useDevice, useExcalidrawSetAppState } from "../App";
-import { updateObject } from "../../utils";
-import { KEYS } from "../../keys";
-import { EVENT } from "../../constants";
-import { SidebarTrigger } from "./SidebarTrigger";
-import { SidebarTabTriggers } from "./SidebarTabTriggers";
-import { SidebarTabTrigger } from "./SidebarTabTrigger";
-import { SidebarTabs } from "./SidebarTabs";
-import { SidebarTab } from "./SidebarTab";
+
+import { SidebarHeaderComponents } from "./SidebarHeader";

 import "./Sidebar.scss";
-import { useUIAppState } from "../../context/ui-appState";
+import clsx from "clsx";
+import { useExcalidrawSetAppState } from "../App";
+import { updateObject } from "../../utils";

-// FIXME replace this with the implem from ColorPicker once it's merged
-const useOnClickOutside = (
-  ref: RefObject<HTMLElement>,
-  cb: (event: MouseEvent) => void,
-) => {
-  useEffect(() => {
-    const listener = (event: MouseEvent) => {
-      if (!ref.current) {
-        return;
-      }
-
-      if (
-        event.target instanceof Element &&
-        (ref.current.contains(event.target) ||
-          !document.body.contains(event.target))
-      ) {
-        return;
-      }
-
-      cb(event);
-    };
-    document.addEventListener("pointerdown", listener, false);
-
-    return () => {
-      document.removeEventListener("pointerdown", listener);
-    };
-  }, [ref, cb]);
-};
-
-/**
- * Flags whether the currently rendered Sidebar is docked or not, for use
- * in upstream components that need to act on this (e.g. LayerUI to shift the
- * UI). We use an atom because of potential host app sidebars (for the default
- * sidebar we could just read from appState.defaultSidebarDockedPreference).
- *
- * Since we can only render one Sidebar at a time, we can use a simple flag.
- */
-export const isSidebarDockedAtom = atom(false);
-
-export const SidebarInner = forwardRef(
-  (
-    {
-      name,
-      children,
-      onDock,
-      docked,
-      className,
-      ...rest
-    }: SidebarProps & Omit<React.RefAttributes<HTMLDivElement>, "onSelect">,
-    ref: React.ForwardedRef<HTMLDivElement>,
-  ) => {
-    if (process.env.NODE_ENV === "development" && onDock && docked == null) {
-      console.warn(
-        "Sidebar: `docked` must be set when `onDock` is supplied for the sidebar to be user-dockable. To hide this message, either pass `docked` or remove `onDock`",
-      );
-    }
-
-    const setAppState = useExcalidrawSetAppState();
-
-    const setIsSidebarDockedAtom = useSetAtom(isSidebarDockedAtom, jotaiScope);
-
-    useLayoutEffect(() => {
-      setIsSidebarDockedAtom(!!docked);
-      return () => {
-        setIsSidebarDockedAtom(false);
-      };
-    }, [setIsSidebarDockedAtom, docked]);
-
-    const headerPropsRef = useRef<SidebarPropsContextValue>(
-      {} as SidebarPropsContextValue,
-    );
-    headerPropsRef.current.onCloseRequest = () => {
-      setAppState({ openSidebar: null });
-    };
-    headerPropsRef.current.onDock = (isDocked) => onDock?.(isDocked);
-    // renew the ref object if the following props change since we want to
-    // rerender. We can't pass down as component props manually because
-    // the <Sidebar.Header/> can be rendered upstream.
-    headerPropsRef.current = updateObject(headerPropsRef.current, {
-      docked,
-      // explicit prop to rerender on update
-      shouldRenderDockButton: !!onDock && docked != null,
-    });
-
-    const islandRef = useRef<HTMLDivElement>(null);
-
-    useImperativeHandle(ref, () => {
-      return islandRef.current!;
-    });
-
-    const device = useDevice();
-
-    const closeLibrary = useCallback(() => {
-      const isDialogOpen = !!document.querySelector(".Dialog");
-
-      // Prevent closing if any dialog is open
-      if (isDialogOpen) {
-        return;
-      }
-      setAppState({ openSidebar: null });
-    }, [setAppState]);
-
-    useOnClickOutside(
-      islandRef,
-      useCallback(
-        (event) => {
-          // If click on the library icon, do nothing so that LibraryButton
-          // can toggle library menu
-          if ((event.target as Element).closest(".sidebar-trigger")) {
-            return;
-          }
-          if (!docked || !device.canDeviceFitSidebar) {
-            closeLibrary();
-          }
-        },
-        [closeLibrary, docked, device.canDeviceFitSidebar],
-      ),
-    );
-
-    useEffect(() => {
-      const handleKeyDown = (event: KeyboardEvent) => {
-        if (
-          event.key === KEYS.ESCAPE &&
-          (!docked || !device.canDeviceFitSidebar)
-        ) {
-          closeLibrary();
-        }
-      };
-      document.addEventListener(EVENT.KEYDOWN, handleKeyDown);
-      return () => {
-        document.removeEventListener(EVENT.KEYDOWN, handleKeyDown);
-      };
-    }, [closeLibrary, docked, device.canDeviceFitSidebar]);
-
-    return (
-      <Island
-        {...rest}
-        className={clsx("sidebar", { "sidebar--docked": docked }, className)}
-        ref={islandRef}
-      >
-        <SidebarPropsContext.Provider value={headerPropsRef.current}>
-          {children}
-        </SidebarPropsContext.Provider>
-      </Island>
-    );
-  },
-);
-SidebarInner.displayName = "SidebarInner";
+/** using a counter instead of boolean to handle race conditions where
+ * the host app may render (mount/unmount) multiple different sidebar */
+export const hostSidebarCountersAtom = atom({ rendered: 0, docked: 0 });

 export const Sidebar = Object.assign(
-  forwardRef((props: SidebarProps, ref: React.ForwardedRef<HTMLDivElement>) => {
-    const appState = useUIAppState();
+  forwardRef(
+    (
+      {
+        children,
+        onClose,
+        onDock,
+        docked,
+        /** Undocumented, may be removed later. Generally should either be
+         * `props.docked` or `appState.isSidebarDocked`. Currently serves to
+         *  prevent unwanted animation of the shadow if initially docked. */
+        //
+        // NOTE we'll want to remove this after we sort out how to subscribe to
+        // individual appState properties
+        initialDockedState = docked,
+        dockable = true,
+        className,
+        __isInternal,
+      }: SidebarProps<{
+        // NOTE sidebars we use internally inside the editor must have this flag set.
+        // It indicates that this sidebar should have lower precedence over host
+        // sidebars, if both are open.
+        /** @private internal */
+        __isInternal?: boolean;
+      }>,
+      ref: React.ForwardedRef<HTMLDivElement>,
+    ) => {
+      const [hostSidebarCounters, setHostSidebarCounters] = useAtom(
+        hostSidebarCountersAtom,
+        jotaiScope,
+      );

-    const { onStateChange } = props;
+      const setAppState = useExcalidrawSetAppState();

-    const refPrevOpenSidebar = useRef(appState.openSidebar);
-    useEffect(() => {
-      if (
-        // closing sidebar
-        ((!appState.openSidebar &&
-          refPrevOpenSidebar?.current?.name === props.name) ||
-          // opening current sidebar
-          (appState.openSidebar?.name === props.name &&
-            refPrevOpenSidebar?.current?.name !== props.name) ||
-          // switching tabs or switching to a different sidebar
-          refPrevOpenSidebar.current?.name === props.name) &&
-        appState.openSidebar !== refPrevOpenSidebar.current
-      ) {
-        onStateChange?.(
-          appState.openSidebar?.name !== props.name
-            ? null
-            : appState.openSidebar,
-        );
+      const [isDockedFallback, setIsDockedFallback] = useState(
+        docked ?? initialDockedState ?? false,
+      );
+
+      useLayoutEffect(() => {
+        if (docked === undefined) {
+          // ugly hack to get initial state out of AppState without subscribing
+          // to it as a whole (once we have granular subscriptions, we'll move
+          // to that)
+          //
+          // NOTE this means that is updated `state.isSidebarDocked` changes outside
+          // of this compoent, it won't be reflected here. Currently doesn't happen.
+          setAppState((state) => {
+            setIsDockedFallback(state.isSidebarDocked);
+            // bail from update
+            return null;
+          });
+        }
+      }, [setAppState, docked]);
+
+      useLayoutEffect(() => {
+        if (!__isInternal) {
+          setHostSidebarCounters((s) => ({
+            rendered: s.rendered + 1,
+            docked: isDockedFallback ? s.docked + 1 : s.docked,
+          }));
+          return () => {
+            setHostSidebarCounters((s) => ({
+              rendered: s.rendered - 1,
+              docked: isDockedFallback ? s.docked - 1 : s.docked,
+            }));
+          };
+        }
+      }, [__isInternal, setHostSidebarCounters, isDockedFallback]);
+
+      const onCloseRef = useRef(onClose);
+      onCloseRef.current = onClose;
+
+      useEffect(() => {
+        return () => {
+          onCloseRef.current?.();
+        };
+      }, []);
+
+      const headerPropsRef = useRef<SidebarPropsContextValue>({});
+      headerPropsRef.current.onClose = () => {
+        setAppState({ openSidebar: null });
+      };
+      headerPropsRef.current.onDock = (isDocked) => {
+        if (docked === undefined) {
+          setAppState({ isSidebarDocked: isDocked });
+          setIsDockedFallback(isDocked);
+        }
+        onDock?.(isDocked);
+      };
+      // renew the ref object if the following props change since we want to
+      // rerender. We can't pass down as component props manually because
+      // the <Sidebar.Header/> can be rendered upsream.
+      headerPropsRef.current = updateObject(headerPropsRef.current, {
+        docked: docked ?? isDockedFallback,
+        dockable,
+      });
+
+      if (hostSidebarCounters.rendered > 0 && __isInternal) {
+        return null;
      }
-      refPrevOpenSidebar.current = appState.openSidebar;
-    }, [appState.openSidebar, onStateChange, props.name]);

-    const [mounted, setMounted] = useState(false);
-    useLayoutEffect(() => {
-      setMounted(true);
-      return () => setMounted(false);
-    }, []);
-
-    // We want to render in the next tick (hence `mounted` flag) so that it's
-    // guaranteed to happen after unmount of the previous sidebar (in case the
-    // previous sidebar is mounted after the next one). This is necessary to
-    // prevent flicker of subcomponents that support fallbacks
-    // (e.g. SidebarHeader). This is because we're using flags to determine
-    // whether prefer the fallback component or not (otherwise both will render
-    // initially), and the flag won't be reset in time if the unmount order
-    // it not correct.
-    //
-    // Alternative, and more general solution would be to namespace the fallback
-    // HoC so that state is not shared between subcomponents when the wrapping
-    // component is of the same type (e.g. Sidebar -> SidebarHeader).
-    const shouldRender = mounted && appState.openSidebar?.name === props.name;
-
-    if (!shouldRender) {
-      return null;
-    }
-
-    return <SidebarInner {...props} ref={ref} key={props.name} />;
-  }),
+      return (
+        <Island
+          className={clsx(
+            "layer-ui__sidebar",
+            { "layer-ui__sidebar--docked": isDockedFallback },
+            className,
+          )}
+          ref={ref}
+        >
+          <SidebarPropsContext.Provider value={headerPropsRef.current}>
+            <SidebarHeaderComponents.Context>
+              <SidebarHeaderComponents.Component __isFallback />
+              {children}
+            </SidebarHeaderComponents.Context>
+          </SidebarPropsContext.Provider>
+        </Island>
+      );
+    },
+  ),
  {
-    Header: SidebarHeader,
-    TabTriggers: SidebarTabTriggers,
-    TabTrigger: SidebarTabTrigger,
-    Tabs: SidebarTabs,
-    Tab: SidebarTab,
-    Trigger: SidebarTrigger,
+    Header: SidebarHeaderComponents.Component,
  },
 );
-Sidebar.displayName = "Sidebar";
--- a/src/components/Sidebar/SidebarHeader.tsx
+++ b/src/components/Sidebar/SidebarHeader.tsx
@@ -4,54 +4,86 @@ import { t } from "../../i18n";
 import { useDevice } from "../App";
 import { SidebarPropsContext } from "./common";
 import { CloseIcon, PinIcon } from "../icons";
+import { withUpstreamOverride } from "../hoc/withUpstreamOverride";
 import { Tooltip } from "../Tooltip";
-import { Button } from "../Button";

-export const SidebarHeader = ({
-  children,
-  className,
-}: {
-  children?: React.ReactNode;
-  className?: string;
+export const SidebarDockButton = (props: {
+  checked: boolean;
+  onChange?(): void;
 }) => {
-  const device = useDevice();
-  const props = useContext(SidebarPropsContext);
-
-  const renderDockButton = !!(
-    device.canDeviceFitSidebar && props.shouldRenderDockButton
-  );
-
  return (
-    <div
-      className={clsx("sidebar__header", className)}
-      data-testid="sidebar-header"
-    >
-      {children}
-      <div className="sidebar__header__buttons">
-        {renderDockButton && (
-          <Tooltip label={t("labels.sidebarLock")}>
-            <Button
-              onSelect={() => props.onDock?.(!props.docked)}
-              selected={!!props.docked}
-              className="sidebar__dock"
-              data-testid="sidebar-dock"
-              aria-label={t("labels.sidebarLock")}
-            >
-              {PinIcon}
-            </Button>
-          </Tooltip>
-        )}
-        <Button
-          data-testid="sidebar-close"
-          className="sidebar__close"
-          onSelect={props.onCloseRequest}
-          aria-label={t("buttons.close")}
+    <div className="layer-ui__sidebar-dock-button" data-testid="sidebar-dock">
+      <Tooltip label={t("labels.sidebarLock")}>
+        <label
+          className={clsx(
+            "ToolIcon ToolIcon__lock ToolIcon_type_floating",
+            `ToolIcon_size_medium`,
+          )}
        >
-          {CloseIcon}
-        </Button>
-      </div>
+          <input
+            className="ToolIcon_type_checkbox"
+            type="checkbox"
+            onChange={props.onChange}
+            checked={props.checked}
+            aria-label={t("labels.sidebarLock")}
+          />{" "}
+          <div
+            className={clsx("Sidebar__pin-btn", {
+              "Sidebar__pin-btn--pinned": props.checked,
+            })}
+            tabIndex={0}
+          >
+            {PinIcon}
+          </div>{" "}
+        </label>{" "}
+      </Tooltip>
    </div>
  );
 };

-SidebarHeader.displayName = "SidebarHeader";
+const _SidebarHeader: React.FC<{
+  children?: React.ReactNode;
+  className?: string;
+}> = ({ children, className }) => {
+  const device = useDevice();
+  const props = useContext(SidebarPropsContext);
+
+  const renderDockButton = !!(device.canDeviceFitSidebar && props.dockable);
+  const renderCloseButton = !!props.onClose;
+
+  return (
+    <div
+      className={clsx("layer-ui__sidebar__header", className)}
+      data-testid="sidebar-header"
+    >
+      {children}
+      {(renderDockButton || renderCloseButton) && (
+        <div className="layer-ui__sidebar__header__buttons">
+          {renderDockButton && (
+            <SidebarDockButton
+              checked={!!props.docked}
+              onChange={() => {
+                props.onDock?.(!props.docked);
+              }}
+            />
+          )}
+          {renderCloseButton && (
+            <button
+              data-testid="sidebar-close"
+              className="Sidebar__close-btn"
+              onClick={props.onClose}
+              aria-label={t("buttons.close")}
+            >
+              {CloseIcon}
+            </button>
+          )}
+        </div>
+      )}
+    </div>
+  );
+};
+
+const [Context, Component] = withUpstreamOverride(_SidebarHeader);
+
+/** @private */
+export const SidebarHeaderComponents = { Context, Component };
--- a/src/components/Sidebar/SidebarTab.tsx
+++ b/src/components/Sidebar/SidebarTab.tsx
@@ -1,18 +0,0 @@
-import * as RadixTabs from "@radix-ui/react-tabs";
-import { SidebarTabName } from "../../types";
-
-export const SidebarTab = ({
-  tab,
-  children,
-  ...rest
-}: {
-  tab: SidebarTabName;
-  children: React.ReactNode;
-} & React.HTMLAttributes<HTMLDivElement>) => {
-  return (
-    <RadixTabs.Content {...rest} value={tab}>
-      {children}
-    </RadixTabs.Content>
-  );
-};
-SidebarTab.displayName = "SidebarTab";
--- a/src/components/Sidebar/SidebarTabTrigger.tsx
+++ b/src/components/Sidebar/SidebarTabTrigger.tsx
@@ -1,26 +0,0 @@
-import * as RadixTabs from "@radix-ui/react-tabs";
-import { SidebarTabName } from "../../types";
-
-export const SidebarTabTrigger = ({
-  children,
-  tab,
-  onSelect,
-  ...rest
-}: {
-  children: React.ReactNode;
-  tab: SidebarTabName;
-  onSelect?: React.ReactEventHandler<HTMLButtonElement> | undefined;
-} & Omit<React.HTMLAttributes<HTMLButtonElement>, "onSelect">) => {
-  return (
-    <RadixTabs.Trigger value={tab} asChild onSelect={onSelect}>
-      <button
-        type={"button"}
-        className={`excalidraw-button sidebar-tab-trigger`}
-        {...rest}
-      >
-        {children}
-      </button>
-    </RadixTabs.Trigger>
-  );
-};
-SidebarTabTrigger.displayName = "SidebarTabTrigger";
--- a/src/components/Sidebar/SidebarTabTriggers.tsx
+++ b/src/components/Sidebar/SidebarTabTriggers.tsx
@@ -1,16 +0,0 @@
-import * as RadixTabs from "@radix-ui/react-tabs";
-
-export const SidebarTabTriggers = ({
-  children,
-  ...rest
-}: { children: React.ReactNode } & Omit<
-  React.RefAttributes<HTMLDivElement>,
-  "onSelect"
->) => {
-  return (
-    <RadixTabs.List className="sidebar-triggers" {...rest}>
-      {children}
-    </RadixTabs.List>
-  );
-};
-SidebarTabTriggers.displayName = "SidebarTabTriggers";
--- a/src/components/Sidebar/SidebarTabs.tsx
+++ b/src/components/Sidebar/SidebarTabs.tsx
@@ -1,36 +0,0 @@
-import * as RadixTabs from "@radix-ui/react-tabs";
-import { useUIAppState } from "../../context/ui-appState";
-import { useExcalidrawSetAppState } from "../App";
-
-export const SidebarTabs = ({
-  children,
-  ...rest
-}: {
-  children: React.ReactNode;
-} & Omit<React.RefAttributes<HTMLDivElement>, "onSelect">) => {
-  const appState = useUIAppState();
-  const setAppState = useExcalidrawSetAppState();
-
-  if (!appState.openSidebar) {
-    return null;
-  }
-
-  const { name } = appState.openSidebar;
-
-  return (
-    <RadixTabs.Root
-      className="sidebar-tabs-root"
-      value={appState.openSidebar.tab}
-      onValueChange={(tab) =>
-        setAppState((state) => ({
-          ...state,
-          openSidebar: { ...state.openSidebar, name, tab },
-        }))
-      }
-      {...rest}
-    >
-      {children}
-    </RadixTabs.Root>
-  );
-};
-SidebarTabs.displayName = "SidebarTabs";
--- a/src/components/Sidebar/SidebarTrigger.scss
+++ b/src/components/Sidebar/SidebarTrigger.scss
@@ -1,34 +0,0 @@
-@import "../../css/variables.module";
-
-.excalidraw {
-  .sidebar-trigger {
-    @include outlineButtonStyles;
-
-    background-color: var(--island-bg-color);
-
-    width: auto;
-    height: var(--lg-button-size);
-
-    display: flex;
-    align-items: center;
-    gap: 0.5rem;
-
-    line-height: 0;
-
-    font-size: 0.75rem;
-    letter-spacing: 0.4px;
-
-    svg {
-      width: var(--lg-icon-size);
-      height: var(--lg-icon-size);
-    }
-  }
-
-  .default-sidebar-trigger .sidebar-trigger__label {
-    display: none;
-
-    @media screen and (min-width: 1024px) {
-      display: block;
-    }
-  }
-}
--- a/src/components/Sidebar/SidebarTrigger.tsx
+++ b/src/components/Sidebar/SidebarTrigger.tsx
@@ -1,45 +0,0 @@
-import { useExcalidrawSetAppState } from "../App";
-import { SidebarTriggerProps } from "./common";
-import { useUIAppState } from "../../context/ui-appState";
-import clsx from "clsx";
-
-import "./SidebarTrigger.scss";
-
-export const SidebarTrigger = ({
-  name,
-  tab,
-  icon,
-  title,
-  children,
-  onToggle,
-  className,
-  style,
-}: SidebarTriggerProps) => {
-  const setAppState = useExcalidrawSetAppState();
-  const appState = useUIAppState();
-
-  return (
-    <label title={title}>
-      <input
-        className="ToolIcon_type_checkbox"
-        type="checkbox"
-        onChange={(event) => {
-          document
-            .querySelector(".layer-ui__wrapper")
-            ?.classList.remove("animate");
-          const isOpen = event.target.checked;
-          setAppState({ openSidebar: isOpen ? { name, tab } : null });
-          onToggle?.(isOpen);
-        }}
-        checked={appState.openSidebar?.name === name}
-        aria-label={title}
-        aria-keyshortcuts="0"
-      />
-      <div className={clsx("sidebar-trigger", className)} style={style}>
-        {icon && <div>{icon}</div>}
-        {children && <div className="sidebar-trigger__label">{children}</div>}
-      </div>
-    </label>
-  );
-};
-SidebarTrigger.displayName = "SidebarTrigger";
--- a/src/components/Sidebar/common.ts
+++ b/src/components/Sidebar/common.ts
@@ -1,41 +1,23 @@
 import React from "react";
-import { AppState, SidebarName, SidebarTabName } from "../../types";
-
-export type SidebarTriggerProps = {
-  name: SidebarName;
-  tab?: SidebarTabName;
-  icon?: JSX.Element;
-  children?: React.ReactNode;
-  title?: string;
-  className?: string;
-  onToggle?: (open: boolean) => void;
-  style?: React.CSSProperties;
-};

 export type SidebarProps<P = {}> = {
-  name: SidebarName;
  children: React.ReactNode;
  /**
-   * Called on sidebar open/close or tab change.
-   */
-  onStateChange?: (state: AppState["openSidebar"]) => void;
-  /**
-   * supply alongside `docked` prop in order to make the Sidebar user-dockable
+   * Called on sidebar close (either by user action or by the editor).
   */
+  onClose?: () => void | boolean;
+  /** if not supplied, sidebar won't be dockable */
  onDock?: (docked: boolean) => void;
  docked?: boolean;
+  initialDockedState?: boolean;
+  dockable?: boolean;
  className?: string;
-  // NOTE sidebars we use internally inside the editor must have this flag set.
-  // It indicates that this sidebar should have lower precedence over host
-  // sidebars, if both are open.
-  /** @private internal */
-  __fallback?: boolean;
 } & P;

 export type SidebarPropsContextValue = Pick<
  SidebarProps,
-  "onDock" | "docked"
-> & { onCloseRequest: () => void; shouldRenderDockButton: boolean };
+  "onClose" | "onDock" | "docked" | "dockable"
+>;

 export const SidebarPropsContext =
-  React.createContext<SidebarPropsContextValue>({} as SidebarPropsContextValue);
+  React.createContext<SidebarPropsContextValue>({});
--- a/src/components/SingleLibraryItem.scss
+++ b/src/components/SingleLibraryItem.scss
@@ -0,0 +1,79 @@
+@import "../css/variables.module";
+
+.excalidraw {
+  .single-library-item {
+    position: relative;
+
+    &-status {
+      position: absolute;
+      top: 0.3rem;
+      left: 0.3rem;
+      font-size: 0.7rem;
+      color: $oc-red-7;
+      background: rgba(255, 255, 255, 0.9);
+      padding: 0.1rem 0.2rem;
+      border-radius: 0.2rem;
+    }
+
+    &__svg {
+      background-color: $oc-white;
+      padding: 0.3rem;
+      width: 7.5rem;
+      height: 7.5rem;
+      border: 1px solid var(--button-gray-2);
+      svg {
+        width: 100%;
+        height: 100%;
+      }
+    }
+
+    .ToolIcon__icon {
+      background-color: $oc-white;
+      width: auto;
+      height: auto;
+      margin: 0 0.5rem;
+    }
+    .ToolIcon,
+    .ToolIcon_type_button:hover {
+      background-color: white;
+    }
+    .required,
+    .error {
+      color: $oc-red-8;
+      font-weight: bold;
+      font-size: 1rem;
+      margin: 0.2rem;
+    }
+    .error {
+      font-weight: 500;
+      margin: 0;
+      padding: 0.3em 0;
+    }
+
+    &--remove {
+      position: absolute;
+      top: 0.2rem;
+      right: 1rem;
+
+      .ToolIcon__icon {
+        margin: 0;
+      }
+      .ToolIcon__icon {
+        background-color: $oc-red-6;
+        &:hover {
+          background-color: $oc-red-7;
+        }
+        &:active {
+          background-color: $oc-red-8;
+        }
+      }
+      svg {
+        color: $oc-white;
+        padding: 0.26rem;
+        border-radius: 0.3em;
+        width: 1rem;
+        height: 1rem;
+      }
+    }
+  }
+}
--- a/src/components/SingleLibraryItem.tsx
+++ b/src/components/SingleLibraryItem.tsx
@@ -0,0 +1,104 @@
+import oc from "open-color";
+import { useEffect, useRef } from "react";
+import { t } from "../i18n";
+import { exportToSvg } from "../packages/utils";
+import { AppState, LibraryItem } from "../types";
+import { CloseIcon } from "./icons";
+
+import "./SingleLibraryItem.scss";
+import { ToolButton } from "./ToolButton";
+
+const SingleLibraryItem = ({
+  libItem,
+  appState,
+  index,
+  onChange,
+  onRemove,
+}: {
+  libItem: LibraryItem;
+  appState: AppState;
+  index: number;
+  onChange: (val: string, index: number) => void;
+  onRemove: (id: string) => void;
+}) => {
+  const svgRef = useRef<HTMLDivElement | null>(null);
+  const inputRef = useRef<HTMLInputElement | null>(null);
+
+  useEffect(() => {
+    const node = svgRef.current;
+    if (!node) {
+      return;
+    }
+    (async () => {
+      const svg = await exportToSvg({
+        elements: libItem.elements,
+        appState: {
+          ...appState,
+          viewBackgroundColor: oc.white,
+          exportBackground: true,
+        },
+        files: null,
+      });
+      node.innerHTML = svg.outerHTML;
+    })();
+  }, [libItem.elements, appState]);
+
+  return (
+    <div className="single-library-item">
+      {libItem.status === "published" && (
+        <span className="single-library-item-status">
+          {t("labels.statusPublished")}
+        </span>
+      )}
+      <div ref={svgRef} className="single-library-item__svg" />
+      <ToolButton
+        aria-label={t("buttons.remove")}
+        type="button"
+        icon={CloseIcon}
+        className="single-library-item--remove"
+        onClick={onRemove.bind(null, libItem.id)}
+        title={t("buttons.remove")}
+      />
+      <div
+        style={{
+          display: "flex",
+          margin: "0.8rem 0",
+          width: "100%",
+          fontSize: "14px",
+          fontWeight: 500,
+          flexDirection: "column",
+        }}
+      >
+        <label
+          style={{
+            display: "flex",
+            justifyContent: "space-between",
+            flexDirection: "column",
+          }}
+        >
+          <div style={{ padding: "0.5em 0" }}>
+            <span style={{ fontWeight: 500, color: oc.gray[6] }}>
+              {t("publishDialog.itemName")}
+            </span>
+            <span aria-hidden="true" className="required">
+              *
+            </span>
+          </div>
+          <input
+            type="text"
+            ref={inputRef}
+            style={{ width: "80%", padding: "0.2rem" }}
+            defaultValue={libItem.name}
+            placeholder="Item name"
+            onChange={(event) => {
+              onChange(event.target.value, index);
+            }}
+          />
+        </label>
+        <span className="error">{libItem.error}</span>
+      </div>
+    </div>
+  );
+};
+
+export default SingleLibraryItem;
--- a/src/components/Stats.tsx
+++ b/src/components/Stats.tsx
@@ -3,14 +3,14 @@ import { getCommonBounds } from "../element/bounds";
 import { NonDeletedExcalidrawElement } from "../element/types";
 import { t } from "../i18n";
 import { getTargetElements } from "../scene";
-import { ExcalidrawProps, UIAppState } from "../types";
+import { AppState, ExcalidrawProps } from "../types";
 import { CloseIcon } from "./icons";
 import { Island } from "./Island";
 import "./Stats.scss";

 export const Stats = (props: {
-  appState: UIAppState;
-  setAppState: React.Component<any, UIAppState>["setState"];
+  appState: AppState;
+  setAppState: React.Component<any, AppState>["setState"];
  elements: readonly NonDeletedExcalidrawElement[];
  onClose: () => void;
  renderCustomStats: ExcalidrawProps["renderCustomStats"];
--- a/src/components/Tooltip.scss
+++ b/src/components/Tooltip.scss
@@ -2,9 +2,6 @@

 // container in body where the actual tooltip is appended to
 .excalidraw-tooltip {
-  --ui-font: Assistant, system-ui, BlinkMacSystemFont, -apple-system, Segoe UI,
-    Roboto, Helvetica, Arial, sans-serif;
-  font-family: var(--ui-font);
  position: fixed;
  z-index: 1000;

--- a/src/components/TopErrorBoundary.tsx
+++ b/src/components/TopErrorBoundary.tsx
@@ -1,7 +1,6 @@
 import React from "react";
 import * as Sentry from "@sentry/browser";
 import { t } from "../i18n";
-import Trans from "./Trans";

 interface TopErrorBoundaryState {
  hasError: boolean;
@@ -75,31 +74,25 @@ export class TopErrorBoundary extends React.Component<
      <div className="ErrorSplash excalidraw">
        <div className="ErrorSplash-messageContainer">
          <div className="ErrorSplash-paragraph bigger align-center">
-            <Trans
-              i18nKey="errorSplash.headingMain"
-              button={(el) => (
-                <button onClick={() => window.location.reload()}>{el}</button>
-              )}
-            />
+            {t("errorSplash.headingMain_pre")}
+            <button onClick={() => window.location.reload()}>
+              {t("errorSplash.headingMain_button")}
+            </button>
          </div>
          <div className="ErrorSplash-paragraph align-center">
-            <Trans
-              i18nKey="errorSplash.clearCanvasMessage"
-              button={(el) => (
-                <button
-                  onClick={() => {
-                    try {
-                      localStorage.clear();
-                      window.location.reload();
-                    } catch (error: any) {
-                      console.error(error);
-                    }
-                  }}
-                >
-                  {el}
-                </button>
-              )}
-            />
+            {t("errorSplash.clearCanvasMessage")}
+            <button
+              onClick={() => {
+                try {
+                  localStorage.clear();
+                  window.location.reload();
+                } catch (error: any) {
+                  console.error(error);
+                }
+              }}
+            >
+              {t("errorSplash.clearCanvasMessage_button")}
+            </button>
            <br />
            <div className="smaller">
              <span role="img" aria-label="warning">
@@ -113,17 +106,16 @@ export class TopErrorBoundary extends React.Component<
          </div>
          <div>
            <div className="ErrorSplash-paragraph">
-              {t("errorSplash.trackedToSentry", {
-                eventId: this.state.sentryEventId,
-              })}
+              {t("errorSplash.trackedToSentry_pre")}
+              {this.state.sentryEventId}
+              {t("errorSplash.trackedToSentry_post")}
            </div>
            <div className="ErrorSplash-paragraph">
-              <Trans
-                i18nKey="errorSplash.openIssueMessage"
-                button={(el) => (
-                  <button onClick={() => this.createGithubIssue()}>{el}</button>
-                )}
-              />
+              {t("errorSplash.openIssueMessage_pre")}
+              <button onClick={() => this.createGithubIssue()}>
+                {t("errorSplash.openIssueMessage_button")}
+              </button>
+              {t("errorSplash.openIssueMessage_post")}
            </div>
            <div className="ErrorSplash-paragraph">
              <div className="ErrorSplash-details">
--- a/src/components/Trans.test.tsx
+++ b/src/components/Trans.test.tsx
@@ -1,67 +0,0 @@
-import { render } from "@testing-library/react";
-
-import fallbackLangData from "../locales/en.json";
-
-import Trans from "./Trans";
-
-describe("Test <Trans/>", () => {
-  it("should translate the the strings correctly", () => {
-    //@ts-ignore
-    fallbackLangData.transTest = {
-      key1: "Hello {{audience}}",
-      key2: "Please <link>click the button</link> to continue.",
-      key3: "Please <link>click {{location}}</link> to continue.",
-      key4: "Please <link>click <bold>{{location}}</bold></link> to continue.",
-      key5: "Please <connect-link>click the button</connect-link> to continue.",
-    };
-
-    const { getByTestId } = render(
-      <>
-        <div data-testid="test1">
-          <Trans i18nKey="transTest.key1" audience="world" />
-        </div>
-        <div data-testid="test2">
-          <Trans
-            i18nKey="transTest.key2"
-            link={(el) => <a href="https://example.com">{el}</a>}
-          />
-        </div>
-        <div data-testid="test3">
-          <Trans
-            i18nKey="transTest.key3"
-            link={(el) => <a href="https://example.com">{el}</a>}
-            location="the button"
-          />
-        </div>
-        <div data-testid="test4">
-          <Trans
-            i18nKey="transTest.key4"
-            link={(el) => <a href="https://example.com">{el}</a>}
-            location="the button"
-            bold={(el) => <strong>{el}</strong>}
-          />
-        </div>
-        <div data-testid="test5">
-          <Trans
-            i18nKey="transTest.key5"
-            connect-link={(el) => <a href="https://example.com">{el}</a>}
-          />
-        </div>
-      </>,
-    );
-
-    expect(getByTestId("test1").innerHTML).toEqual("Hello world");
-    expect(getByTestId("test2").innerHTML).toEqual(
-      `Please <a href="https://example.com">click the button</a> to continue.`,
-    );
-    expect(getByTestId("test3").innerHTML).toEqual(
-      `Please <a href="https://example.com">click the button</a> to continue.`,
-    );
-    expect(getByTestId("test4").innerHTML).toEqual(
-      `Please <a href="https://example.com">click <strong>the button</strong></a> to continue.`,
-    );
-    expect(getByTestId("test5").innerHTML).toEqual(
-      `Please <a href="https://example.com">click the button</a> to continue.`,
-    );
-  });
-});
--- a/src/components/Trans.tsx
+++ b/src/components/Trans.tsx
@@ -1,169 +0,0 @@
-import React from "react";
-
-import { useI18n } from "../i18n";
-
-// Used for splitting i18nKey into tokens in Trans component
-// Example:
-// "Please <link>click {{location}}</link> to continue.".split(SPLIT_REGEX).filter(Boolean)
-// produces
-// ["Please ", "<link>", "click ", "{{location}}", "</link>", " to continue."]
-const SPLIT_REGEX = /({{[\w-]+}})|(<[\w-]+>)|(<\/[\w-]+>)/g;
-// Used for extracting "location" from "{{location}}"
-const KEY_REGEXP = /{{([\w-]+)}}/;
-// Used for extracting "link" from "<link>"
-const TAG_START_REGEXP = /<([\w-]+)>/;
-// Used for extracting "link" from "</link>"
-const TAG_END_REGEXP = /<\/([\w-]+)>/;
-
-const getTransChildren = (
-  format: string,
-  props: {
-    [key: string]: React.ReactNode | ((el: React.ReactNode) => React.ReactNode);
-  },
-): React.ReactNode[] => {
-  const stack: { name: string; children: React.ReactNode[] }[] = [
-    {
-      name: "",
-      children: [],
-    },
-  ];
-
-  format
-    .split(SPLIT_REGEX)
-    .filter(Boolean)
-    .forEach((match) => {
-      const tagStartMatch = match.match(TAG_START_REGEXP);
-      const tagEndMatch = match.match(TAG_END_REGEXP);
-      const keyMatch = match.match(KEY_REGEXP);
-
-      if (tagStartMatch !== null) {
-        // The match is <tag>. Set the tag name as the name if it's one of the
-        // props, e.g. for "Please <link>click the button</link> to continue"
-        // tagStartMatch[1] = "link" and props contain "link" then it will be
-        // pushed to stack.
-        const name = tagStartMatch[1];
-        if (props.hasOwnProperty(name)) {
-          stack.push({
-            name,
-            children: [],
-          });
-        } else {
-          console.warn(
-            `Trans: missed to pass in prop ${name} for interpolating ${format}`,
-          );
-        }
-      } else if (tagEndMatch !== null) {
-        // If tag end match is found, this means we need to replace the content with
-        // its actual value in prop e.g. format = "Please <link>click the
-        // button</link> to continue", tagEndMatch is for "</link>", stack last item name =
-        // "link" and props.link = (el) => <a
-        // href="https://example.com">{el}</a> then its prop value will be
-        // pushed to "link"'s children so on DOM when rendering it's rendered as
-        // <a href="https://example.com">click the button</a>
-        const name = tagEndMatch[1];
-        if (name === stack[stack.length - 1].name) {
-          const item = stack.pop()!;
-          const itemChildren = React.createElement(
-            React.Fragment,
-            {},
-            ...item.children,
-          );
-          const fn = props[item.name];
-          if (typeof fn === "function") {
-            stack[stack.length - 1].children.push(fn(itemChildren));
-          }
-        } else {
-          console.warn(
-            `Trans: unexpected end tag ${match} for interpolating ${format}`,
-          );
-        }
-      } else if (keyMatch !== null) {
-        // The match is for {{key}}. Check if the key is present in props and set
-        // the prop value as children of last stack item e.g. format = "Hello
-        // {{name}}", key = "name" and props.name = "Excalidraw" then its prop
-        // value will be pushed to "name"'s children so it's rendered on DOM as
-        // "Hello Excalidraw"
-        const name = keyMatch[1];
-        if (props.hasOwnProperty(name)) {
-          stack[stack.length - 1].children.push(props[name] as React.ReactNode);
-        } else {
-          console.warn(
-            `Trans: key ${name} not in props for interpolating ${format}`,
-          );
-        }
-      } else {
-        // If none of cases match means we just need to push the string
-        // to stack eg - "Hello {{name}} Whats up?" "Hello", "Whats up" will be pushed
-        stack[stack.length - 1].children.push(match);
-      }
-    });
-
-  if (stack.length !== 1) {
-    console.warn(`Trans: stack not empty for interpolating ${format}`);
-  }
-
-  return stack[0].children;
-};
-
-/*
-Trans component is used for translating JSX.
-
-```json
-{
-  "example1": "Hello {{audience}}",
-  "example2": "Please <link>click the button</link> to continue.",
-  "example3": "Please <link>click {{location}}</link> to continue.",
-  "example4": "Please <link>click <bold>{{location}}</bold></link> to continue.",
-}
-```
-
-```jsx
-<Trans i18nKey="example1" audience="world" />
-
-<Trans
-  i18nKey="example2"
-  connectLink={(el) => <a href="https://example.com">{el}</a>}
-/>
-
-<Trans
-  i18nKey="example3"
-  connectLink={(el) => <a href="https://example.com">{el}</a>}
-  location="the button"
-/>
-
-<Trans
-  i18nKey="example4"
-  connectLink={(el) => <a href="https://example.com">{el}</a>}
-  location="the button"
-  bold={(el) => <strong>{el}</strong>}
-/>
-```
-
-Output:
-
-```html
-Hello world
-Please <a href="https://example.com">click the button</a> to continue.
-Please <a href="https://example.com">click the button</a> to continue.
-Please <a href="https://example.com">click <strong>the button</strong></a> to continue.
-```
-*/
-const Trans = ({
-  i18nKey,
-  children,
-  ...props
-}: {
-  i18nKey: string;
-  [key: string]: React.ReactNode | ((el: React.ReactNode) => React.ReactNode);
-}) => {
-  const { t } = useI18n();
-
-  // This is needed to avoid unique key error in list which gets rendered from getTransChildren
-  return React.createElement(
-    React.Fragment,
-    {},
-    ...getTransChildren(t(i18nKey), props),
-  );
-};
-
-export default Trans;
--- a/src/components/snapshots/App.test.tsx.snap
+++ b/src/components/snapshots/App.test.tsx.snap
@@ -1,50 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Test <App/> should show error modal when using brave and measureText API is not working 1`] = `
-<div
-  data-testid="brave-measure-text-error"
->
-  <p>
-    Looks like you are using Brave browser with the 
-    <span
-      style="font-weight: 600;"
-    >
-      Aggressively Block Fingerprinting
-    </span>
-     setting enabled.
-  </p>
-  <p>
-    This could result in breaking the 
-    <span
-      style="font-weight: 600;"
-    >
-      Text Elements
-    </span>
-     in your drawings.
-  </p>
-  <p>
-    We strongly recommend disabling this setting. You can follow 
-    <a
-      href="http://docs.excalidraw.com/docs/@excalidraw/excalidraw/faq#turning-off-aggresive-block-fingerprinting-in-brave-browser"
-    >
-      these steps
-    </a>
-     on how to do so.
-  </p>
-  <p>
-    If disabling this setting doesn't fix the display of text elements, please open an 
-    <a
-      href="https://github.com/excalidraw/excalidraw/issues/new"
-    >
-      issue
-    </a>
-     on our GitHub, or write us on 
-    <a
-      href="https://discord.gg/UexuTaE"
-    >
-      Discord
-      .
-    </a>
-  </p>
-</div>
-`;
--- a/src/components/context/tunnels.ts
+++ b/src/components/context/tunnels.ts
@@ -0,0 +1,32 @@
+import React from "react";
+import tunnel from "@dwelle/tunnel-rat";
+
+type Tunnel = ReturnType<typeof tunnel>;
+
+type TunnelsContextValue = {
+  mainMenuTunnel: Tunnel;
+  welcomeScreenMenuHintTunnel: Tunnel;
+  welcomeScreenToolbarHintTunnel: Tunnel;
+  welcomeScreenHelpHintTunnel: Tunnel;
+  welcomeScreenCenterTunnel: Tunnel;
+  footerCenterTunnel: Tunnel;
+  jotaiScope: symbol;
+};
+
+export const TunnelsContext = React.createContext<TunnelsContextValue>(null!);
+
+export const useTunnels = () => React.useContext(TunnelsContext);
+
+export const useInitializeTunnels = () => {
+  return React.useMemo((): TunnelsContextValue => {
+    return {
+      mainMenuTunnel: tunnel(),
+      welcomeScreenMenuHintTunnel: tunnel(),
+      welcomeScreenToolbarHintTunnel: tunnel(),
+      welcomeScreenHelpHintTunnel: tunnel(),
+      welcomeScreenCenterTunnel: tunnel(),
+      footerCenterTunnel: tunnel(),
+      jotaiScope: Symbol(),
+    };
+  }, []);
+};
--- a/src/components/dropdownMenu/DropdownMenuContent.tsx
+++ b/src/components/dropdownMenu/DropdownMenuContent.tsx
@@ -1,4 +1,4 @@
-import { useOutsideClick } from "../../hooks/useOutsideClick";
+import { useOutsideClickHook } from "../../hooks/useOutsideClick";
 import { Island } from "../Island";

 import { useDevice } from "../App";
@@ -24,7 +24,7 @@ const MenuContent = ({
  style?: React.CSSProperties;
 }) => {
  const device = useDevice();
-  const menuRef = useOutsideClick(() => {
+  const menuRef = useOutsideClickHook(() => {
    onClickOutside?.();
  });

--- a/src/components/dropdownMenu/DropdownMenuTrigger.tsx
+++ b/src/components/dropdownMenu/DropdownMenuTrigger.tsx
@@ -1,6 +1,5 @@
 import clsx from "clsx";
-import { useUIAppState } from "../../context/ui-appState";
-import { useDevice } from "../App";
+import { useDevice, useExcalidrawAppState } from "../App";

 const MenuTrigger = ({
  className = "",
@@ -11,7 +10,7 @@ const MenuTrigger = ({
  children: React.ReactNode;
  onToggle: () => void;
 }) => {
-  const appState = useUIAppState();
+  const appState = useExcalidrawAppState();
  const device = useDevice();
  const classNames = clsx(
    `dropdown-menu-button ${className}`,
--- a/src/components/footer/Footer.tsx
+++ b/src/components/footer/Footer.tsx
@@ -1,6 +1,7 @@
 import clsx from "clsx";
 import { actionShortcuts } from "../../actions";
 import { ActionManager } from "../../actions/manager";
+import { AppState } from "../../types";
 import {
  ExitZenModeAction,
  FinalizeAction,
@@ -8,11 +9,10 @@ import {
  ZoomActions,
 } from "../Actions";
 import { useDevice } from "../App";
-import { useTunnels } from "../../context/tunnels";
+import { useTunnels } from "../context/tunnels";
 import { HelpButton } from "../HelpButton";
 import { Section } from "../Section";
 import Stack from "../Stack";
-import { UIAppState } from "../../types";

 const Footer = ({
  appState,
@@ -20,12 +20,12 @@ const Footer = ({
  showExitZenModeBtn,
  renderWelcomeScreen,
 }: {
-  appState: UIAppState;
+  appState: AppState;
  actionManager: ActionManager;
  showExitZenModeBtn: boolean;
  renderWelcomeScreen: boolean;
 }) => {
-  const { FooterCenterTunnel, WelcomeScreenHelpHintTunnel } = useTunnels();
+  const { footerCenterTunnel, welcomeScreenHelpHintTunnel } = useTunnels();

  const device = useDevice();
  const showFinalize =
@@ -70,14 +70,14 @@ const Footer = ({
          </Section>
        </Stack.Col>
      </div>
-      <FooterCenterTunnel.Out />
+      <footerCenterTunnel.Out />
      <div
        className={clsx("layer-ui__wrapper__footer-right zen-mode-transition", {
          "transition-right disable-pointerEvents": appState.zenModeEnabled,
        })}
      >
        <div style={{ position: "relative" }}>
-          {renderWelcomeScreen && <WelcomeScreenHelpHintTunnel.Out />}
+          {renderWelcomeScreen && <welcomeScreenHelpHintTunnel.Out />}
          <HelpButton
            onClick={() => actionManager.executeAction(actionShortcuts)}
          />
--- a/src/components/footer/FooterCenter.tsx
+++ b/src/components/footer/FooterCenter.tsx
@@ -1,13 +1,13 @@
 import clsx from "clsx";
-import { useTunnels } from "../../context/tunnels";
+import { useExcalidrawAppState } from "../App";
+import { useTunnels } from "../context/tunnels";
 import "./FooterCenter.scss";
-import { useUIAppState } from "../../context/ui-appState";

 const FooterCenter = ({ children }: { children?: React.ReactNode }) => {
-  const { FooterCenterTunnel } = useTunnels();
-  const appState = useUIAppState();
+  const { footerCenterTunnel } = useTunnels();
+  const appState = useExcalidrawAppState();
  return (
-    <FooterCenterTunnel.In>
+    <footerCenterTunnel.In>
      <div
        className={clsx("footer-center zen-mode-transition", {
          "layer-ui__wrapper__footer-left--transition-bottom":
@@ -16,7 +16,7 @@ const FooterCenter = ({ children }: { children?: React.ReactNode }) => {
      >
        {children}
      </div>
-    </FooterCenterTunnel.In>
+    </footerCenterTunnel.In>
  );
 };

--- a/src/components/hoc/withInternalFallback.tsx
+++ b/src/components/hoc/withInternalFallback.tsx
@@ -1,46 +1,32 @@
 import { atom, useAtom } from "jotai";
 import React, { useLayoutEffect } from "react";
-import { useTunnels } from "../../context/tunnels";
+import { useTunnels } from "../context/tunnels";

 export const withInternalFallback = <P,>(
  componentName: string,
  Component: React.FC<P>,
 ) => {
-  const renderAtom = atom(0);
+  const counterAtom = atom(0);
  // flag set on initial render to tell the fallback component to skip the
  // render until mount counter are initialized. This is because the counter
  // is initialized in an effect, and thus we could end rendering both
  // components at the same time until counter is initialized.
  let preferHost = false;

-  let counter = 0;
-
  const WrapperComponent: React.FC<
    P & {
      __fallback?: boolean;
    }
  > = (props) => {
    const { jotaiScope } = useTunnels();
-    const [, setRender] = useAtom(renderAtom, jotaiScope);
+    const [counter, setCounter] = useAtom(counterAtom, jotaiScope);

    useLayoutEffect(() => {
-      setRender((c) => {
-        const next = c + 1;
-        counter = next;
-
-        return next;
-      });
+      setCounter((counter) => counter + 1);
      return () => {
-        setRender((c) => {
-          const next = c - 1;
-          counter = next;
-          if (!next) {
-            preferHost = false;
-          }
-          return next;
-        });
+        setCounter((counter) => counter - 1);
      };
-    }, [setRender]);
+    }, [setCounter]);

    if (!props.__fallback) {
      preferHost = true;
--- a/src/components/hoc/withUpstreamOverride.tsx
+++ b/src/components/hoc/withUpstreamOverride.tsx
@@ -0,0 +1,63 @@
+import React, {
+  useMemo,
+  useContext,
+  useLayoutEffect,
+  useState,
+  createContext,
+} from "react";
+
+export const withUpstreamOverride = <P,>(Component: React.ComponentType<P>) => {
+  type ContextValue = [boolean, React.Dispatch<React.SetStateAction<boolean>>];
+
+  const DefaultComponentContext = createContext<ContextValue>([
+    false,
+    () => {},
+  ]);
+
+  const ComponentContext: React.FC<{ children: React.ReactNode }> = ({
+    children,
+  }) => {
+    const [isRenderedUpstream, setIsRenderedUpstream] = useState(false);
+    const contextValue: ContextValue = useMemo(
+      () => [isRenderedUpstream, setIsRenderedUpstream],
+      [isRenderedUpstream],
+    );
+
+    return (
+      <DefaultComponentContext.Provider value={contextValue}>
+        {children}
+      </DefaultComponentContext.Provider>
+    );
+  };
+
+  const DefaultComponent = (
+    props: P & {
+      // indicates whether component should render when not rendered upstream
+      /** @private internal */
+      __isFallback?: boolean;
+    },
+  ) => {
+    const [isRenderedUpstream, setIsRenderedUpstream] = useContext(
+      DefaultComponentContext,
+    );
+
+    useLayoutEffect(() => {
+      if (!props.__isFallback) {
+        setIsRenderedUpstream(true);
+        return () => setIsRenderedUpstream(false);
+      }
+    }, [props.__isFallback, setIsRenderedUpstream]);
+
+    if (props.__isFallback && isRenderedUpstream) {
+      return null;
+    }
+
+    return <Component {...props} />;
+  };
+  if (Component.name) {
+    DefaultComponent.displayName = `${Component.name}_upstreamOverrideWrapper`;
+    ComponentContext.displayName = `${Component.name}_upstreamOverrideContextWrapper`;
+  }
+
+  return [ComponentContext, DefaultComponent] as const;
+};
--- a/src/components/icons.tsx
+++ b/src/components/icons.tsx
@@ -1008,13 +1008,6 @@ export const UngroupIcon = React.memo(({ theme }: { theme: Theme }) =>
  ),
 );

-export const FillZigZagIcon = createIcon(
-  <g strokeWidth={1.25}>
-    <path d="M5.879 2.625h8.242a3.27 3.27 0 0 1 3.254 3.254v8.242a3.27 3.27 0 0 1-3.254 3.254H5.88a3.27 3.27 0 0 1-3.254-3.254V5.88A3.27 3.27 0 0 1 5.88 2.626l-.001-.001ZM4.518 16.118l7.608-12.83m.198 13.934 5.051-9.897M2.778 9.675l9.348-6.387m-7.608 12.83 12.857-8.793" />
-  </g>,
-  modifiedTablerIconProps,
-);
-
 export const FillHachureIcon = createIcon(
  <>
    <path
--- a/src/components/live-collaboration/LiveCollaborationTrigger.tsx
+++ b/src/components/live-collaboration/LiveCollaborationTrigger.tsx
@@ -3,9 +3,9 @@ import { usersIcon } from "../icons";
 import { Button } from "../Button";

 import clsx from "clsx";
+import { useExcalidrawAppState } from "../App";

 import "./LiveCollaborationTrigger.scss";
-import { useUIAppState } from "../../context/ui-appState";

 const LiveCollaborationTrigger = ({
  isCollaborating,
@@ -15,7 +15,7 @@ const LiveCollaborationTrigger = ({
  isCollaborating: boolean;
  onSelect: () => void;
 } & React.ButtonHTMLAttributes<HTMLButtonElement>) => {
-  const appState = useUIAppState();
+  const appState = useExcalidrawAppState();

  return (
    <Button
--- a/src/components/main-menu/DefaultItems.tsx
+++ b/src/components/main-menu/DefaultItems.tsx
@@ -1,6 +1,10 @@
 import { getShortcutFromShortcutName } from "../../actions/shortcuts";
-import { useI18n } from "../../i18n";
-import { useExcalidrawSetAppState, useExcalidrawActionManager } from "../App";
+import { t } from "../../i18n";
+import {
+  useExcalidrawAppState,
+  useExcalidrawSetAppState,
+  useExcalidrawActionManager,
+} from "../App";
 import {
  ExportIcon,
  ExportImageIcon,
@@ -27,11 +31,11 @@ import "./DefaultItems.scss";
 import clsx from "clsx";
 import { useSetAtom } from "jotai";
 import { activeConfirmDialogAtom } from "../ActiveConfirmDialog";
-import { jotaiScope } from "../../jotai";
-import { useUIAppState } from "../../context/ui-appState";

 export const LoadScene = () => {
-  const { t } = useI18n();
+  // FIXME Hack until we tie "t" to lang state
+  // eslint-disable-next-line
+  const appState = useExcalidrawAppState();
  const actionManager = useExcalidrawActionManager();

  if (!actionManager.isActionEnabled(actionLoadScene)) {
@@ -53,7 +57,9 @@ export const LoadScene = () => {
 LoadScene.displayName = "LoadScene";

 export const SaveToActiveFile = () => {
-  const { t } = useI18n();
+  // FIXME Hack until we tie "t" to lang state
+  // eslint-disable-next-line
+  const appState = useExcalidrawAppState();
  const actionManager = useExcalidrawActionManager();

  if (!actionManager.isActionEnabled(actionSaveToActiveFile)) {
@@ -74,7 +80,9 @@ SaveToActiveFile.displayName = "SaveToActiveFile";

 export const SaveAsImage = () => {
  const setAppState = useExcalidrawSetAppState();
-  const { t } = useI18n();
+  // FIXME Hack until we tie "t" to lang state
+  // eslint-disable-next-line
+  const appState = useExcalidrawAppState();
  return (
    <DropdownMenuItem
      icon={ExportImageIcon}
@@ -90,7 +98,9 @@ export const SaveAsImage = () => {
 SaveAsImage.displayName = "SaveAsImage";

 export const Help = () => {
-  const { t } = useI18n();
+  // FIXME Hack until we tie "t" to lang state
+  // eslint-disable-next-line
+  const appState = useExcalidrawAppState();

  const actionManager = useExcalidrawActionManager();

@@ -109,12 +119,10 @@ export const Help = () => {
 Help.displayName = "Help";

 export const ClearCanvas = () => {
-  const { t } = useI18n();
-
-  const setActiveConfirmDialog = useSetAtom(
-    activeConfirmDialogAtom,
-    jotaiScope,
-  );
+  // FIXME Hack until we tie "t" to lang state
+  // eslint-disable-next-line
+  const appState = useExcalidrawAppState();
+  const setActiveConfirmDialog = useSetAtom(activeConfirmDialogAtom);
  const actionManager = useExcalidrawActionManager();

  if (!actionManager.isActionEnabled(actionClearCanvas)) {
@@ -135,8 +143,7 @@ export const ClearCanvas = () => {
 ClearCanvas.displayName = "ClearCanvas";

 export const ToggleTheme = () => {
-  const { t } = useI18n();
-  const appState = useUIAppState();
+  const appState = useExcalidrawAppState();
  const actionManager = useExcalidrawActionManager();

  if (!actionManager.isActionEnabled(actionToggleTheme)) {
@@ -168,8 +175,7 @@ export const ToggleTheme = () => {
 ToggleTheme.displayName = "ToggleTheme";

 export const ChangeCanvasBackground = () => {
-  const { t } = useI18n();
-  const appState = useUIAppState();
+  const appState = useExcalidrawAppState();
  const actionManager = useExcalidrawActionManager();

  if (appState.viewModeEnabled) {
@@ -189,7 +195,9 @@ export const ChangeCanvasBackground = () => {
 ChangeCanvasBackground.displayName = "ChangeCanvasBackground";

 export const Export = () => {
-  const { t } = useI18n();
+  // FIXME Hack until we tie "t" to lang state
+  // eslint-disable-next-line
+  const appState = useExcalidrawAppState();
  const setAppState = useExcalidrawSetAppState();
  return (
    <DropdownMenuItem
@@ -240,7 +248,9 @@ export const LiveCollaborationTrigger = ({
  onSelect: () => void;
  isCollaborating: boolean;
 }) => {
-  const { t } = useI18n();
+  // FIXME Hack until we tie "t" to lang state
+  // eslint-disable-next-line
+  const appState = useExcalidrawAppState();
  return (
    <DropdownMenuItem
      data-testid="collab-button"
--- a/src/components/main-menu/MainMenu.tsx
+++ b/src/components/main-menu/MainMenu.tsx
@@ -1,5 +1,9 @@
 import React from "react";
-import { useDevice, useExcalidrawSetAppState } from "../App";
+import {
+  useDevice,
+  useExcalidrawAppState,
+  useExcalidrawSetAppState,
+} from "../App";
 import DropdownMenu from "../dropdownMenu/DropdownMenu";

 import * as DefaultItems from "./DefaultItems";
@@ -9,8 +13,7 @@ import { t } from "../../i18n";
 import { HamburgerMenuIcon } from "../icons";
 import { withInternalFallback } from "../hoc/withInternalFallback";
 import { composeEventHandlers } from "../../utils";
-import { useTunnels } from "../../context/tunnels";
-import { useUIAppState } from "../../context/ui-appState";
+import { useTunnels } from "../context/tunnels";

 const MainMenu = Object.assign(
  withInternalFallback(
@@ -25,16 +28,16 @@ const MainMenu = Object.assign(
       */
      onSelect?: (event: Event) => void;
    }) => {
-      const { MainMenuTunnel } = useTunnels();
+      const { mainMenuTunnel } = useTunnels();
      const device = useDevice();
-      const appState = useUIAppState();
+      const appState = useExcalidrawAppState();
      const setAppState = useExcalidrawSetAppState();
      const onClickOutside = device.isMobile
        ? undefined
        : () => setAppState({ openMenu: null });

      return (
-        <MainMenuTunnel.In>
+        <mainMenuTunnel.In>
          <DropdownMenu open={appState.openMenu === "canvas"}>
            <DropdownMenu.Trigger
              onToggle={() => {
@@ -63,7 +66,7 @@ const MainMenu = Object.assign(
              )}
            </DropdownMenu.Content>
          </DropdownMenu>
-        </MainMenuTunnel.In>
+        </mainMenuTunnel.In>
      );
    },
  ),
--- a/src/components/welcome-screen/WelcomeScreen.Center.tsx
+++ b/src/components/welcome-screen/WelcomeScreen.Center.tsx
@@ -1,10 +1,13 @@
 import { actionLoadScene, actionShortcuts } from "../../actions";
 import { getShortcutFromShortcutName } from "../../actions/shortcuts";
-import { t, useI18n } from "../../i18n";
-import { useDevice, useExcalidrawActionManager } from "../App";
-import { useTunnels } from "../../context/tunnels";
+import { t } from "../../i18n";
+import {
+  useDevice,
+  useExcalidrawActionManager,
+  useExcalidrawAppState,
+} from "../App";
+import { useTunnels } from "../context/tunnels";
 import { ExcalLogo, HelpIcon, LoadIcon, usersIcon } from "../icons";
-import { useUIAppState } from "../../context/ui-appState";

 const WelcomeScreenMenuItemContent = ({
  icon,
@@ -86,9 +89,9 @@ const WelcomeScreenMenuItemLink = ({
 WelcomeScreenMenuItemLink.displayName = "WelcomeScreenMenuItemLink";

 const Center = ({ children }: { children?: React.ReactNode }) => {
-  const { WelcomeScreenCenterTunnel } = useTunnels();
+  const { welcomeScreenCenterTunnel } = useTunnels();
  return (
-    <WelcomeScreenCenterTunnel.In>
+    <welcomeScreenCenterTunnel.In>
      <div className="welcome-screen-center">
        {children || (
          <>
@@ -101,7 +104,7 @@ const Center = ({ children }: { children?: React.ReactNode }) => {
          </>
        )}
      </div>
-    </WelcomeScreenCenterTunnel.In>
+    </welcomeScreenCenterTunnel.In>
  );
 };
 Center.displayName = "Center";
@@ -145,7 +148,7 @@ const MenuItemHelp = () => {
 MenuItemHelp.displayName = "MenuItemHelp";

 const MenuItemLoadScene = () => {
-  const appState = useUIAppState();
+  const appState = useExcalidrawAppState();
  const actionManager = useExcalidrawActionManager();

  if (appState.viewModeEnabled) {
@@ -169,7 +172,10 @@ const MenuItemLiveCollaborationTrigger = ({
 }: {
  onSelect: () => any;
 }) => {
-  const { t } = useI18n();
+  // FIXME when we tie t() to lang state
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  const appState = useExcalidrawAppState();
+
  return (
    <WelcomeScreenMenuItem shortcut={null} onSelect={onSelect} icon={usersIcon}>
      {t("labels.liveCollaboration")}
--- a/src/components/welcome-screen/WelcomeScreen.Hints.tsx
+++ b/src/components/welcome-screen/WelcomeScreen.Hints.tsx
@@ -1,5 +1,5 @@
 import { t } from "../../i18n";
-import { useTunnels } from "../../context/tunnels";
+import { useTunnels } from "../context/tunnels";
 import {
  WelcomeScreenHelpArrow,
  WelcomeScreenMenuArrow,
@@ -7,44 +7,44 @@ import {
 } from "../icons";

 const MenuHint = ({ children }: { children?: React.ReactNode }) => {
-  const { WelcomeScreenMenuHintTunnel } = useTunnels();
+  const { welcomeScreenMenuHintTunnel } = useTunnels();
  return (
-    <WelcomeScreenMenuHintTunnel.In>
+    <welcomeScreenMenuHintTunnel.In>
      <div className="virgil welcome-screen-decor welcome-screen-decor-hint welcome-screen-decor-hint--menu">
        {WelcomeScreenMenuArrow}
        <div className="welcome-screen-decor-hint__label">
          {children || t("welcomeScreen.defaults.menuHint")}
        </div>
      </div>
-    </WelcomeScreenMenuHintTunnel.In>
+    </welcomeScreenMenuHintTunnel.In>
  );
 };
 MenuHint.displayName = "MenuHint";

 const ToolbarHint = ({ children }: { children?: React.ReactNode }) => {
-  const { WelcomeScreenToolbarHintTunnel } = useTunnels();
+  const { welcomeScreenToolbarHintTunnel } = useTunnels();
  return (
-    <WelcomeScreenToolbarHintTunnel.In>
+    <welcomeScreenToolbarHintTunnel.In>
      <div className="virgil welcome-screen-decor welcome-screen-decor-hint welcome-screen-decor-hint--toolbar">
        <div className="welcome-screen-decor-hint__label">
          {children || t("welcomeScreen.defaults.toolbarHint")}
        </div>
        {WelcomeScreenTopToolbarArrow}
      </div>
-    </WelcomeScreenToolbarHintTunnel.In>
+    </welcomeScreenToolbarHintTunnel.In>
  );
 };
 ToolbarHint.displayName = "ToolbarHint";

 const HelpHint = ({ children }: { children?: React.ReactNode }) => {
-  const { WelcomeScreenHelpHintTunnel } = useTunnels();
+  const { welcomeScreenHelpHintTunnel } = useTunnels();
  return (
-    <WelcomeScreenHelpHintTunnel.In>
+    <welcomeScreenHelpHintTunnel.In>
      <div className="virgil welcome-screen-decor welcome-screen-decor-hint welcome-screen-decor-hint--help">
        <div>{children || t("welcomeScreen.defaults.helpHint")}</div>
        {WelcomeScreenHelpArrow}
      </div>
-    </WelcomeScreenHelpHintTunnel.In>
+    </welcomeScreenHelpHintTunnel.In>
  );
 };
 HelpHint.displayName = "HelpHint";
--- a/Show More
+++ b/Show More