Fix API docs

2025-11-10 15:54:37 +01:00 · 2023-11-06 16:26:36 +01:00
139 changed files with 1228 additions and 4337 deletions
--- a/dev-docs/docs/@excalidraw/excalidraw/api/children-components/footer.mdx
+++ b/dev-docs/docs/@excalidraw/excalidraw/api/children-components/footer.mdx
@@ -34,7 +34,7 @@ Open the `Menu` in the below playground and you will see the `custom footer` ren
 ```jsx live noInline
 const MobileFooter = ({}) => {
  const device = useDevice();
-  if (device.editor.isMobile) {
+  if (device.isMobile) {
    return (
      <Footer>
        <button
--- a/dev-docs/docs/@excalidraw/excalidraw/api/children-components/sidebar.mdx
+++ b/dev-docs/docs/@excalidraw/excalidraw/api/children-components/sidebar.mdx
@@ -80,7 +80,7 @@ A given tab trigger button that switches to a given sidebar tab. It must be rend
 | `className` | `string` | No |  |
 | `style` | `React.CSSProperties` | No |  |

-You can use the [`ref.toggleSidebar({ name: "custom" })`](/docs/@excalidraw/excalidraw/api/props/excalidraw-api#toggleSidebar) api to control the sidebar, but we export a trigger button to make UI use cases easier.
+You can use the [`ref.toggleSidebar({ name: "custom" })`](/docs/@excalidraw/excalidraw/api/props/ref#toggleSidebar) api to control the sidebar, but we export a trigger button to make UI use cases easier.

 ## Example

--- a/dev-docs/docs/@excalidraw/excalidraw/api/excalidraw-element-skeleton.mdx
+++ b/dev-docs/docs/@excalidraw/excalidraw/api/excalidraw-element-skeleton.mdx
@@ -10,17 +10,13 @@ The [`ExcalidrawElementSkeleton`](https://github.com/excalidraw/excalidraw/blob/

 **_Signature_**

-```ts
-convertToExcalidrawElements(
-  elements: ExcalidrawElementSkeleton,
-  opts?: { regenerateIds: boolean }
-): ExcalidrawElement[]
-```
-
-| Name | Type | Default | Description |
-| --- | --- | --- | --- |
-| `elements` | [ExcalidrawElementSkeleton](https://github.com/excalidraw/excalidraw/blob/master/src/data/transform.ts#L137) |  | The Excalidraw element Skeleton which needs to be converted to Excalidraw elements. |
-| `opts` | `{ regenerateIds: boolean }` | ` {regenerateIds: true}` | By default `id` will be regenerated for all the elements irrespective of whether you pass the `id` so if you don't want the ids to regenerated, you can set this attribute to `false`. |
+<pre>
+  convertToExcalidrawElements(elements:{" "}
+  <a href="https://github.com/excalidraw/excalidraw/blob/master/src/data/transform.ts#L133">
+    ExcalidrawElementSkeleton
+  </a>
+  )
+</pre>

 **_How to use_**

@@ -28,13 +24,13 @@ convertToExcalidrawElements(
 import { convertToExcalidrawElements } from "@excalidraw/excalidraw";
 ```

-This function converts the Excalidraw Element Skeleton to excalidraw elements which could be then rendered on the canvas. Hence calling this function is necessary before passing it to APIs like [`initialData`](https://docs.excalidraw.com/docs/@excalidraw/excalidraw/api/props/initialdata), [`updateScene`](https://docs.excalidraw.com/docs/@excalidraw/excalidraw/api/props/excalidraw-api#updatescene) if you are using the Skeleton API
+This function converts the Excalidraw Element Skeleton to excalidraw elements which could be then rendered on the canvas. Hence calling this function is necessary before passing it to APIs like [`initialData`](https://docs.excalidraw.com/docs/@excalidraw/excalidraw/api/props/initialdata), [`updateScene`](https://docs.excalidraw.com/docs/@excalidraw/excalidraw/api/props/ref#updatescene) if you are using the Skeleton API

 ## Supported Features

 ### Rectangle, Ellipse, and Diamond

-To create these shapes you need to pass its `type` and `x` and `y` coordinates for position. The rest of the attributes are optional\_.
+To create these shapes you need to pass its `type` and `x` and `y` coordinates for position. The rest of the attributes are optional_.

 For the Skeleton API to work, `convertToExcalidrawElements` needs to be called before passing it to Excalidraw Component via initialData, updateScene or any such API.

@@ -431,45 +427,3 @@ convertToExcalidrawElements([
 ```

 ![image](https://github.com/excalidraw/excalidraw/assets/11256141/a8b047c8-2eed-4aea-82a2-e1e6bbddb8d4)
-
-### Frames
-
-To create a frame, you need to pass `type`, `children` (list of Excalidraw element ids). The rest of the attributes are optional.
-
-```ts
-{
-  type: "frame";
-  children: readonly ExcalidrawElement["id"][];
-  name?: string;
- } & Partial<ExcalidrawFrameElement>);
-```
-
-```ts
-convertToExcalidrawElements([
-  {
-    "type": "rectangle",
-    "x": 10,
-    "y": 10,
-    "strokeWidth": 2,
-    "id": "1"
-  },
-  {
-    "type": "diamond",
-    "x": 120,
-    "y": 20,
-    "backgroundColor": "#fff3bf",
-    "strokeWidth": 2,
-    "label": {
-      "text": "HELLO EXCALIDRAW",
-      "strokeColor": "#099268",
-      "fontSize": 30
-    },
-    "id": "2"
-  },
-  {
-    "type": "frame",
-    "children": ["1", "2"],
-    "name": "My frame"
-  }]
-}
-```
--- a/dev-docs/docs/@excalidraw/excalidraw/api/props/props.mdx
+++ b/dev-docs/docs/@excalidraw/excalidraw/api/props/props.mdx
@@ -1,11 +1,11 @@
 # Props

-All `props` are _optional_.
+All `props` are *optional*.

 | Name | Type | Default | Description |
 | --- | --- | --- | --- |
-| [`initialData`](/docs/@excalidraw/excalidraw/api/props/initialdata) | `object` &#124; `null` &#124; <code>Promise<object &#124; null></code> | `null` | The initial data with which app loads. |
-| [`excalidrawAPI`](/docs/@excalidraw/excalidraw/api/props/excalidraw-api) | `function` | _ | Callback triggered with the excalidraw api once rendered |
+| [`initialData`](/docs/@excalidraw/excalidraw/api/props/initialdata) |  `object` &#124; `null` &#124; <code>Promise<object &#124; null></code> | `null` | The initial data with which app loads. |
+| [`ref`](/docs/@excalidraw/excalidraw/api/props/ref) | `object` | _ | `Ref` to be passed to Excalidraw |
 | [`isCollaborating`](#iscollaborating) | `boolean` | _ | This indicates if the app is in `collaboration` mode |
 | [`onChange`](#onchange) | `function` | _ | This callback is triggered whenever the component updates due to any change. This callback will receive the excalidraw `elements` and the current `app state`. |
 | [`onPointerUpdate`](#onpointerupdate) | `function` | _ | Callback triggered when mouse pointer is updated. |
@@ -37,7 +37,7 @@ Beyond attributes that Excalidraw elements already support, you can store `custo

 You can use this to add any extra information you need to keep track of.

-You can add `customData` to elements when passing them as [`initialData`](/docs/@excalidraw/excalidraw/api/props/initialdata), or using [`updateScene`](/docs/@excalidraw/excalidraw/api/props/excalidraw-api#updatescene) / [`updateLibrary`](/docs/@excalidraw/excalidraw/api/props/excalidraw-api#updatelibrary) afterwards.
+You can add `customData` to elements when passing them as [`initialData`](/docs/@excalidraw/excalidraw/api/props/initialdata), or using [`updateScene`](/docs/@excalidraw/excalidraw/api/props/ref#updatescene) / [`updateLibrary`](/docs/@excalidraw/excalidraw/api/props/ref#updatelibrary) afterwards.

 ```js showLineNumbers
 {
@@ -93,16 +93,8 @@ This callback is triggered when mouse pointer is updated.

 This prop if passed will be triggered on pointer down events and has the below signature.

-
 <pre>
-(activeTool:{" "}
-  <a href="https://github.com/excalidraw/excalidraw/blob/master/src/types.ts#L115">
-    {" "}
-    AppState["activeTool"]
-  </a>
-  , pointerDownState: <a href="https://github.com/excalidraw/excalidraw/blob/master/src/types.ts#L424">
-    PointerDownState
-  </a>) => void
+(activeTool: <a href="https://github.com/excalidraw/excalidraw/blob/master/src/types.ts#L115"> AppState["activeTool"]</a>, pointerDownState: <a href="https://github.com/excalidraw/excalidraw/blob/master/src/types.ts#L424">PointerDownState</a>) => void
 </pre>

 ### onScrollChange
@@ -118,11 +110,7 @@ This prop if passed will be triggered when canvas is scrolled and has the below
 This callback is triggered if passed when something is pasted into the scene. You can use this callback in case you want to do something additional when the paste event occurs.

 <pre>
-  (data:{" "}
-  <a href="https://github.com/excalidraw/excalidraw/blob/master/src/clipboard.ts#L18">
-    ClipboardData
-  </a>
-  , event: ClipboardEvent &#124; null) => boolean
+(data: <a href="https://github.com/excalidraw/excalidraw/blob/master/src/clipboard.ts#L18">ClipboardData</a>, event: ClipboardEvent &#124; null) => boolean
 </pre>

 This callback must return a `boolean` value or a [promise](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise/Promise) which resolves to a boolean value.
@@ -148,11 +136,8 @@ It is invoked with empty items when user clears the library. You can use this ca
 This prop if passed will be triggered when clicked on `link`. To handle the redirect yourself (such as when using your own router for internal links), you must call `event.preventDefault()`.

 <pre>
-  (element:{" "}
-  <a href="https://github.com/excalidraw/excalidraw/blob/master/src/element/types.ts#L114">
-    ExcalidrawElement
-  </a>
-  , event: CustomEvent&lt;&#123; nativeEvent: MouseEvent }&gt;) => void
+(element: <a href="https://github.com/excalidraw/excalidraw/blob/master/src/element/types.ts#L114">ExcalidrawElement</a>, 
+ event: CustomEvent&lt;&#123; nativeEvent: MouseEvent }&gt;) => void
 </pre>

 Example:
@@ -195,30 +180,30 @@ import { defaultLang, languages } from "@excalidraw/excalidraw";

 ### viewModeEnabled

-This prop indicates whether the app is in `view mode`. When supplied, the value takes precedence over _intialData.appState.viewModeEnabled_, the `view mode` will be fully controlled by the host app, and users won't be able to toggle it from within the app.
+This prop indicates whether the app is in `view mode`. When supplied, the value takes precedence over *intialData.appState.viewModeEnabled*, the `view mode` will be fully controlled by the host app, and users won't be able to toggle it from within the app.

 ### zenModeEnabled

-This prop indicates whether the app is in `zen mode`. When supplied, the value takes precedence over _intialData.appState.zenModeEnabled_, the `zen mode` will be fully controlled by the host app, and users won't be able to toggle it from within the app.
+This prop indicates whether the app is in `zen mode`. When supplied, the value takes precedence over *intialData.appState.zenModeEnabled*, the `zen mode` will be fully controlled by the host app, and users won't be able to toggle it from within the app.

 ### gridModeEnabled

-This prop indicates whether the shows the grid. When supplied, the value takes precedence over _intialData.appState.gridModeEnabled_, the grid will be fully controlled by the host app, and users won't be able to toggle it from within the app.
+This prop indicates whether the shows the grid. When supplied, the value takes precedence over *intialData.appState.gridModeEnabled*, the grid will be fully controlled by the host app, and users won't be able to toggle it from within the app.

 ### libraryReturnUrl

 If supplied, this URL will be used when user tries to install a library from [libraries.excalidraw.com](https://libraries.excalidraw.com).  
-Defaults to _window.location.origin + window.location.pathname_. To install the libraries in the same tab from which it was opened, you need to set `window.name` (to any alphanumeric string) — if it's not set it will open in a new tab.
+Defaults to *window.location.origin + window.location.pathname*. To install the libraries in the same tab from which it was opened, you need to set `window.name` (to any alphanumeric string) — if it's not set it will open in a new tab.

 ### theme

-This prop controls Excalidraw's theme. When supplied, the value takes precedence over _intialData.appState.theme_, the theme will be fully controlled by the host app, and users won't be able to toggle it from within the app unless _UIOptions.canvasActions.toggleTheme_ is set to `true`, in which case the `theme` prop will control Excalidraw's default theme with ability to allow theme switching (you must take care of updating the `theme` prop when you detect a change to `appState.theme` from the [onChange](#onchange) callback).
+This prop controls Excalidraw's theme. When supplied, the value takes precedence over *intialData.appState.theme*, the theme will be fully controlled by the host app, and users won't be able to toggle it from within the app unless *UIOptions.canvasActions.toggleTheme* is set to `true`, in which case the `theme` prop will control Excalidraw's default theme with ability to allow theme switching (you must take care of updating the `theme` prop when you detect a change to `appState.theme` from the [onChange](#onchange) callback).

 You can use [`THEME`](/docs/@excalidraw/excalidraw/api/utils#theme) to specify the theme.

 ### name

-This prop sets the `name` of the drawing which will be used when exporting the drawing. When supplied, the value takes precedence over _intialData.appState.name_, the `name` will be fully controlled by host app and the users won't be able to edit from within Excalidraw.
+This prop sets the `name` of the drawing which will be used when exporting the drawing. When supplied, the value takes precedence over *intialData.appState.name*, the `name` will be fully controlled by host app and the users won't be able to edit from within Excalidraw.


 ### detectScroll
@@ -251,4 +236,4 @@ validateEmbeddable?: boolean | string[] | RegExp | RegExp[] | ((link: string) =>

 This is an optional property. By default we support a handful of well-known sites. You may allow additional sites or disallow the default ones by supplying a custom validator. If you pass `true`, all URLs will be allowed. You can also supply a list of hostnames, RegExp (or list of RegExp objects), or a function. If the function returns `undefined`, the built-in validator will be used.

-Supplying a list of hostnames (with or without `www.`) is the preferred way to allow a specific list of domains.
+Supplying a list of hostnames (with or without `www.`) is the preferred way to allow a specific list of domains.
--- a/dev-docs/docs/@excalidraw/excalidraw/api/props/excalidraw-api.mdx
+++ b/dev-docs/docs/@excalidraw/excalidraw/api/props/excalidraw-api.mdx
@@ -1,28 +1,29 @@
-# excalidrawAPI
+# ref

 <pre>
-  (api:{" "}
-  <a href="https://github.com/excalidraw/excalidraw/blob/master/src/types.ts#L616">
-    ExcalidrawAPI
-  </a>
-  ) => void;
+  <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>

-Once the callback is triggered, you will need to store the api in state to access it later.
-
-```jsx showLineNumbers
-export default function App() {
-  const [excalidrawAPI, setExcalidrawAPI] = useState(null);
-  return <Excalidraw excalidrawAPI={{(api)=> setExcalidrawAPI(api)}} />;
-}
-```
-
-You can use this prop when you want to access some [Excalidraw APIs](https://github.com/excalidraw/excalidraw/blob/master/src/types.ts#L616). We expose the below APIs :point_down:
+You can pass a `ref` when you want to access some excalidraw APIs. We expose the below APIs:

 | API | Signature | Usage |
 | --- | --- | --- |
+| ready | `boolean` | This is set to true once Excalidraw is rendered |
+| [readyPromise](#readypromise) | `function` | This promise will be resolved with the api once excalidraw has rendered. This will be helpful when you want do some action on the host app once this promise resolves. For this to work you will have to pass ref as shown [here](#readypromise) |
 | [updateScene](#updatescene) | `function` | updates the scene with the sceneData |
-| [updateLibrary](#updatelibrary) | `function` | updates the scene with the sceneData |
+| [updateLibrary](#updatelibrary) | `function` | updates the the library |
 | [addFiles](#addfiles) | `function` | add files data to the appState |
 | [resetScene](#resetscene) | `function` | Resets the scene. If `resetLoadingState` is passed as true then it will also force set the loading state to false. |
 | [getSceneElementsIncludingDeleted](#getsceneelementsincludingdeleted) | `function` | Returns all the elements including the deleted in the scene |
@@ -38,15 +39,54 @@ You can use this prop when you want to access some [Excalidraw APIs](https://git
 | [setCursor](#setcursor) | `function` | This API can be used to set customise the mouse cursor on the canvas |
 | [resetCursor](#resetcursor) | `function` | This API can be used to reset to default mouse cursor on the canvas |
 | [toggleMenu](#togglemenu) | `function` | Toggles specific menus on/off |
-| [onChange](#onChange) | `function` | Subscribes to change events |
-| [onPointerDown](#onPointerDown) | `function` | Subscribes to `pointerdown` events |
-| [onPointerUp](#onPointerUp) | `function` | Subscribes to `pointerup` events |

-:::info The `Ref` support has been removed in v0.17.0 so if you are using refs, please update the integration to use the `excalidrawAPI`.
+## readyPromise

-Additionally `ready` and `readyPromise` from the API have been discontinued. These APIs were found to be superfluous, and as part of the effort to streamline the APIs and maintain simplicity, they were removed in version v0.17.0.
+<pre>
+  const excalidrawRef = &#123; current:&#123; readyPromise:
+  <a href="https://github.com/excalidraw/excalidraw/blob/master/src/utils.ts#L460">
+    &nbsp;resolvablePromise
+  </a>
+  &nbsp;&#125; &#125;
+</pre>

-:::
+Since plain object is passed as a `ref`, the `readyPromise` is resolved as soon as the component is mounted. Most of the time you will not need this unless you have a specific use case where you can't pass the `ref` in the react way and want to do some action on the host when this promise resolves.
+
+```jsx showLineNumbers
+const resolvablePromise = () => {
+  let resolve;
+  let reject;
+  const promise = new Promise((_resolve, _reject) => {
+    resolve = _resolve;
+    reject = _reject;
+  });
+  promise.resolve = resolve;
+  promise.reject = reject;
+  return promise;
+};
+
+const App = () => {
+  const excalidrawRef = useMemo(
+    () => ({
+      current: {
+        readyPromise: resolvablePromise(),
+      },
+    }),
+    [],
+  );
+
+  useEffect(() => {
+    excalidrawRef.current.readyPromise.then((api) => {
+      console.log("loaded", api);
+    });
+  }, [excalidrawRef]);
+  return (
+    <div style={{ height: "500px" }}>
+      <Excalidraw ref={excalidrawRef} />
+    </div>
+  );
+};
+```

 ## updateScene

@@ -347,25 +387,14 @@ 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.

-```ts
-(
-  tool: (
-    | (
-        | { type: Exclude<ToolType, "image"> }
-        | {
-            type: Extract<ToolType, "image">;
-            insertOnCanvasDirectly?: boolean;
-          }
-      )
-    | { type: "custom"; customType: string }
-  ) & { locked?: boolean },
-) => {};
-```
-
-| Name | Type | Default | Description |
-| --- | --- | --- | --- |
-| `type` | [ToolType](https://github.com/excalidraw/excalidraw/blob/master/src/types.ts#L91) | `selection` | The tool type which should be set as active tool. When setting `image` as active tool, the insertion onto canvas when using image tool is disabled by default, so you can enable it by setting `insertOnCanvasDirectly` to `true` |
-| `locked` | `boolean` | `false` | Indicates whether the the active tool should be locked. It behaves the same way when using the `lock` tool in the editor interface |
+<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
+</pre>

 ## setCursor

@@ -392,51 +421,3 @@ This API is especially useful when you render a custom [`<Sidebar/>`](/docs/@exc
 ```

 This API can be used to reset to default mouse cursor.
-
-## onChange
-
-```tsx
-(
-  callback: (
-    elements: readonly ExcalidrawElement[],
-    appState: AppState,
-    files: BinaryFiles,
-  ) => void
-) => () => void
-```
-
-Subscribes to change events, similar to [`props.onChange`](/docs/@excalidraw/excalidraw/api/props#onchange).
-
-Returns an unsubscribe function.
-
-## onPointerDown
-
-```tsx
-(
-  callback: (
-    activeTool: AppState["activeTool"],
-    pointerDownState: PointerDownState,
-    event: React.PointerEvent<HTMLElement>,
-  ) => void,
-) => () => void
-```
-
-Subscribes to canvas `pointerdown` events.
-
-Returns an unsubscribe function.
-
-## onPointerUp
-
-```tsx
-(
-  callback: (
-    activeTool: AppState["activeTool"],
-    pointerDownState: PointerDownState,
-    event: PointerEvent,
-  ) => void,
-) => () => void
-```
-
-Subscribes to canvas `pointerup` events.
-
-Returns an unsubscribe function.
--- a/dev-docs/docs/@excalidraw/excalidraw/api/props/ui-options.mdx
+++ b/dev-docs/docs/@excalidraw/excalidraw/api/props/ui-options.mdx
@@ -1,6 +1,6 @@
 # UIOptions

-This prop can be used to customise UI of Excalidraw. Currently we support customising [`canvasActions`](#canvasactions), [`dockedSidebarBreakpoint`](#dockedsidebarbreakpoint) [`welcomeScreen`](#welcmescreen) and [`tools`](#tools).
+This prop can be used to customise UI of Excalidraw. Currently we support customising [`canvasActions`](#canvasactions), [`dockedSidebarBreakpoint`](#dockedsidebarbreakpoint) and [`welcomeScreen`](#welcmescreen).

 <pre>
  &#123;
@@ -70,12 +70,3 @@ function App() {
  );
 }
 ```
-
-## tools
-
-This `prop ` controls the visibility of the tools in the editor.
-Currently you can control the visibility of `image` tool via this prop.
-
-| Prop | Type | Default | Description |
-| --- | --- | --- | --- |
-| image | boolean | true | Decides whether `image` tool should be visible.
--- a/dev-docs/docs/@excalidraw/excalidraw/api/utils/utils-intro.md
+++ b/dev-docs/docs/@excalidraw/excalidraw/api/utils/utils-intro.md
@@ -129,7 +129,7 @@ if (contents.type === MIME_TYPES.excalidraw) {

 <pre>
 loadSceneOrLibraryFromBlob(<br/>&nbsp;
-  blob: <a href="https://developer.mozilla.org/en-US/docs/Web/API/Blob">Blob</a>,<br/>&nbsp;
+  blob: <a href="https://developer.mozilla.org/en-US/docs/Web/API/Blob">Blob</a>,
  localAppState: <a href="https://github.com/excalidraw/excalidraw/blob/master/src/types.ts#L95">AppState</a> | null,<br/>&nbsp;
  localElements: <a href="https://github.com/excalidraw/excalidraw/blob/master/src/element/types.ts#L114">ExcalidrawElement[]</a> | null,<br/>&nbsp;
  fileHandle?: FileSystemHandle | null<br/>
@@ -164,9 +164,9 @@ import { isLinearElement } from "@excalidraw/excalidraw";

 **Signature**

-<pre>
+```tsx
 isLinearElement(elementType?: <a href="https://github.com/excalidraw/excalidraw/blob/master/src/element/types.ts#L80">ExcalidrawElement</a>): boolean
-</pre>
+```

 ### getNonDeletedElements

@@ -195,10 +195,8 @@ import { mergeLibraryItems } from "@excalidraw/excalidraw";
 **_Signature_**

 <pre>
-mergeLibraryItems(<br/>&nbsp;
-  localItems: <a href="https://github.com/excalidraw/excalidraw/blob/master/src/types.ts#L250">LibraryItems</a>,<br/>&nbsp;
-  otherItems: <a href="https://github.com/excalidraw/excalidraw/blob/master/src/types.ts#L200">LibraryItems</a><br/>
-): <a href="https://github.com/excalidraw/excalidraw/blob/master/src/types.ts#L250">LibraryItems</a>
+mergeLibraryItems(localItems: <a href="https://github.com/excalidraw/excalidraw/blob/master/src/types.ts#L250">LibraryItems</a>,<br/>&nbsp;
+ otherItems: <a href="https://github.com/excalidraw/excalidraw/blob/master/src/types.ts#L200">LibraryItems</a>) => <a href="https://github.com/excalidraw/excalidraw/blob/master/src/types.ts#L250">LibraryItems</a>
 </pre>

 ### parseLibraryTokensFromUrl
@@ -301,7 +299,7 @@ Open the `main menu` in the below example to view the footer.
 ```jsx live noInline
 const MobileFooter = ({}) => {
  const device = useDevice();
-  if (device.editor.isMobile) {
+  if (device.isMobile) {
    return (
      <Footer>
        <button
@@ -333,15 +331,14 @@ const App = () => (
 render(<App />);
 ```

-The `device` has the following `attributes`, some grouped into `viewport` and `editor` objects, per context.
+The `device` has the following `attributes`

 | Name | Type | Description |
 | --- | --- | --- |
-| `viewport.isMobile` | `boolean` | Set to `true` when viewport is in `mobile` breakpoint |
-| `viewport.isLandscape` | `boolean` | Set to `true` when the viewport is in `landscape` mode |
-| `editor.canFitSidebar` | `boolean` | Set to `true` if there's enough space to fit the `sidebar` |
-| `editor.isMobile` | `boolean` | Set to `true` when editor container is in `mobile` breakpoint |
-| `isTouchScreen` | `boolean` | Set to `true` for `touch` when touch event detected |
+| `isSmScreen` | `boolean` | Set to `true` when the device small screen is small (Width < `640px` ) |
+| `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

@@ -386,94 +383,3 @@ function App() {
  );
 }
 ```
-
-### getCommonBounds
-
-This util can be used to get the common bounds of the passed elements.
-
-**_Signature_**
-
-```ts
-getCommonBounds(
-  elements: readonly ExcalidrawElement[]
-): readonly [
-  minX: number,
-  minY: number,
-  maxX: number,
-  maxY: number,
-]
-```
-
-**_How to use_**
-
-```js
-import { getCommonBounds } from "@excalidraw/excalidraw";
-```
-
-### elementsOverlappingBBox
-
-To filter `elements` that are inside, overlap, or contain the `bounds` rectangle.
-
-The bounds check is approximate and does not precisely follow the element's shape. You can also supply `errorMargin` which effectively makes the `bounds` larger by that amount.
-
-This API has 3 `type`s of operation: `overlap`, `contain`, and `inside`:
-
- `overlap` - filters elements that are overlapping or inside bounds.
- `contain` - filters elements that are inside bounds or bounds inside elements.
- `inside` - filters elements that are inside bounds.
-
-**_Signature_**
-
-<pre>
-elementsOverlappingBBox(<br/>&nbsp;
-  elements: readonly NonDeletedExcalidrawElement[];<br/>&nbsp;
-  bounds: <a href="https://github.com/excalidraw/excalidraw/blob/9c425224c789d083bf16e0597ce4a429b9ee008e/src/element/bounds.ts#L37-L42">Bounds</a> | ExcalidrawElement;<br/>&nbsp;
-  errorMargin?: number;<br/>&nbsp;
-  type: "overlap" | "contain" | "inside";<br/>
-): NonDeletedExcalidrawElement[];
-</pre>
-
-**_How to use_**
-
-```js
-import { elementsOverlappingBBox } from "@excalidraw/excalidraw";
-```
-
-### isElementInsideBBox
-
-Lower-level API than `elementsOverlappingBBox` to check if a single `element` is inside `bounds`. If `eitherDirection=true`, returns `true` if `element` is fully inside `bounds` rectangle, or vice versa. When `false`, it returns `true` only for the former case.
-
-**_Signature_**
-
-<pre>
-isElementInsideBBox(<br/>&nbsp;
-  element: NonDeletedExcalidrawElement,<br/>&nbsp;
-  bounds: <a href="https://github.com/excalidraw/excalidraw/blob/9c425224c789d083bf16e0597ce4a429b9ee008e/src/element/bounds.ts#L37-L42">Bounds</a>,<br/>&nbsp;
-  eitherDirection = false,<br/>
-): boolean
-</pre>
-
-**_How to use_**
-
-```js
-import { isElementInsideBBox } from "@excalidraw/excalidraw";
-```
-
-### elementPartiallyOverlapsWithOrContainsBBox
-
-Checks if `element` is overlapping the `bounds` rectangle, or is fully inside.
-
-**_Signature_**
-
-<pre>
-elementPartiallyOverlapsWithOrContainsBBox(<br/>&nbsp;
-  element: NonDeletedExcalidrawElement,<br/>&nbsp;
-  bounds: <a href="https://github.com/excalidraw/excalidraw/blob/9c425224c789d083bf16e0597ce4a429b9ee008e/src/element/bounds.ts#L37-L42">Bounds</a>,<br/>
-): boolean
-</pre>
-
-**_How to use_**
-
-```js
-import { elementPartiallyOverlapsWithOrContainsBBox } from "@excalidraw/excalidraw";
-```
--- a/dev-docs/docs/@excalidraw/excalidraw/development.mdx
+++ b/dev-docs/docs/@excalidraw/excalidraw/development.mdx
@@ -43,7 +43,7 @@ Once the version is released `@excalibot` will post a comment with the release v
 To release the next stable version follow the below steps:

 ```bash
-yarn prerelease:excalidraw
+yarn prerelease version
 ```

 You need to pass the `version` for which you want to create the release. This will make the changes needed before making the release like updating `package.json`, `changelog` and more.
@@ -51,7 +51,7 @@ You need to pass the `version` for which you want to create the release. This wi
 The next step is to run the `release` script:

 ```bash
-yarn release:excalidraw
+yarn release
 ```

 This will publish the package.
--- a/dev-docs/docs/@excalidraw/excalidraw/faq.mdx
+++ b/dev-docs/docs/@excalidraw/excalidraw/faq.mdx
@@ -31,17 +31,6 @@ We strongly recommend turning it off. You can follow the steps below on how to d
 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).


-### ReferenceError: process is not defined
-
-When using `vite` or any build tools, you will have to make sure the `process` is accessible as we are accessing `process.env.IS_PREACT` to decide whether to use `preact` build.
-
-Since Vite removes env variables by default, you can update the vite config to ensure its available :point_down:
-
-```
- define: {
-    "process.env.IS_PREACT": process.env.IS_PREACT,
-  },
-```

 ## Need help?

--- a/dev-docs/docs/@excalidraw/excalidraw/integration.mdx
+++ b/dev-docs/docs/@excalidraw/excalidraw/integration.mdx
@@ -30,74 +30,25 @@ function App() {
 }
 ```

-### Next.js
+### Rendering Excalidraw only on client

 Since _Excalidraw_ doesn't support server side rendering, you should render the component once the host is `mounted`.

-Here are two ways on how you can render **Excalidraw** on **Next.js**.
-
-
-
-1. Using **Next.js Dynamic** import [Recommended].
-
-Since Excalidraw doesn't support server side rendering so you can also use `dynamic import` to render by setting `ssr` to `false`.
-
-```jsx showLineNumbers
-import dynamic from "next/dynamic";
-const Excalidraw = dynamic(
-  async () => (await import("@excalidraw/excalidraw")).Excalidraw,
-  {
-    ssr: false,
-  },
-);
-export default function App() {
-  return <Excalidraw />;
-}
-```
-
-Here is a working [demo](https://codesandbox.io/p/sandbox/excalidraw-with-next-dynamic-k8yjq2).
-
-
-2. Importing Excalidraw once **client** is rendered.
+The following workflow shows one way how to render Excalidraw on Next.js. We'll add more detailed and alternative Next.js examples, soon.

 ```jsx showLineNumbers
 import { useState, useEffect } from "react";
 export default function App() {
  const [Excalidraw, setExcalidraw] = useState(null);
  useEffect(() => {
-    import("@excalidraw/excalidraw").then((comp) =>
-      setExcalidraw(comp.Excalidraw),
-    );
+    import("@excalidraw/excalidraw").then((comp) => setExcalidraw(comp.Excalidraw));
  }, []);
  return <>{Excalidraw && <Excalidraw />}</>;
 }
 ```

-Here is a working [demo](https://codesandbox.io/p/sandbox/excalidraw-with-next-5xb3d)
-
 The `types` are available at `@excalidraw/excalidraw/types`, you can view [example for typescript](https://codesandbox.io/s/excalidraw-types-9h2dm)

-### Preact
-
-Since we support `umd` build ships with `react/jsx-runtime` and `react-dom/client` inlined with the package. This conflicts with `Preact` and hence the build doesn't work directly with `Preact`.
-
-However we have shipped a separate build for `Preact` so if you are using `Preact` you need to set `process.env.IS_PREACT` to `true` to use the `Preact` build.
-
-Once the above `env` variable is set, you will be able to use the package in `Preact` as well.
-
-:::info
-
-When using `vite` or any build tools, you will have to make sure the `process` is accessible as we are accessing `process.env.IS_PREACT` to decide whether to use `preact` build.
-
-Since Vite removes env variables by default, you can update the vite config to ensure its available :point_down:
-
-```
- define: {
-    "process.env.IS_PREACT": process.env.IS_PREACT,
-  },
-```
-::: 
-
 ## Browser

 To use it in a browser directly:
--- a/dev-docs/docs/codebase/frames.mdx
+++ b/dev-docs/docs/codebase/frames.mdx
@@ -19,4 +19,4 @@ Frames should be ordered where frame children come first, followed by the frame
 ]
 ```

-If not ordered correctly, the editor will still function, but the elements may not be rendered and clipped correctly. Further, the renderer relies on this ordering for performance optimizations.
+If not oredered correctly, the editor will still function, but the elements may not be rendered and clipped correctly. Further, the renderer relies on this ordering for performance optimizations.
--- a/dev-docs/docusaurus.config.js
+++ b/dev-docs/docusaurus.config.js
@@ -1,11 +1,6 @@
 // @ts-check
 // Note: type annotations allow type checking and IDEs autocompletion

-// Set the env variable to false so the excalidraw npm package doesn't throw
-// process undefined as docusaurus doesn't expose env variables by default
-
-process.env.IS_PREACT = "false";
-
 /** @type {import('@docusaurus/types').Config} */
 const config = {
  title: "Excalidraw developer docs",
@@ -144,15 +139,7 @@ const config = {
      },
    }),
  themes: ["@docusaurus/theme-live-codeblock"],
-  plugins: [
-    "docusaurus-plugin-sass",
-    [
-      "docusaurus2-dotenv",
-      {
-        systemvars: true,
-      },
-    ],
-  ],
+  plugins: ["docusaurus-plugin-sass"],
 };

 module.exports = config;
--- 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.17.0",
+    "@excalidraw/excalidraw": "0.15.2-eb020d0",
    "@mdx-js/react": "^1.6.22",
    "clsx": "^1.2.1",
    "docusaurus-plugin-sass": "0.2.3",
@@ -30,7 +30,6 @@
  "devDependencies": {
    "@docusaurus/module-type-aliases": "2.0.0-rc.1",
    "@tsconfig/docusaurus": "^1.0.5",
-    "docusaurus2-dotenv": "1.4.0",
    "typescript": "^4.7.4"
  },
  "browserslist": {
--- a/dev-docs/sidebars.js
+++ b/dev-docs/sidebars.js
@@ -53,7 +53,7 @@ const sidebars = {
              },
              items: [
                "@excalidraw/excalidraw/api/props/initialdata",
-                "@excalidraw/excalidraw/api/props/excalidraw-api",
+                "@excalidraw/excalidraw/api/props/ref",
                "@excalidraw/excalidraw/api/props/render-props",
                "@excalidraw/excalidraw/api/props/ui-options",
              ],
--- a/dev-docs/yarn.lock
+++ b/dev-docs/yarn.lock
@@ -1718,10 +1718,10 @@
    url-loader "^4.1.1"
    webpack "^5.73.0"

-"@excalidraw/excalidraw@0.17.0":
-  version "0.17.0"
-  resolved "https://registry.yarnpkg.com/@excalidraw/excalidraw/-/excalidraw-0.17.0.tgz#3c64aa8e36406ac171b008cfecbdce5bb0755725"
-  integrity sha512-NzP22v5xMqxYW27ZtTHhiGFe7kE8NeBk45aoeM/mDSkXiOXPDH+PcvwzHRN/Ei+Vj/0sTPHxejn8bZyRWKGjXg==
+"@excalidraw/excalidraw@0.15.2-eb020d0":
+  version "0.15.2-eb020d0"
+  resolved "https://registry.yarnpkg.com/@excalidraw/excalidraw/-/excalidraw-0.15.2-eb020d0.tgz#25bd61e6f23da7c084fb16a3e0fe0dd9ad8e6533"
+  integrity sha512-TKGLzpOVqFQcwK1GFKTDXgg1s2U6tc5KE3qXuv87osbzOtftQn3x4+VH61vwdj11l00nEN80SMdXUC43T9uJqQ==

 "@hapi/hoek@^9.0.0":
  version "9.3.0"
@@ -3567,13 +3567,6 @@ docusaurus-plugin-sass@0.2.3:
  dependencies:
    sass-loader "^10.1.1"

-docusaurus2-dotenv@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/docusaurus2-dotenv/-/docusaurus2-dotenv-1.4.0.tgz#9ab900e29de9081f9f1f28f7224ff63760385641"
-  integrity sha512-iWqem5fnBAyeBBtX75Fxp71uUAnwFaXzOmade8zAhN4vL3RG9m27sLSRwjJGVVgIkEo3esjGyCcTGTiCjfi+sg==
-  dependencies:
-    dotenv-webpack "1.7.0"
-
 dom-converter@^0.2.0:
  version "0.2.0"
  resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768"
@@ -3659,25 +3652,6 @@ dot-prop@^5.2.0:
  dependencies:
    is-obj "^2.0.0"

-dotenv-defaults@^1.0.2:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/dotenv-defaults/-/dotenv-defaults-1.1.1.tgz#032c024f4b5906d9990eb06d722dc74cc60ec1bd"
-  integrity sha512-6fPRo9o/3MxKvmRZBD3oNFdxODdhJtIy1zcJeUSCs6HCy4tarUpd+G67UTU9tF6OWXeSPqsm4fPAB+2eY9Rt9Q==
-  dependencies:
-    dotenv "^6.2.0"
-
-dotenv-webpack@1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/dotenv-webpack/-/dotenv-webpack-1.7.0.tgz#4384d8c57ee6f405c296278c14a9f9167856d3a1"
-  integrity sha512-wwNtOBW/6gLQSkb8p43y0Wts970A3xtNiG/mpwj9MLUhtPCQG6i+/DSXXoNN7fbPCU/vQ7JjwGmgOeGZSSZnsw==
-  dependencies:
-    dotenv-defaults "^1.0.2"
-
-dotenv@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz#941c0410535d942c8becf28d3f357dbd9d476064"
-  integrity sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==
-
 duplexer3@^0.1.4:
  version "0.1.5"
  resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.5.tgz#0b5e4d7bad5de8901ea4440624c8e1d20099217e"
--- a/excalidraw-app/index.tsx
+++ b/excalidraw-app/index.tsx
@@ -691,7 +691,7 @@ const ExcalidrawWrapper = () => {
      })}
    >
      <Excalidraw
-        excalidrawAPI={excalidrawRefCallback}
+        ref={excalidrawRefCallback}
        onChange={onChange}
        initialData={initialStatePromiseRef.current.promise}
        isCollaborating={isCollaborating}
--- a/excalidraw-app/tests/MobileMenu.test.tsx
+++ b/excalidraw-app/tests/MobileMenu.test.tsx
@@ -17,10 +17,8 @@ describe("Test MobileMenu", () => {

  beforeEach(async () => {
    await render(<ExcalidrawApp />);
-    // @ts-ignore
-    h.app.refreshViewportBreakpoints();
-    // @ts-ignore
-    h.app.refreshEditorBreakpoints();
+    //@ts-ignore
+    h.app.refreshDeviceState(h.app.excalidrawContainerRef.current!);
  });

  afterAll(() => {
@@ -30,15 +28,11 @@ describe("Test MobileMenu", () => {
  it("should set device correctly", () => {
    expect(h.app.device).toMatchInlineSnapshot(`
      {
-        "editor": {
-          "canFitSidebar": false,
-          "isMobile": true,
-        },
+        "canDeviceFitSidebar": false,
+        "isLandscape": true,
+        "isMobile": true,
+        "isSmScreen": false,
        "isTouchScreen": false,
-        "viewport": {
-          "isLandscape": false,
-          "isMobile": true,
-        },
      }
    `);
  });
--- a/excalidraw-app/tests/reconciliation.test.ts
+++ b/excalidraw-app/tests/reconciliation.test.ts
@@ -8,7 +8,6 @@ import {
 } from "../../excalidraw-app/collab/reconciliation";
 import { randomInteger } from "../../src/random";
 import { AppState } from "../../src/types";
-import { cloneJSON } from "../../src/utils";

 type Id = string;
 type ElementLike = {
@@ -94,6 +93,8 @@ const cleanElements = (elements: ReconciledElements) => {
  });
 };

+const cloneDeep = (data: any) => JSON.parse(JSON.stringify(data));
+
 const test = <U extends `${string}:${"L" | "R"}`>(
  local: (Id | ElementLike)[],
  remote: (Id | ElementLike)[],
@@ -114,15 +115,15 @@ const test = <U extends `${string}:${"L" | "R"}`>(
    "remote reconciliation",
  );

-  const __local = cleanElements(cloneJSON(_remote) as ReconciledElements);
-  const __remote = addParents(cleanElements(cloneJSON(remoteReconciled)));
+  const __local = cleanElements(cloneDeep(_remote));
+  const __remote = addParents(cleanElements(cloneDeep(remoteReconciled)));
  if (bidirectional) {
    try {
      expect(
        cleanElements(
          reconcileElements(
-            cloneJSON(__local),
-            cloneJSON(__remote),
+            cloneDeep(__local),
+            cloneDeep(__remote),
            {} as AppState,
          ),
        ),
--- a/package.json
+++ b/package.json
@@ -20,9 +20,9 @@
  },
  "dependencies": {
    "@braintree/sanitize-url": "6.0.2",
-    "@excalidraw/laser-pointer": "1.2.0",
    "@excalidraw/mermaid-to-excalidraw": "0.1.2",
-    "@excalidraw/random-username": "1.1.0",
+    "@excalidraw/laser-pointer": "1.2.0",
+    "@excalidraw/random-username": "1.0.0",
    "@radix-ui/react-popover": "1.0.3",
    "@radix-ui/react-tabs": "1.0.2",
    "@sentry/browser": "6.2.5",
@@ -96,7 +96,7 @@
    "vitest-canvas-mock": "0.3.2"
  },
  "engines": {
-    "node": "18.0.0 - 20.x.x"
+    "node": ">=18.0.0"
  },
  "homepage": ".",
  "name": "excalidraw",
@@ -128,8 +128,8 @@
    "test:coverage:watch": "vitest --coverage --watch",
    "test:ui": "yarn test --ui --coverage.enabled=true",
    "autorelease": "node scripts/autorelease.js",
-    "prerelease:excalidraw": "node scripts/prerelease.js",
+    "prerelease": "node scripts/prerelease.js",
    "build:preview": "yarn build && vite preview --port 5000",
-    "release:excalidraw": "node scripts/release.js"
+    "release": "node scripts/release.js"
  }
 }
--- a/src/actions/actionAlign.tsx
+++ b/src/actions/actionAlign.tsx
@@ -9,7 +9,6 @@ import {
 } from "../components/icons";
 import { ToolButton } from "../components/ToolButton";
 import { getNonDeletedElements } from "../element";
-import { isFrameLikeElement } from "../element/typeChecks";
 import { ExcalidrawElement } from "../element/types";
 import { updateFrameMembershipOfSelectedElements } from "../frame";
 import { t } from "../i18n";
@@ -29,7 +28,7 @@ const alignActionsPredicate = (
  return (
    selectedElements.length > 1 &&
    // TODO enable aligning frames when implemented properly
-    !selectedElements.some((el) => isFrameLikeElement(el))
+    !selectedElements.some((el) => el.type === "frame")
  );
 };

--- a/src/actions/actionCanvas.tsx
+++ b/src/actions/actionCanvas.tsx
@@ -265,21 +265,7 @@ export const zoomToFit = ({
      30.0,
    ) as NormalizedZoomValue;

-    let appStateWidth = appState.width;
-
-    if (appState.openSidebar) {
-      const sidebarDOMElem = document.querySelector(
-        ".sidebar",
-      ) as HTMLElement | null;
-      const sidebarWidth = sidebarDOMElem?.offsetWidth ?? 0;
-      const isRTL = document.documentElement.getAttribute("dir") === "rtl";
-
-      appStateWidth = !isRTL
-        ? appState.width - sidebarWidth
-        : appState.width + sidebarWidth;
-    }
-
-    scrollX = (appStateWidth / 2) * (1 / newZoomValue) - centerX;
+    scrollX = (appState.width / 2) * (1 / newZoomValue) - centerX;
    scrollY = (appState.height / 2) * (1 / newZoomValue) - centerY;
  } else {
    newZoomValue = zoomValueToFitBoundsOnViewport(commonBounds, {
@@ -452,6 +438,5 @@ export const actionToggleHandTool = register({
      commitToHistory: true,
    };
  },
-  keyTest: (event) =>
-    !event.altKey && !event[KEYS.CTRL_OR_CMD] && event.key === KEYS.H,
+  keyTest: (event) => event.key === KEYS.H,
 });
--- a/src/actions/actionClipboard.tsx
+++ b/src/actions/actionClipboard.tsx
@@ -9,8 +9,8 @@ import {
  readSystemClipboard,
 } from "../clipboard";
 import { actionDeleteSelected } from "./actionDeleteSelected";
-import { exportCanvas, prepareElementsForExport } from "../data/index";
-import { isTextElement } from "../element";
+import { exportCanvas } from "../data/index";
+import { getNonDeletedElements, isTextElement } from "../element";
 import { t } from "../i18n";
 import { isFirefox } from "../constants";

@@ -122,23 +122,20 @@ export const actionCopyAsSvg = register({
        commitToHistory: false,
      };
    }
-
-    const { exportedElements, exportingFrame } = prepareElementsForExport(
-      elements,
-      appState,
-      true,
-    );
-
+    const selectedElements = app.scene.getSelectedElements({
+      selectedElementIds: appState.selectedElementIds,
+      includeBoundTextElement: true,
+      includeElementsInFrames: true,
+    });
    try {
      await exportCanvas(
        "clipboard-svg",
-        exportedElements,
+        selectedElements.length
+          ? selectedElements
+          : getNonDeletedElements(elements),
        appState,
        app.files,
-        {
-          ...appState,
-          exportingFrame,
-        },
+        appState,
      );
      return {
        commitToHistory: false,
@@ -174,17 +171,16 @@ export const actionCopyAsPng = register({
      includeBoundTextElement: true,
      includeElementsInFrames: true,
    });
-
-    const { exportedElements, exportingFrame } = prepareElementsForExport(
-      elements,
-      appState,
-      true,
-    );
    try {
-      await exportCanvas("clipboard", exportedElements, appState, app.files, {
-        ...appState,
-        exportingFrame,
-      });
+      await exportCanvas(
+        "clipboard",
+        selectedElements.length
+          ? selectedElements
+          : getNonDeletedElements(elements),
+        appState,
+        app.files,
+        appState,
+      );
      return {
        appState: {
          ...appState,
--- a/src/actions/actionDeleteSelected.tsx
+++ b/src/actions/actionDeleteSelected.tsx
@@ -10,7 +10,7 @@ import { newElementWith } from "../element/mutateElement";
 import { getElementsInGroup } from "../groups";
 import { LinearElementEditor } from "../element/linearElementEditor";
 import { fixBindingsAfterDeletion } from "../element/binding";
-import { isBoundToContainer, isFrameLikeElement } from "../element/typeChecks";
+import { isBoundToContainer } from "../element/typeChecks";
 import { updateActiveTool } from "../utils";
 import { TrashIcon } from "../components/icons";

@@ -20,7 +20,7 @@ const deleteSelectedElements = (
 ) => {
  const framesToBeDeleted = new Set(
    getSelectedElements(
-      elements.filter((el) => isFrameLikeElement(el)),
+      elements.filter((el) => el.type === "frame"),
      appState,
    ).map((el) => el.id),
  );
--- a/src/actions/actionDistribute.tsx
+++ b/src/actions/actionDistribute.tsx
@@ -5,7 +5,6 @@ import {
 import { ToolButton } from "../components/ToolButton";
 import { distributeElements, Distribution } from "../distribute";
 import { getNonDeletedElements } from "../element";
-import { isFrameLikeElement } from "../element/typeChecks";
 import { ExcalidrawElement } from "../element/types";
 import { updateFrameMembershipOfSelectedElements } from "../frame";
 import { t } from "../i18n";
@@ -20,7 +19,7 @@ const enableActionGroup = (appState: AppState, app: AppClassProperties) => {
  return (
    selectedElements.length > 1 &&
    // TODO enable distributing frames when implemented properly
-    !selectedElements.some((el) => isFrameLikeElement(el))
+    !selectedElements.some((el) => el.type === "frame")
  );
 };

--- a/src/actions/actionDuplicateSelection.tsx
+++ b/src/actions/actionDuplicateSelection.tsx
@@ -20,12 +20,12 @@ import {
  bindTextToShapeAfterDuplication,
  getBoundTextElement,
 } from "../element/textElement";
-import { isBoundToContainer, isFrameLikeElement } from "../element/typeChecks";
+import { isBoundToContainer, isFrameElement } from "../element/typeChecks";
 import { normalizeElementOrder } from "../element/sortElements";
 import { DuplicateIcon } from "../components/icons";
 import {
  bindElementsToFramesAfterDuplication,
-  getFrameChildren,
+  getFrameElements,
 } from "../frame";
 import {
  excludeElementsInFramesFromSelection,
@@ -140,11 +140,11 @@ const duplicateElements = (
    }

    const boundTextElement = getBoundTextElement(element);
-    const isElementAFrameLike = isFrameLikeElement(element);
+    const isElementAFrame = isFrameElement(element);

    if (idsOfElementsToDuplicate.get(element.id)) {
      // if a group or a container/bound-text or frame, duplicate atomically
-      if (element.groupIds.length || boundTextElement || isElementAFrameLike) {
+      if (element.groupIds.length || boundTextElement || isElementAFrame) {
        const groupId = getSelectedGroupForElement(appState, element);
        if (groupId) {
          // TODO:
@@ -154,8 +154,8 @@ const duplicateElements = (
            sortedElements,
            groupId,
          ).flatMap((element) =>
-            isFrameLikeElement(element)
-              ? [...getFrameChildren(elements, element.id), element]
+            isFrameElement(element)
+              ? [...getFrameElements(elements, element.id), element]
              : [element],
          );

@@ -180,8 +180,8 @@ const duplicateElements = (
          );
          continue;
        }
-        if (isElementAFrameLike) {
-          const elementsInFrame = getFrameChildren(sortedElements, element.id);
+        if (isElementAFrame) {
+          const elementsInFrame = getFrameElements(sortedElements, element.id);

          elementsWithClones.push(
            ...markAsProcessed([
--- a/src/actions/actionElementLock.ts
+++ b/src/actions/actionElementLock.ts
@@ -1,5 +1,4 @@
 import { newElementWith } from "../element/mutateElement";
-import { isFrameLikeElement } from "../element/typeChecks";
 import { ExcalidrawElement } from "../element/types";
 import { KEYS } from "../keys";
 import { arrayToMap } from "../utils";
@@ -52,7 +51,7 @@ export const actionToggleElementLock = register({
      selectedElementIds: appState.selectedElementIds,
      includeBoundTextElement: false,
    });
-    if (selected.length === 1 && !isFrameLikeElement(selected[0])) {
+    if (selected.length === 1 && selected[0].type !== "frame") {
      return selected[0].locked
        ? "labels.elementLock.unlock"
        : "labels.elementLock.lock";
--- a/src/actions/actionExport.tsx
+++ b/src/actions/actionExport.tsx
@@ -217,7 +217,7 @@ export const actionSaveFileToDisk = register({
      icon={saveAs}
      title={t("buttons.saveAs")}
      aria-label={t("buttons.saveAs")}
-      showAriaLabel={useDevice().editor.isMobile}
+      showAriaLabel={useDevice().isMobile}
      hidden={!nativeFileSystemSupported}
      onClick={() => updateData(null)}
      data-testid="save-as-button"
--- a/src/actions/actionFrame.ts
+++ b/src/actions/actionFrame.ts
@@ -1,33 +1,29 @@
 import { getNonDeletedElements } from "../element";
 import { ExcalidrawElement } from "../element/types";
 import { removeAllElementsFromFrame } from "../frame";
-import { getFrameChildren } from "../frame";
+import { getFrameElements } from "../frame";
 import { KEYS } from "../keys";
 import { AppClassProperties, AppState } from "../types";
 import { updateActiveTool } from "../utils";
 import { setCursorForShape } from "../cursor";
 import { register } from "./register";
-import { isFrameLikeElement } from "../element/typeChecks";

 const isSingleFrameSelected = (appState: AppState, app: AppClassProperties) => {
  const selectedElements = app.scene.getSelectedElements(appState);

-  return (
-    selectedElements.length === 1 && isFrameLikeElement(selectedElements[0])
-  );
+  return selectedElements.length === 1 && selectedElements[0].type === "frame";
 };

 export const actionSelectAllElementsInFrame = register({
  name: "selectAllElementsInFrame",
  trackEvent: { category: "canvas" },
  perform: (elements, appState, _, app) => {
-    const selectedElement =
-      app.scene.getSelectedElements(appState).at(0) || null;
+    const selectedFrame = app.scene.getSelectedElements(appState)[0];

-    if (isFrameLikeElement(selectedElement)) {
-      const elementsInFrame = getFrameChildren(
+    if (selectedFrame && selectedFrame.type === "frame") {
+      const elementsInFrame = getFrameElements(
        getNonDeletedElements(elements),
-        selectedElement.id,
+        selectedFrame.id,
      ).filter((element) => !(element.type === "text" && element.containerId));

      return {
@@ -58,20 +54,15 @@ export const actionRemoveAllElementsFromFrame = register({
  name: "removeAllElementsFromFrame",
  trackEvent: { category: "history" },
  perform: (elements, appState, _, app) => {
-    const selectedElement =
-      app.scene.getSelectedElements(appState).at(0) || null;
+    const selectedFrame = app.scene.getSelectedElements(appState)[0];

-    if (isFrameLikeElement(selectedElement)) {
+    if (selectedFrame && selectedFrame.type === "frame") {
      return {
-        elements: removeAllElementsFromFrame(
-          elements,
-          selectedElement,
-          appState,
-        ),
+        elements: removeAllElementsFromFrame(elements, selectedFrame, appState),
        appState: {
          ...appState,
          selectedElementIds: {
-            [selectedElement.id]: true,
+            [selectedFrame.id]: true,
          },
        },
        commitToHistory: true,
--- a/src/actions/actionGroup.tsx
+++ b/src/actions/actionGroup.tsx
@@ -17,13 +17,16 @@ import {
 import { getNonDeletedElements } from "../element";
 import { randomId } from "../random";
 import { ToolButton } from "../components/ToolButton";
-import { ExcalidrawElement, ExcalidrawTextElement } from "../element/types";
+import {
+  ExcalidrawElement,
+  ExcalidrawFrameElement,
+  ExcalidrawTextElement,
+} from "../element/types";
 import { AppClassProperties, AppState } from "../types";
 import { isBoundToContainer } from "../element/typeChecks";
 import {
  getElementsInResizingFrame,
-  getFrameLikeElements,
-  groupByFrameLikes,
+  groupByFrames,
  removeElementsFromFrame,
  replaceAllElementsInFrame,
 } from "../frame";
@@ -102,7 +105,7 @@ export const actionGroup = register({
    // when it happens, we want to remove elements that are in the frame
    // and are going to be grouped from the frame (mouthful, I know)
    if (groupingElementsFromDifferentFrames) {
-      const frameElementsMap = groupByFrameLikes(selectedElements);
+      const frameElementsMap = groupByFrames(selectedElements);

      frameElementsMap.forEach((elementsInFrame, frameId) => {
        nextElements = removeElementsFromFrame(
@@ -187,6 +190,13 @@ export const actionUngroup = register({

    let nextElements = [...elements];

+    const selectedElements = app.scene.getSelectedElements(appState);
+    const frames = selectedElements
+      .filter((element) => element.frameId)
+      .map((element) =>
+        app.scene.getElement(element.frameId!),
+      ) as ExcalidrawFrameElement[];
+
    const boundTextElementIds: ExcalidrawTextElement["id"][] = [];
    nextElements = nextElements.map((element) => {
      if (isBoundToContainer(element)) {
@@ -211,19 +221,7 @@ export const actionUngroup = register({
      null,
    );

-    const selectedElements = app.scene.getSelectedElements(appState);
-
-    const selectedElementFrameIds = new Set(
-      selectedElements
-        .filter((element) => element.frameId)
-        .map((element) => element.frameId!),
-    );
-
-    const targetFrames = getFrameLikeElements(elements).filter((frame) =>
-      selectedElementFrameIds.has(frame.id),
-    );
-
-    targetFrames.forEach((frame) => {
+    frames.forEach((frame) => {
      if (frame) {
        nextElements = replaceAllElementsInFrame(
          nextElements,
--- a/src/actions/actionMenu.tsx
+++ b/src/actions/actionMenu.tsx
@@ -3,6 +3,7 @@ import { ToolButton } from "../components/ToolButton";
 import { t } from "../i18n";
 import { showSelectedShapeActions, getNonDeletedElements } from "../element";
 import { register } from "./register";
+import { allowFullScreen, exitFullScreen, isFullScreen } from "../utils";
 import { KEYS } from "../keys";

 export const actionToggleCanvasMenu = register({
@@ -51,23 +52,35 @@ export const actionToggleEditMenu = register({
  ),
 });

+export const actionFullScreen = register({
+  name: "toggleFullScreen",
+  viewMode: true,
+  trackEvent: { category: "canvas", predicate: (appState) => !isFullScreen() },
+  perform: () => {
+    if (!isFullScreen()) {
+      allowFullScreen();
+    }
+    if (isFullScreen()) {
+      exitFullScreen();
+    }
+    return {
+      commitToHistory: false,
+    };
+  },
+});
+
 export const actionShortcuts = register({
  name: "toggleShortcuts",
  viewMode: true,
  trackEvent: { category: "menu", action: "toggleHelpDialog" },
  perform: (_elements, appState, _, { focusContainer }) => {
-    if (appState.openDialog?.name === "help") {
+    if (appState.openDialog === "help") {
      focusContainer();
    }
    return {
      appState: {
        ...appState,
-        openDialog:
-          appState.openDialog?.name === "help"
-            ? null
-            : {
-                name: "help",
-              },
+        openDialog: appState.openDialog === "help" ? null : "help",
      },
      commitToHistory: false,
    };
--- a/src/actions/actionProperties.tsx
+++ b/src/actions/actionProperties.tsx
@@ -328,7 +328,7 @@ export const actionChangeFillStyle = register({
    trackEvent(
      "element",
      "changeFillStyle",
-      `${value} (${app.device.editor.isMobile ? "mobile" : "desktop"})`,
+      `${value} (${app.device.isMobile ? "mobile" : "desktop"})`,
    );
    return {
      elements: changeProperty(elements, appState, (el) =>
--- a/src/actions/actionStyles.ts
+++ b/src/actions/actionStyles.ts
@@ -20,11 +20,9 @@ import {
  hasBoundTextElement,
  canApplyRoundnessTypeToElement,
  getDefaultRoundnessTypeForElement,
-  isFrameLikeElement,
-  isArrowElement,
+  isFrameElement,
 } from "../element/typeChecks";
 import { getSelectedElements } from "../scene";
-import { ExcalidrawTextElement } from "../element/types";

 // `copiedStyles` is exported only for tests.
 export let copiedStyles: string = "{}";
@@ -101,19 +99,16 @@ export const actionPasteStyles = register({

          if (isTextElement(newElement)) {
            const fontSize =
-              (elementStylesToCopyFrom as ExcalidrawTextElement).fontSize ||
-              DEFAULT_FONT_SIZE;
+              elementStylesToCopyFrom?.fontSize || DEFAULT_FONT_SIZE;
            const fontFamily =
-              (elementStylesToCopyFrom as ExcalidrawTextElement).fontFamily ||
-              DEFAULT_FONT_FAMILY;
+              elementStylesToCopyFrom?.fontFamily || DEFAULT_FONT_FAMILY;
            newElement = newElementWith(newElement, {
              fontSize,
              fontFamily,
              textAlign:
-                (elementStylesToCopyFrom as ExcalidrawTextElement).textAlign ||
-                DEFAULT_TEXT_ALIGN,
+                elementStylesToCopyFrom?.textAlign || DEFAULT_TEXT_ALIGN,
              lineHeight:
-                (elementStylesToCopyFrom as ExcalidrawTextElement).lineHeight ||
+                elementStylesToCopyFrom.lineHeight ||
                getDefaultLineHeight(fontFamily),
            });
            let container = null;
@@ -128,17 +123,14 @@ export const actionPasteStyles = register({
            redrawTextBoundingBox(newElement, container);
          }

-          if (
-            newElement.type === "arrow" &&
-            isArrowElement(elementStylesToCopyFrom)
-          ) {
+          if (newElement.type === "arrow") {
            newElement = newElementWith(newElement, {
              startArrowhead: elementStylesToCopyFrom.startArrowhead,
              endArrowhead: elementStylesToCopyFrom.endArrowhead,
            });
          }

-          if (isFrameLikeElement(element)) {
+          if (isFrameElement(element)) {
            newElement = newElementWith(newElement, {
              roundness: null,
              backgroundColor: "transparent",
--- a/src/actions/index.ts
+++ b/src/actions/index.ts
@@ -44,6 +44,7 @@ export { actionCopyStyles, actionPasteStyles } from "./actionStyles";
 export {
  actionToggleCanvasMenu,
  actionToggleEditMenu,
+  actionFullScreen,
  actionShortcuts,
 } from "./actionMenu";

--- a/src/actions/manager.tsx
+++ b/src/actions/manager.tsx
@@ -29,7 +29,7 @@ const trackAction = (
          trackEvent(
            action.trackEvent.category,
            action.trackEvent.action || action.name,
-            `${source} (${app.device.editor.isMobile ? "mobile" : "desktop"})`,
+            `${source} (${app.device.isMobile ? "mobile" : "desktop"})`,
          );
        }
      }
--- a/src/analytics.ts
+++ b/src/analytics.ts
@@ -1,7 +1,3 @@
-// place here categories that you want to track. We want to track just a
-// small subset of categories at a given time.
-const ALLOWED_CATEGORIES_TO_TRACK = ["ai"] as string[];
-
 export const trackEvent = (
  category: string,
  action: string,
@@ -9,13 +5,13 @@ export const trackEvent = (
  value?: number,
 ) => {
  try {
-    // prettier-ignore
-    if (
-      typeof window === "undefined"
-      || import.meta.env.VITE_WORKER_ID
-      // comment out to debug locally
-      || import.meta.env.PROD
-    ) {
+    // place here categories that you want to track as events
+    // KEEP IN MIND THE PRICING
+    const ALLOWED_CATEGORIES_TO_TRACK = [] as string[];
+    // Uncomment the next line to track locally
+    // console.log("Track Event", { category, action, label, value });
+
+    if (typeof window === "undefined" || import.meta.env.VITE_WORKER_ID) {
      return;
    }

@@ -23,10 +19,6 @@ export const trackEvent = (
      return;
    }

-    if (!import.meta.env.PROD) {
-      console.info("trackEvent", { category, action, label, value });
-    }
-
    if (window.sa_event) {
      window.sa_event(action, {
        category,
--- a/src/clipboard.ts
+++ b/src/clipboard.ts
@@ -9,10 +9,7 @@ import {
  EXPORT_DATA_TYPES,
  MIME_TYPES,
 } from "./constants";
-import {
-  isFrameLikeElement,
-  isInitializedImageElement,
-} from "./element/typeChecks";
+import { isInitializedImageElement } from "./element/typeChecks";
 import { deepCopyElement } from "./element/newElement";
 import { mutateElement } from "./element/mutateElement";
 import { getContainingFrame } from "./frame";
@@ -127,7 +124,7 @@ export const serializeAsClipboardJSON = ({
  files: BinaryFiles | null;
 }) => {
  const framesToCopy = new Set(
-    elements.filter((element) => isFrameLikeElement(element)),
+    elements.filter((element) => element.type === "frame"),
  );
  let foundFile = false;

--- a/src/components/Actions.tsx
+++ b/src/components/Actions.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from "react";
 import { ActionManager } from "../actions/manager";
 import { getNonDeletedElements } from "../element";
-import { ExcalidrawElement, ExcalidrawElementType } from "../element/types";
+import { ExcalidrawElement } from "../element/types";
 import { t } from "../i18n";
 import { useDevice } from "../components/App";
 import {
@@ -13,7 +13,7 @@ import {
  hasStrokeWidth,
 } from "../scene";
 import { SHAPES } from "../shapes";
-import { AppClassProperties, AppProps, UIAppState, Zoom } from "../types";
+import { AppClassProperties, UIAppState, Zoom } from "../types";
 import { capitalizeString, isTransparent } from "../utils";
 import Stack from "./Stack";
 import { ToolButton } from "./ToolButton";
@@ -36,8 +36,6 @@ import {
  frameToolIcon,
  mermaidLogoIcon,
  laserPointerToolIcon,
-  OpenAIIcon,
-  MagicIcon,
 } from "./icons";
 import { KEYS } from "../keys";

@@ -81,8 +79,7 @@ export const SelectedShapeActions = ({
  const showLinkIcon =
    targetElements.length === 1 || isSingleElementBoundContainer;

-  let commonSelectedType: ExcalidrawElementType | null =
-    targetElements[0]?.type || null;
+  let commonSelectedType: string | null = targetElements[0]?.type || null;

  for (const element of targetElements) {
    if (element.type !== commonSelectedType) {
@@ -97,8 +94,7 @@ export const SelectedShapeActions = ({
        {((hasStrokeColor(appState.activeTool.type) &&
          appState.activeTool.type !== "image" &&
          commonSelectedType !== "image" &&
-          commonSelectedType !== "frame" &&
-          commonSelectedType !== "magicframe") ||
+          commonSelectedType !== "frame") ||
          targetElements.some((element) => hasStrokeColor(element.type))) &&
          renderAction("changeStrokeColor")}
      </div>
@@ -206,8 +202,8 @@ export const SelectedShapeActions = ({
        <fieldset>
          <legend>{t("labels.actions")}</legend>
          <div className="buttonList">
-            {!device.editor.isMobile && renderAction("duplicateSelection")}
-            {!device.editor.isMobile && renderAction("deleteSelectedElements")}
+            {!device.isMobile && renderAction("duplicateSelection")}
+            {!device.isMobile && renderAction("deleteSelectedElements")}
            {renderAction("group")}
            {renderAction("ungroup")}
            {showLinkIcon && renderAction("hyperlink")}
@@ -222,12 +218,10 @@ export const ShapesSwitcher = ({
  activeTool,
  appState,
  app,
-  UIOptions,
 }: {
  activeTool: UIAppState["activeTool"];
  appState: UIAppState;
  app: AppClassProperties;
-  UIOptions: AppProps["UIOptions"];
 }) => {
  const [isExtraToolsMenuOpen, setIsExtraToolsMenuOpen] = useState(false);

@@ -238,14 +232,6 @@ export const ShapesSwitcher = ({
  return (
    <>
      {SHAPES.map(({ value, icon, key, numericKey, fillable }, index) => {
-        if (
-          UIOptions.tools?.[
-            value as Extract<typeof value, keyof AppProps["UIOptions"]["tools"]>
-          ] === false
-        ) {
-          return null;
-        }
-
        const label = t(`toolBar.${value}`);
        const letter =
          key && capitalizeString(typeof key === "string" ? key : key[0]);
@@ -335,41 +321,13 @@ export const ShapesSwitcher = ({
          >
            {t("toolBar.laser")}
          </DropdownMenu.Item>
-          <div style={{ margin: "6px 0", fontSize: 14, fontWeight: 600 }}>
-            Generate
-          </div>
          <DropdownMenu.Item
-            onSelect={() => app.setOpenDialog({ name: "mermaid" })}
+            onSelect={() => app.setOpenDialog("mermaid")}
            icon={mermaidLogoIcon}
            data-testid="toolbar-embeddable"
          >
            {t("toolBar.mermaidToExcalidraw")}
          </DropdownMenu.Item>
-
-          {app.props.aiEnabled !== false && (
-            <>
-              <DropdownMenu.Item
-                onSelect={() => app.onMagicframeToolSelect()}
-                icon={MagicIcon}
-                data-testid="toolbar-magicframe"
-              >
-                {t("toolBar.magicframe")}
-              </DropdownMenu.Item>
-              <DropdownMenu.Item
-                onSelect={() => {
-                  trackEvent("ai", "d2c-settings", "settings");
-                  app.setOpenDialog({
-                    name: "magicSettings",
-                    source: "settings",
-                  });
-                }}
-                icon={OpenAIIcon}
-                data-testid="toolbar-magicSettings"
-              >
-                {t("toolBar.magicSettings")}
-              </DropdownMenu.Item>
-            </>
-          )}
        </DropdownMenu.Content>
      </DropdownMenu>
    </>
--- a/src/components/App.tsx
+++ b/src/components/App.tsx
--- a/src/components/ColorPicker/ColorInput.tsx
+++ b/src/components/ColorPicker/ColorInput.tsx
@@ -98,7 +98,7 @@ export const ColorInput = ({
        }}
      />
      {/* TODO reenable on mobile with a better UX */}
-      {!device.editor.isMobile && (
+      {!device.isMobile && (
        <>
          <div
            style={{
--- a/src/components/ColorPicker/ColorPicker.tsx
+++ b/src/components/ColorPicker/ColorPicker.tsx
@@ -80,7 +80,7 @@ const ColorPickerPopupContent = ({
  );

  const { container } = useExcalidrawContainer();
-  const device = useDevice();
+  const { isMobile, isLandscape } = useDevice();

  const colorInputJSX = (
    <div>
@@ -136,16 +136,8 @@ const ColorPickerPopupContent = ({
          updateData({ openPopup: null });
          setActiveColorPickerSection(null);
        }}
-        side={
-          device.editor.isMobile && !device.viewport.isLandscape
-            ? "bottom"
-            : "right"
-        }
-        align={
-          device.editor.isMobile && !device.viewport.isLandscape
-            ? "center"
-            : "start"
-        }
+        side={isMobile && !isLandscape ? "bottom" : "right"}
+        align={isMobile && !isLandscape ? "center" : "start"}
        alignOffset={-16}
        sideOffset={20}
        style={{
--- a/src/components/Dialog.scss
+++ b/src/components/Dialog.scss
@@ -33,16 +33,14 @@
      color: var(--color-gray-40);
    }

+    @include isMobile {
+      top: 1.25rem;
+      right: 1.25rem;
+    }
+
    svg {
      width: 1.5rem;
      height: 1.5rem;
    }
  }
-
-  .Dialog--fullscreen {
-    .Dialog__close {
-      top: 1.25rem;
-      right: 1.25rem;
-    }
-  }
 }
--- a/src/components/Dialog.tsx
+++ b/src/components/Dialog.tsx
@@ -49,7 +49,7 @@ export const Dialog = (props: DialogProps) => {
  const [islandNode, setIslandNode] = useCallbackRefState<HTMLDivElement>();
  const [lastActiveElement] = useState(document.activeElement);
  const { id } = useExcalidrawContainer();
-  const isFullscreen = useDevice().viewport.isMobile;
+  const device = useDevice();

  useEffect(() => {
    if (!islandNode) {
@@ -101,9 +101,7 @@ export const Dialog = (props: DialogProps) => {

  return (
    <Modal
-      className={clsx("Dialog", props.className, {
-        "Dialog--fullscreen": isFullscreen,
-      })}
+      className={clsx("Dialog", props.className)}
      labelledBy="dialog-title"
      maxWidth={getDialogSize(props.size)}
      onCloseRequest={onClose}
@@ -121,7 +119,7 @@ export const Dialog = (props: DialogProps) => {
          title={t("buttons.close")}
          aria-label={t("buttons.close")}
        >
-          {isFullscreen ? back : CloseIcon}
+          {device.isMobile ? back : CloseIcon}
        </button>
        <div className="Dialog__content">{props.children}</div>
      </Island>
--- a/src/components/HelpDialog.tsx
+++ b/src/components/HelpDialog.tsx
@@ -254,6 +254,7 @@ export const HelpDialog = ({ onClose }: { onClose?: () => void }) => {
              label={t("helpDialog.movePageLeftRight")}
              shortcuts={["Shift+PgUp/PgDn"]}
            />
+            <Shortcut label={t("buttons.fullScreen")} shortcuts={["F"]} />
            <Shortcut
              label={t("buttons.zenMode")}
              shortcuts={[getShortcutKey("Alt+Z")]}
--- a/src/components/HintViewer.tsx
+++ b/src/components/HintViewer.tsx
@@ -22,7 +22,7 @@ const getHints = ({ appState, isMobile, device, app }: HintViewerProps) => {
  const { activeTool, isResizing, isRotating, lastPointerDownWith } = appState;
  const multiMode = appState.multiElement !== null;

-  if (appState.openSidebar && !device.editor.canFitSidebar) {
+  if (appState.openSidebar && !device.canDeviceFitSidebar) {
    return null;
  }

--- a/src/components/ImageExportDialog.tsx
+++ b/src/components/ImageExportDialog.tsx
@@ -22,7 +22,7 @@ import { canvasToBlob } from "../data/blob";
 import { nativeFileSystemSupported } from "../data/filesystem";
 import { NonDeletedExcalidrawElement } from "../element/types";
 import { t } from "../i18n";
-import { isSomeElementSelected } from "../scene";
+import { getSelectedElements, isSomeElementSelected } from "../scene";
 import { exportToCanvas } from "../packages/utils";

 import { copyIcon, downloadIcon, helpIcon } from "./icons";
@@ -34,8 +34,6 @@ import { Tooltip } from "./Tooltip";
 import "./ImageExportDialog.scss";
 import { useAppProps } from "./App";
 import { FilledButton } from "./FilledButton";
-import { cloneJSON } from "../utils";
-import { prepareElementsForExport } from "../data";

 const supportsContextFilters =
  "filter" in document.createElement("canvas").getContext("2d")!;
@@ -53,47 +51,44 @@ export const ErrorCanvasPreview = () => {
 };

 type ImageExportModalProps = {
-  appStateSnapshot: Readonly<UIAppState>;
-  elementsSnapshot: readonly NonDeletedExcalidrawElement[];
+  appState: UIAppState;
+  elements: readonly NonDeletedExcalidrawElement[];
  files: BinaryFiles;
  actionManager: ActionManager;
  onExportImage: AppClassProperties["onExportImage"];
 };

 const ImageExportModal = ({
-  appStateSnapshot,
-  elementsSnapshot,
+  appState,
+  elements,
  files,
  actionManager,
  onExportImage,
 }: ImageExportModalProps) => {
-  const hasSelection = isSomeElementSelected(
-    elementsSnapshot,
-    appStateSnapshot,
-  );
-
  const appProps = useAppProps();
-  const [projectName, setProjectName] = useState(appStateSnapshot.name);
-  const [exportSelectionOnly, setExportSelectionOnly] = useState(hasSelection);
+  const [projectName, setProjectName] = useState(appState.name);
+
+  const someElementIsSelected = isSomeElementSelected(elements, appState);
+
+  const [exportSelected, setExportSelected] = useState(someElementIsSelected);
  const [exportWithBackground, setExportWithBackground] = useState(
-    appStateSnapshot.exportBackground,
+    appState.exportBackground,
  );
  const [exportDarkMode, setExportDarkMode] = useState(
-    appStateSnapshot.exportWithDarkMode,
+    appState.exportWithDarkMode,
  );
-  const [embedScene, setEmbedScene] = useState(
-    appStateSnapshot.exportEmbedScene,
-  );
-  const [exportScale, setExportScale] = useState(appStateSnapshot.exportScale);
+  const [embedScene, setEmbedScene] = useState(appState.exportEmbedScene);
+  const [exportScale, setExportScale] = useState(appState.exportScale);

  const previewRef = useRef<HTMLDivElement>(null);
  const [renderError, setRenderError] = useState<Error | null>(null);

-  const { exportedElements, exportingFrame } = prepareElementsForExport(
-    elementsSnapshot,
-    appStateSnapshot,
-    exportSelectionOnly,
-  );
+  const exportedElements = exportSelected
+    ? getSelectedElements(elements, appState, {
+        includeBoundTextElement: true,
+        includeElementsInFrames: true,
+      })
+    : elements;

  useEffect(() => {
    const previewNode = previewRef.current;
@@ -107,18 +102,10 @@ const ImageExportModal = ({
    }
    exportToCanvas({
      elements: exportedElements,
-      appState: {
-        ...appStateSnapshot,
-        name: projectName,
-        exportBackground: exportWithBackground,
-        exportWithDarkMode: exportDarkMode,
-        exportScale,
-        exportEmbedScene: embedScene,
-      },
+      appState,
      files,
      exportPadding: DEFAULT_EXPORT_PADDING,
      maxWidthOrHeight: Math.max(maxWidth, maxHeight),
-      exportingFrame,
    })
      .then((canvas) => {
        setRenderError(null);
@@ -132,17 +119,7 @@ const ImageExportModal = ({
        console.error(error);
        setRenderError(error);
      });
-  }, [
-    appStateSnapshot,
-    files,
-    exportedElements,
-    exportingFrame,
-    projectName,
-    exportWithBackground,
-    exportDarkMode,
-    exportScale,
-    embedScene,
-  ]);
+  }, [appState, files, exportedElements]);

  return (
    <div className="ImageExportModal">
@@ -159,8 +136,7 @@ const ImageExportModal = ({
              value={projectName}
              style={{ width: "30ch" }}
              disabled={
-                typeof appProps.name !== "undefined" ||
-                appStateSnapshot.viewModeEnabled
+                typeof appProps.name !== "undefined" || appState.viewModeEnabled
              }
              onChange={(event) => {
                setProjectName(event.target.value);
@@ -176,16 +152,16 @@ const ImageExportModal = ({
      </div>
      <div className="ImageExportModal__settings">
        <h3>{t("imageExportDialog.header")}</h3>
-        {hasSelection && (
+        {someElementIsSelected && (
          <ExportSetting
            label={t("imageExportDialog.label.onlySelected")}
            name="exportOnlySelected"
          >
            <Switch
              name="exportOnlySelected"
-              checked={exportSelectionOnly}
+              checked={exportSelected}
              onChange={(checked) => {
-                setExportSelectionOnly(checked);
+                setExportSelected(checked);
              }}
            />
          </ExportSetting>
@@ -267,9 +243,7 @@ const ImageExportModal = ({
            className="ImageExportModal__settings__buttons__button"
            label={t("imageExportDialog.title.exportToPng")}
            onClick={() =>
-              onExportImage(EXPORT_IMAGE_TYPES.png, exportedElements, {
-                exportingFrame,
-              })
+              onExportImage(EXPORT_IMAGE_TYPES.png, exportedElements)
            }
            startIcon={downloadIcon}
          >
@@ -279,9 +253,7 @@ const ImageExportModal = ({
            className="ImageExportModal__settings__buttons__button"
            label={t("imageExportDialog.title.exportToSvg")}
            onClick={() =>
-              onExportImage(EXPORT_IMAGE_TYPES.svg, exportedElements, {
-                exportingFrame,
-              })
+              onExportImage(EXPORT_IMAGE_TYPES.svg, exportedElements)
            }
            startIcon={downloadIcon}
          >
@@ -292,9 +264,7 @@ const ImageExportModal = ({
              className="ImageExportModal__settings__buttons__button"
              label={t("imageExportDialog.title.copyPngToClipboard")}
              onClick={() =>
-                onExportImage(EXPORT_IMAGE_TYPES.clipboard, exportedElements, {
-                  exportingFrame,
-                })
+                onExportImage(EXPORT_IMAGE_TYPES.clipboard, exportedElements)
              }
              startIcon={copyIcon}
            >
@@ -355,20 +325,15 @@ export const ImageExportDialog = ({
  onExportImage: AppClassProperties["onExportImage"];
  onCloseRequest: () => void;
 }) => {
-  // we need to take a snapshot so that the exported state can't be modified
-  // while the dialog is open
-  const [{ appStateSnapshot, elementsSnapshot }] = useState(() => {
-    return {
-      appStateSnapshot: cloneJSON(appState),
-      elementsSnapshot: cloneJSON(elements),
-    };
-  });
+  if (appState.openDialog !== "imageExport") {
+    return null;
+  }

  return (
    <Dialog onCloseRequest={onCloseRequest} size="wide" title={false}>
      <ImageExportModal
-        elementsSnapshot={elementsSnapshot}
-        appStateSnapshot={appStateSnapshot}
+        elements={elements}
+        appState={appState}
        files={files}
        actionManager={actionManager}
        onExportImage={onExportImage}
--- a/src/components/InlineIcon.tsx
+++ b/src/components/InlineIcon.tsx
@@ -1,15 +0,0 @@
-export const InlineIcon = ({ icon }: { icon: JSX.Element }) => {
-  return (
-    <span
-      style={{
-        width: "1em",
-        margin: "0 0.5ex 0 0.5ex",
-        display: "inline-block",
-        lineHeight: 0,
-        verticalAlign: "middle",
-      }}
-    >
-      {icon}
-    </span>
-  );
-};
--- a/src/components/JSONExportDialog.tsx
+++ b/src/components/JSONExportDialog.tsx
@@ -117,7 +117,7 @@ export const JSONExportDialog = ({

  return (
    <>
-      {appState.openDialog?.name === "jsonExport" && (
+      {appState.openDialog === "jsonExport" && (
        <Dialog onCloseRequest={handleClose} title={t("buttons.export")}>
          <JSONExportModal
            elements={elements}
--- a/src/components/LayerUI.tsx
+++ b/src/components/LayerUI.tsx
@@ -1,12 +1,7 @@
 import clsx from "clsx";
 import React from "react";
 import { ActionManager } from "../actions/manager";
-import {
-  CLASSES,
-  DEFAULT_SIDEBAR,
-  LIBRARY_SIDEBAR_WIDTH,
-  TOOL_TYPE,
-} from "../constants";
+import { CLASSES, DEFAULT_SIDEBAR, LIBRARY_SIDEBAR_WIDTH } from "../constants";
 import { showSelectedShapeActions } from "../element";
 import { NonDeletedExcalidrawElement } from "../element/types";
 import { Language, t } from "../i18n";
@@ -61,7 +56,6 @@ import { mutateElement } from "../element/mutateElement";
 import { ShapeCache } from "../scene/ShapeCache";
 import Scene from "../scene/Scene";
 import { LaserPointerButton } from "./LaserTool/LaserPointerButton";
-import { MagicSettings } from "./MagicSettings";

 interface LayerUIProps {
  actionManager: ActionManager;
@@ -72,7 +66,7 @@ interface LayerUIProps {
  elements: readonly NonDeletedExcalidrawElement[];
  onLockToggle: () => void;
  onHandToolToggle: () => void;
-  onPenModeToggle: AppClassProperties["togglePenMode"];
+  onPenModeToggle: () => void;
  showExitZenModeBtn: boolean;
  langCode: Language["code"];
  renderTopRightUI?: ExcalidrawProps["renderTopRightUI"];
@@ -83,14 +77,6 @@ interface LayerUIProps {
  children?: React.ReactNode;
  app: AppClassProperties;
  isCollaborating: boolean;
-  openAIKey: string | null;
-  isOpenAIKeyPersisted: boolean;
-  onOpenAIAPIKeyChange: (apiKey: string, shouldPersist: boolean) => void;
-  onMagicSettingsConfirm: (
-    apiKey: string,
-    shouldPersist: boolean,
-    source: "tool" | "generation" | "settings",
-  ) => void;
 }

 const DefaultMainMenu: React.FC<{
@@ -147,10 +133,6 @@ const LayerUI = ({
  children,
  app,
  isCollaborating,
-  openAIKey,
-  isOpenAIKeyPersisted,
-  onOpenAIAPIKeyChange,
-  onMagicSettingsConfirm,
 }: LayerUIProps) => {
  const device = useDevice();
  const tunnels = useInitializeTunnels();
@@ -179,10 +161,7 @@ const LayerUI = ({
  };

  const renderImageExportDialog = () => {
-    if (
-      !UIOptions.canvasActions.saveAsImage ||
-      appState.openDialog?.name !== "imageExport"
-    ) {
+    if (!UIOptions.canvasActions.saveAsImage) {
      return null;
    }

@@ -267,7 +246,7 @@ const LayerUI = ({
                      >
                        <HintViewer
                          appState={appState}
-                          isMobile={device.editor.isMobile}
+                          isMobile={device.isMobile}
                          device={device}
                          app={app}
                        />
@@ -276,7 +255,7 @@ const LayerUI = ({
                          <PenModeButton
                            zenModeEnabled={appState.zenModeEnabled}
                            checked={appState.penMode}
-                            onChange={() => onPenModeToggle(null)}
+                            onChange={onPenModeToggle}
                            title={t("toolBar.penMode")}
                            penDetected={appState.penDetected}
                          />
@@ -298,7 +277,6 @@ const LayerUI = ({
                          <ShapesSwitcher
                            appState={appState}
                            activeTool={appState.activeTool}
-                            UIOptions={UIOptions}
                            app={app}
                          />
                        </Stack.Row>
@@ -313,11 +291,9 @@ const LayerUI = ({
                        >
                          <LaserPointerButton
                            title={t("toolBar.laser")}
-                            checked={
-                              appState.activeTool.type === TOOL_TYPE.laser
-                            }
+                            checked={appState.activeTool.type === "laser"}
                            onChange={() =>
-                              app.setActiveTool({ type: TOOL_TYPE.laser })
+                              app.setActiveTool({ type: "laser" })
                            }
                            isMobile
                          />
@@ -338,7 +314,7 @@ const LayerUI = ({
            )}
          >
            <UserList collaborators={appState.collaborators} />
-            {renderTopRightUI?.(device.editor.isMobile, appState)}
+            {renderTopRightUI?.(device.isMobile, appState)}
            {!appState.viewModeEnabled &&
              // hide button when sidebar docked
              (!isSidebarDocked ||
@@ -359,7 +335,7 @@ const LayerUI = ({
          trackEvent(
            "sidebar",
            `toggleDock (${docked ? "dock" : "undock"})`,
-            `(${device.editor.isMobile ? "mobile" : "desktop"})`,
+            `(${device.isMobile ? "mobile" : "desktop"})`,
          );
        }}
      />
@@ -387,7 +363,7 @@ const LayerUI = ({
            trackEvent(
              "sidebar",
              `${DEFAULT_SIDEBAR.name} (open)`,
-              `button (${device.editor.isMobile ? "mobile" : "desktop"})`,
+              `button (${device.isMobile ? "mobile" : "desktop"})`,
            );
          }
        }}
@@ -404,7 +380,7 @@ const LayerUI = ({
          {appState.errorMessage}
        </ErrorDialog>
      )}
-      {eyeDropperState && !device.editor.isMobile && (
+      {eyeDropperState && !device.isMobile && (
        <EyeDropper
          colorPickerType={eyeDropperState.colorPickerType}
          onCancel={() => {
@@ -452,32 +428,13 @@ const LayerUI = ({
          }}
        />
      )}
-      {appState.openDialog?.name === "help" && (
+      {appState.openDialog === "help" && (
        <HelpDialog
          onClose={() => {
            setAppState({ openDialog: null });
          }}
        />
      )}
-      {appState.openDialog?.name === "magicSettings" && (
-        <MagicSettings
-          openAIKey={openAIKey}
-          isPersisted={isOpenAIKeyPersisted}
-          onChange={onOpenAIAPIKeyChange}
-          onConfirm={(apiKey, shouldPersist) => {
-            const source =
-              appState.openDialog?.name === "magicSettings"
-                ? appState.openDialog?.source
-                : "settings";
-            setAppState({ openDialog: null }, () => {
-              onMagicSettingsConfirm(apiKey, shouldPersist, source);
-            });
-          }}
-          onClose={() => {
-            setAppState({ openDialog: null });
-          }}
-        />
-      )}
      <ActiveConfirmDialog />
      <tunnels.OverwriteConfirmDialogTunnel.Out />
      {renderImageExportDialog()}
@@ -493,7 +450,7 @@ const LayerUI = ({
          }
        />
      )}
-      {device.editor.isMobile && (
+      {device.isMobile && (
        <MobileMenu
          app={app}
          appState={appState}
@@ -510,17 +467,16 @@ const LayerUI = ({
          renderSidebars={renderSidebars}
          device={device}
          renderWelcomeScreen={renderWelcomeScreen}
-          UIOptions={UIOptions}
        />
      )}
-      {!device.editor.isMobile && (
+      {!device.isMobile && (
        <>
          <div
            className="layer-ui__wrapper"
            style={
              appState.openSidebar &&
              isSidebarDocked &&
-              device.editor.canFitSidebar
+              device.canDeviceFitSidebar
                ? { width: `calc(100% - ${LIBRARY_SIDEBAR_WIDTH}px)` }
                : {}
            }
--- a/src/components/LibraryUnit.tsx
+++ b/src/components/LibraryUnit.tsx
@@ -47,7 +47,7 @@ export const LibraryUnit = memo(
    }, [svg]);

    const [isHovered, setIsHovered] = useState(false);
-    const isMobile = useDevice().editor.isMobile;
+    const isMobile = useDevice().isMobile;
    const adder = isPending && (
      <div className="library-unit__adder">{PlusIcon}</div>
    );
--- a/src/components/MagicButton.tsx
+++ b/src/components/MagicButton.tsx
@@ -1,38 +0,0 @@
-import "./ToolIcon.scss";
-
-import clsx from "clsx";
-import { ToolButtonSize } from "./ToolButton";
-
-const DEFAULT_SIZE: ToolButtonSize = "small";
-
-export const ElementCanvasButton = (props: {
-  title?: string;
-  icon: JSX.Element;
-  name?: string;
-  checked: boolean;
-  onChange?(): void;
-  isMobile?: boolean;
-}) => {
-  return (
-    <label
-      className={clsx(
-        "ToolIcon ToolIcon__MagicButton",
-        `ToolIcon_size_${DEFAULT_SIZE}`,
-        {
-          "is-mobile": props.isMobile,
-        },
-      )}
-      title={`${props.title}`}
-    >
-      <input
-        className="ToolIcon_type_checkbox"
-        type="checkbox"
-        name={props.name}
-        onChange={props.onChange}
-        checked={props.checked}
-        aria-label={props.title}
-      />
-      <div className="ToolIcon__icon">{props.icon}</div>
-    </label>
-  );
-};
--- a/src/components/MagicSettings.scss
+++ b/src/components/MagicSettings.scss
@@ -1,9 +0,0 @@
-.excalidraw {
-  .MagicSettings-confirm {
-    padding: 0.5rem 1rem;
-  }
-
-  .MagicSettings__confirm {
-    margin-top: 2rem;
-  }
-}
--- a/src/components/MagicSettings.tsx
+++ b/src/components/MagicSettings.tsx
@@ -1,130 +0,0 @@
-import { useState } from "react";
-import { Dialog } from "./Dialog";
-import { TextField } from "./TextField";
-import { MagicIcon, OpenAIIcon } from "./icons";
-import { FilledButton } from "./FilledButton";
-import { CheckboxItem } from "./CheckboxItem";
-import { KEYS } from "../keys";
-import { useUIAppState } from "../context/ui-appState";
-import { InlineIcon } from "./InlineIcon";
-import { Paragraph } from "./Paragraph";
-
-import "./MagicSettings.scss";
-
-export const MagicSettings = (props: {
-  openAIKey: string | null;
-  isPersisted: boolean;
-  onChange: (key: string, shouldPersist: boolean) => void;
-  onConfirm: (key: string, shouldPersist: boolean) => void;
-  onClose: () => void;
-}) => {
-  const { theme } = useUIAppState();
-  const [keyInputValue, setKeyInputValue] = useState(props.openAIKey || "");
-  const [shouldPersist, setShouldPersist] = useState<boolean>(
-    props.isPersisted,
-  );
-
-  const onConfirm = () => {
-    props.onConfirm(keyInputValue.trim(), shouldPersist);
-  };
-
-  return (
-    <Dialog
-      onCloseRequest={() => {
-        props.onClose();
-        props.onConfirm(keyInputValue.trim(), shouldPersist);
-      }}
-      title={
-        <div style={{ display: "flex" }}>
-          Diagram to Code (AI){" "}
-          <div
-            style={{
-              display: "flex",
-              alignItems: "center",
-              justifyContent: "center",
-              padding: "0.1rem 0.5rem",
-              marginLeft: "1rem",
-              fontSize: 14,
-              borderRadius: "12px",
-              background: theme === "light" ? "#FFCCCC" : "#703333",
-            }}
-          >
-            Experimental
-          </div>
-        </div>
-      }
-      className="MagicSettings"
-      autofocus={false}
-    >
-      <Paragraph
-        style={{
-          display: "inline-flex",
-          alignItems: "center",
-          marginBottom: 0,
-        }}
-      >
-        For the diagram-to-code feature we use <InlineIcon icon={OpenAIIcon} />
-        OpenAI.
-      </Paragraph>
-      <Paragraph>
-        While the OpenAI API is in beta, its use is strictly limited — as such
-        we require you use your own API key. You can create an{" "}
-        <a
-          href="https://platform.openai.com/login?launch"
-          rel="noopener noreferrer"
-          target="_blank"
-        >
-          OpenAI account
-        </a>
-        , add a small credit (5 USD minimum), and{" "}
-        <a
-          href="https://platform.openai.com/api-keys"
-          rel="noopener noreferrer"
-          target="_blank"
-        >
-          generate your own API key
-        </a>
-        .
-      </Paragraph>
-      <Paragraph>
-        Your OpenAI key does not leave the browser, and you can also set your
-        own limit in your OpenAI account dashboard if needed.
-      </Paragraph>
-      <TextField
-        isRedacted
-        value={keyInputValue}
-        placeholder="Paste your API key here"
-        label="OpenAI API key"
-        onChange={(value) => {
-          setKeyInputValue(value);
-          props.onChange(value.trim(), shouldPersist);
-        }}
-        selectOnRender
-        onKeyDown={(event) => event.key === KEYS.ENTER && onConfirm()}
-      />
-      <Paragraph>
-        By default, your API token is not persisted anywhere so you'll need to
-        insert it again after reload. But, you can persist locally in your
-        browser below.
-      </Paragraph>
-
-      <CheckboxItem checked={shouldPersist} onChange={setShouldPersist}>
-        Persist API key in browser storage
-      </CheckboxItem>
-
-      <Paragraph>
-        Once API key is set, you can use the <InlineIcon icon={MagicIcon} />{" "}
-        tool to wrap your elements in a frame that will then allow you to turn
-        it into code. This dialog can be accessed using the <b>AI Settings</b>{" "}
-        <InlineIcon icon={OpenAIIcon} />.
-      </Paragraph>
-
-      <FilledButton
-        className="MagicSettings__confirm"
-        size="large"
-        label="Confirm"
-        onClick={onConfirm}
-      />
-    </Dialog>
-  );
-};
--- a/src/components/MobileMenu.tsx
+++ b/src/components/MobileMenu.tsx
@@ -1,7 +1,6 @@
 import React from "react";
 import {
  AppClassProperties,
-  AppProps,
  AppState,
  Device,
  ExcalidrawProps,
@@ -36,7 +35,7 @@ type MobileMenuProps = {
  elements: readonly NonDeletedExcalidrawElement[];
  onLockToggle: () => void;
  onHandToolToggle: () => void;
-  onPenModeToggle: AppClassProperties["togglePenMode"];
+  onPenModeToggle: () => void;

  renderTopRightUI?: (
    isMobile: boolean,
@@ -46,7 +45,6 @@ type MobileMenuProps = {
  renderSidebars: () => JSX.Element | null;
  device: Device;
  renderWelcomeScreen: boolean;
-  UIOptions: AppProps["UIOptions"];
  app: AppClassProperties;
 };

@@ -64,7 +62,6 @@ export const MobileMenu = ({
  renderSidebars,
  device,
  renderWelcomeScreen,
-  UIOptions,
  app,
 }: MobileMenuProps) => {
  const {
@@ -86,7 +83,6 @@ export const MobileMenu = ({
                    <ShapesSwitcher
                      appState={appState}
                      activeTool={appState.activeTool}
-                      UIOptions={UIOptions}
                      app={app}
                    />
                  </Stack.Row>
@@ -98,7 +94,7 @@ export const MobileMenu = ({
                  )}
                  <PenModeButton
                    checked={appState.penMode}
-                    onChange={() => onPenModeToggle(null)}
+                    onChange={onPenModeToggle}
                    title={t("toolBar.penMode")}
                    isMobile
                    penDetected={appState.penDetected}
--- a/src/components/Modal.scss
+++ b/src/components/Modal.scss
@@ -59,6 +59,12 @@
    &:focus {
      outline: none;
    }
+
+    @include isMobile {
+      max-width: 100%;
+      border: 0;
+      border-radius: 0;
+    }
  }

  @keyframes Modal__background__fade-in {
@@ -99,7 +105,7 @@
    }
  }

-  .Dialog--fullscreen {
+  @include isMobile {
    .Modal {
      padding: 0;
    }
@@ -110,9 +116,6 @@
      left: 0;
      right: 0;
      bottom: 0;
-      max-width: 100%;
-      border: 0;
-      border-radius: 0;
    }
  }
 }
--- a/src/components/OverwriteConfirm/OverwriteConfirmActions.tsx
+++ b/src/components/OverwriteConfirm/OverwriteConfirmActions.tsx
@@ -47,7 +47,7 @@ export const ExportToImage = () => {
      actionLabel={t("overwriteConfirm.action.exportToImage.button")}
      onClick={() => {
        actionManager.executeAction(actionChangeExportEmbedScene, "ui", true);
-        setAppState({ openDialog: { name: "imageExport" } });
+        setAppState({ openDialog: "imageExport" });
      }}
    >
      {t("overwriteConfirm.action.exportToImage.description")}
--- a/src/components/Paragraph.tsx
+++ b/src/components/Paragraph.tsx
@@ -1,10 +0,0 @@
-export const Paragraph = (props: {
-  children: React.ReactNode;
-  style?: React.CSSProperties;
-}) => {
-  return (
-    <p className="excalidraw__paragraph" style={props.style}>
-      {props.children}
-    </p>
-  );
-};
--- a/src/components/PasteChartDialog.tsx
+++ b/src/components/PasteChartDialog.tsx
@@ -94,7 +94,7 @@ export const PasteChartDialog = ({

  const handleChartClick = (chartType: ChartType, elements: ChartElements) => {
    onInsertElements(elements);
-    trackEvent("paste", "chart", chartType);
+    trackEvent("magic", "chart", chartType);
    setAppState({
      currentChartType: chartType,
      pasteDialog: {
--- a/src/components/PublishLibrary.tsx
+++ b/src/components/PublishLibrary.tsx
@@ -8,7 +8,6 @@ import Trans from "./Trans";
 import { LibraryItems, LibraryItem, UIAppState } from "../types";
 import { exportToCanvas, exportToSvg } from "../packages/utils";
 import {
-  EDITOR_LS_KEYS,
  EXPORT_DATA_TYPES,
  EXPORT_SOURCE,
  MIME_TYPES,
@@ -20,7 +19,6 @@ import { chunk } from "../utils";
 import DialogActionButton from "./DialogActionButton";
 import { CloseIcon } from "./icons";
 import { ToolButton } from "./ToolButton";
-import { EditorLocalStorage } from "../data/EditorLocalStorage";

 import "./PublishLibrary.scss";

@@ -33,6 +31,34 @@ interface PublishLibraryDataParams {
  website: string;
 }

+const LOCAL_STORAGE_KEY_PUBLISH_LIBRARY = "publish-library-data";
+
+const savePublishLibDataToStorage = (data: PublishLibraryDataParams) => {
+  try {
+    localStorage.setItem(
+      LOCAL_STORAGE_KEY_PUBLISH_LIBRARY,
+      JSON.stringify(data),
+    );
+  } catch (error: any) {
+    // Unable to access window.localStorage
+    console.error(error);
+  }
+};
+
+const importPublishLibDataFromStorage = () => {
+  try {
+    const data = localStorage.getItem(LOCAL_STORAGE_KEY_PUBLISH_LIBRARY);
+    if (data) {
+      return JSON.parse(data);
+    }
+  } catch (error: any) {
+    // Unable to access localStorage
+    console.error(error);
+  }
+
+  return null;
+};
+
 const generatePreviewImage = async (libraryItems: LibraryItems) => {
  const MAX_ITEMS_PER_ROW = 6;
  const BOX_SIZE = 128;
@@ -229,9 +255,7 @@ const PublishLibrary = ({
  const [isSubmitting, setIsSubmitting] = useState(false);

  useEffect(() => {
-    const data = EditorLocalStorage.get<PublishLibraryDataParams>(
-      EDITOR_LS_KEYS.PUBLISH_LIBRARY,
-    );
+    const data = importPublishLibDataFromStorage();
    if (data) {
      setLibraryData(data);
    }
@@ -304,7 +328,7 @@ const PublishLibrary = ({
          if (response.ok) {
            return response.json().then(({ url }) => {
              // flush data from local storage
-              EditorLocalStorage.delete(EDITOR_LS_KEYS.PUBLISH_LIBRARY);
+              localStorage.removeItem(LOCAL_STORAGE_KEY_PUBLISH_LIBRARY);
              onSuccess({
                url,
                authorName: libraryData.authorName,
@@ -360,7 +384,7 @@ const PublishLibrary = ({

  const onDialogClose = useCallback(() => {
    updateItemsInStorage(clonedLibItems);
-    EditorLocalStorage.set(EDITOR_LS_KEYS.PUBLISH_LIBRARY, libraryData);
+    savePublishLibDataToStorage(libraryData);
    onClose();
  }, [clonedLibItems, onClose, updateItemsInStorage, libraryData]);

--- a/src/components/Sidebar/Sidebar.tsx
+++ b/src/components/Sidebar/Sidebar.tsx
@@ -113,11 +113,11 @@ export const SidebarInner = forwardRef(
          if ((event.target as Element).closest(".sidebar-trigger")) {
            return;
          }
-          if (!docked || !device.editor.canFitSidebar) {
+          if (!docked || !device.canDeviceFitSidebar) {
            closeLibrary();
          }
        },
-        [closeLibrary, docked, device.editor.canFitSidebar],
+        [closeLibrary, docked, device.canDeviceFitSidebar],
      ),
    );

@@ -125,7 +125,7 @@ export const SidebarInner = forwardRef(
      const handleKeyDown = (event: KeyboardEvent) => {
        if (
          event.key === KEYS.ESCAPE &&
-          (!docked || !device.editor.canFitSidebar)
+          (!docked || !device.canDeviceFitSidebar)
        ) {
          closeLibrary();
        }
@@ -134,7 +134,7 @@ export const SidebarInner = forwardRef(
      return () => {
        document.removeEventListener(EVENT.KEYDOWN, handleKeyDown);
      };
-    }, [closeLibrary, docked, device.editor.canFitSidebar]);
+    }, [closeLibrary, docked, device.canDeviceFitSidebar]);

    return (
      <Island
--- a/src/components/Sidebar/SidebarHeader.tsx
+++ b/src/components/Sidebar/SidebarHeader.tsx
@@ -18,7 +18,7 @@ export const SidebarHeader = ({
  const props = useContext(SidebarPropsContext);

  const renderDockButton = !!(
-    device.editor.canFitSidebar && props.shouldRenderDockButton
+    device.canDeviceFitSidebar && props.shouldRenderDockButton
  );

  return (
--- a/src/components/TextField.tsx
+++ b/src/components/TextField.tsx
@@ -4,15 +4,12 @@ import {
  useImperativeHandle,
  KeyboardEvent,
  useLayoutEffect,
-  useState,
 } from "react";
 import clsx from "clsx";

 import "./TextField.scss";
-import { Button } from "./Button";
-import { eyeIcon, eyeClosedIcon } from "./icons";

-type TextFieldProps = {
+export type TextFieldProps = {
  value?: string;

  onChange?: (value: string) => void;
@@ -25,7 +22,6 @@ type TextFieldProps = {

  label?: string;
  placeholder?: string;
-  isRedacted?: boolean;
 };

 export const TextField = forwardRef<HTMLInputElement, TextFieldProps>(
@@ -39,7 +35,6 @@ export const TextField = forwardRef<HTMLInputElement, TextFieldProps>(
      readonly,
      selectOnRender,
      onKeyDown,
-      isRedacted = false,
    },
    ref,
  ) => {
@@ -53,9 +48,6 @@ export const TextField = forwardRef<HTMLInputElement, TextFieldProps>(
      }
    }, [selectOnRender]);

-    const [isTemporarilyUnredacted, setIsTemporarilyUnredacted] =
-      useState<boolean>(false);
-
    return (
      <div
        className={clsx("ExcTextField", {
@@ -72,26 +64,14 @@ export const TextField = forwardRef<HTMLInputElement, TextFieldProps>(
          })}
        >
          <input
-            className={clsx({
-              "is-redacted": value && isRedacted && !isTemporarilyUnredacted,
-            })}
            readOnly={readonly}
+            type="text"
            value={value}
            placeholder={placeholder}
            ref={innerRef}
            onChange={(event) => onChange?.(event.target.value)}
            onKeyDown={onKeyDown}
          />
-          {isRedacted && (
-            <Button
-              onSelect={() =>
-                setIsTemporarilyUnredacted(!isTemporarilyUnredacted)
-              }
-              style={{ border: 0, userSelect: "none" }}
-            >
-              {isTemporarilyUnredacted ? eyeClosedIcon : eyeIcon}
-            </Button>
-          )}
        </div>
      </div>
    );
--- a/src/components/ToolIcon.scss
+++ b/src/components/ToolIcon.scss
@@ -175,8 +175,7 @@
      }
    }

-    .ToolIcon__LaserPointer .ToolIcon__icon,
-    .ToolIcon__MagicButton .ToolIcon__icon {
+    .ToolIcon__LaserPointer .ToolIcon__icon {
      width: var(--default-button-size);
      height: var(--default-button-size);
    }
--- a/src/components/canvases/InteractiveCanvas.tsx
+++ b/src/components/canvases/InteractiveCanvas.tsx
@@ -189,6 +189,8 @@ const getRelevantAppStateProps = (
  suggestedBindings: appState.suggestedBindings,
  isRotating: appState.isRotating,
  elementsToHighlight: appState.elementsToHighlight,
+  openSidebar: appState.openSidebar,
+  showHyperlinkPopup: appState.showHyperlinkPopup,
  collaborators: appState.collaborators, // Necessary for collab. sessions
  activeEmbeddable: appState.activeEmbeddable,
  snapLines: appState.snapLines,
--- a/src/components/dropdownMenu/DropdownMenuContent.tsx
+++ b/src/components/dropdownMenu/DropdownMenuContent.tsx
@@ -30,7 +30,7 @@ const MenuContent = ({
  });

  const classNames = clsx(`dropdown-menu ${className}`, {
-    "dropdown-menu--mobile": device.editor.isMobile,
+    "dropdown-menu--mobile": device.isMobile,
  }).trim();

  return (
@@ -43,7 +43,7 @@ const MenuContent = ({
      >
        {/* the zIndex ensures this menu has higher stacking order,
    see https://github.com/excalidraw/excalidraw/pull/1445 */}
-        {device.editor.isMobile ? (
+        {device.isMobile ? (
          <Stack.Col className="dropdown-menu-container">{children}</Stack.Col>
        ) : (
          <Island
--- a/src/components/dropdownMenu/DropdownMenuItemContent.tsx
+++ b/src/components/dropdownMenu/DropdownMenuItemContent.tsx
@@ -14,7 +14,7 @@ const MenuItemContent = ({
    <>
      <div className="dropdown-menu-item__icon">{icon}</div>
      <div className="dropdown-menu-item__text">{children}</div>
-      {shortcut && !device.editor.isMobile && (
+      {shortcut && !device.isMobile && (
        <div className="dropdown-menu-item__shortcut">{shortcut}</div>
      )}
    </>
--- a/src/components/dropdownMenu/DropdownMenuTrigger.tsx
+++ b/src/components/dropdownMenu/DropdownMenuTrigger.tsx
@@ -18,7 +18,7 @@ const MenuTrigger = ({
    `dropdown-menu-button ${className}`,
    "zen-mode-transition",
    {
-      "dropdown-menu-button--mobile": device.editor.isMobile,
+      "dropdown-menu-button--mobile": device.isMobile,
    },
  ).trim();
  return (
--- a/src/components/icons.tsx
+++ b/src/components/icons.tsx
@@ -1688,57 +1688,3 @@ export const laserPointerToolIcon = createIcon(

  20,
 );
-
-export const MagicIcon = createIcon(
-  <g stroke="currentColor" fill="none">
-    <path stroke="none" d="M0 0h24v24H0z" />
-    <path d="M6 21l15 -15l-3 -3l-15 15l3 3" />
-    <path d="M15 6l3 3" />
-    <path d="M9 3a2 2 0 0 0 2 2a2 2 0 0 0 -2 2a2 2 0 0 0 -2 -2a2 2 0 0 0 2 -2" />
-    <path d="M19 13a2 2 0 0 0 2 2a2 2 0 0 0 -2 2a2 2 0 0 0 -2 -2a2 2 0 0 0 2 -2" />
-  </g>,
-  tablerIconProps,
-);
-
-export const OpenAIIcon = createIcon(
-  <g stroke="currentColor" fill="none">
-    <path stroke="none" d="M0 0h24v24H0z" fill="none" />
-    <path d="M11.217 19.384a3.501 3.501 0 0 0 6.783 -1.217v-5.167l-6 -3.35" />
-    <path d="M5.214 15.014a3.501 3.501 0 0 0 4.446 5.266l4.34 -2.534v-6.946" />
-    <path d="M6 7.63c-1.391 -.236 -2.787 .395 -3.534 1.689a3.474 3.474 0 0 0 1.271 4.745l4.263 2.514l6 -3.348" />
-    <path d="M12.783 4.616a3.501 3.501 0 0 0 -6.783 1.217v5.067l6 3.45" />
-    <path d="M18.786 8.986a3.501 3.501 0 0 0 -4.446 -5.266l-4.34 2.534v6.946" />
-    <path d="M18 16.302c1.391 .236 2.787 -.395 3.534 -1.689a3.474 3.474 0 0 0 -1.271 -4.745l-4.308 -2.514l-5.955 3.42" />
-  </g>,
-  tablerIconProps,
-);
-
-export const fullscreenIcon = createIcon(
-  <g stroke="currentColor" fill="none">
-    <path stroke="none" d="M0 0h24v24H0z" fill="none" />
-    <path d="M4 8v-2a2 2 0 0 1 2 -2h2" />
-    <path d="M4 16v2a2 2 0 0 0 2 2h2" />
-    <path d="M16 4h2a2 2 0 0 1 2 2v2" />
-    <path d="M16 20h2a2 2 0 0 0 2 -2v-2" />
-  </g>,
-  tablerIconProps,
-);
-
-export const eyeIcon = createIcon(
-  <g stroke="currentColor" fill="none">
-    <path stroke="none" d="M0 0h24v24H0z" fill="none" />
-    <path d="M10 12a2 2 0 1 0 4 0a2 2 0 0 0 -4 0" />
-    <path d="M21 12c-2.4 4 -5.4 6 -9 6c-3.6 0 -6.6 -2 -9 -6c2.4 -4 5.4 -6 9 -6c3.6 0 6.6 2 9 6" />
-  </g>,
-  tablerIconProps,
-);
-
-export const eyeClosedIcon = createIcon(
-  <g stroke="currentColor" fill="none">
-    <path stroke="none" d="M0 0h24v24H0z" fill="none" />
-    <path d="M10.585 10.587a2 2 0 0 0 2.829 2.828" />
-    <path d="M16.681 16.673a8.717 8.717 0 0 1 -4.681 1.327c-3.6 0 -6.6 -2 -9 -6c1.272 -2.12 2.712 -3.678 4.32 -4.674m2.86 -1.146a9.055 9.055 0 0 1 1.82 -.18c3.6 0 6.6 2 9 6c-.666 1.11 -1.379 2.067 -2.138 2.87" />
-    <path d="M3 3l18 18" />
-  </g>,
-  tablerIconProps,
-);
--- a/src/components/main-menu/DefaultItems.tsx
+++ b/src/components/main-menu/DefaultItems.tsx
@@ -107,7 +107,7 @@ export const SaveAsImage = () => {
    <DropdownMenuItem
      icon={ExportImageIcon}
      data-testid="image-export-button"
-      onSelect={() => setAppState({ openDialog: { name: "imageExport" } })}
+      onSelect={() => setAppState({ openDialog: "imageExport" })}
      shortcut={getShortcutFromShortcutName("imageExport")}
      aria-label={t("buttons.exportImage")}
    >
@@ -230,7 +230,7 @@ export const Export = () => {
    <DropdownMenuItem
      icon={ExportIcon}
      onSelect={() => {
-        setAppState({ openDialog: { name: "jsonExport" } });
+        setAppState({ openDialog: "jsonExport" });
      }}
      data-testid="json-export-button"
      aria-label={t("buttons.export")}
--- a/src/components/main-menu/MainMenu.tsx
+++ b/src/components/main-menu/MainMenu.tsx
@@ -29,7 +29,7 @@ const MainMenu = Object.assign(
      const device = useDevice();
      const appState = useUIAppState();
      const setAppState = useExcalidrawSetAppState();
-      const onClickOutside = device.editor.isMobile
+      const onClickOutside = device.isMobile
        ? undefined
        : () => setAppState({ openMenu: null });

@@ -54,7 +54,7 @@ const MainMenu = Object.assign(
              })}
            >
              {children}
-              {device.editor.isMobile && appState.collaborators.size > 0 && (
+              {device.isMobile && appState.collaborators.size > 0 && (
                <fieldset className="UserList-Wrapper">
                  <legend>{t("labels.collaborators")}</legend>
                  <UserList
--- a/src/components/welcome-screen/WelcomeScreen.Center.tsx
+++ b/src/components/welcome-screen/WelcomeScreen.Center.tsx
@@ -21,7 +21,7 @@ const WelcomeScreenMenuItemContent = ({
    <>
      <div className="welcome-screen-menu-item__icon">{icon}</div>
      <div className="welcome-screen-menu-item__text">{children}</div>
-      {shortcut && !device.editor.isMobile && (
+      {shortcut && !device.isMobile && (
        <div className="welcome-screen-menu-item__shortcut">{shortcut}</div>
      )}
    </>
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -80,7 +80,6 @@ export enum EVENT {
  EXCALIDRAW_LINK = "excalidraw-link",
  MENU_ITEM_SELECT = "menu.itemSelect",
  MESSAGE = "message",
-  FULLSCREENCHANGE = "fullscreenchange",
 }

 export const YOUTUBE_STATES = {
@@ -106,7 +105,6 @@ export const FONT_FAMILY = {
  Virgil: 1,
  Helvetica: 2,
  Cascadia: 3,
-  Assistant: 4,
 };

 export const THEME = {
@@ -116,18 +114,13 @@ export const THEME = {

 export const FRAME_STYLE = {
  strokeColor: "#bbb" as ExcalidrawElement["strokeColor"],
-  strokeWidth: 2 as ExcalidrawElement["strokeWidth"],
+  strokeWidth: 1 as ExcalidrawElement["strokeWidth"],
  strokeStyle: "solid" as ExcalidrawElement["strokeStyle"],
  fillStyle: "solid" as ExcalidrawElement["fillStyle"],
  roughness: 0 as ExcalidrawElement["roughness"],
  roundness: null as ExcalidrawElement["roundness"],
  backgroundColor: "transparent" as ExcalidrawElement["backgroundColor"],
  radius: 8,
-  nameOffsetY: 3,
-  nameColorLightTheme: "#999999",
-  nameColorDarkTheme: "#7a7a7a",
-  nameFontSize: 14,
-  nameLineHeight: 1.25,
 };

 export const WINDOWS_EMOJI_FALLBACK_FONT = "Segoe UI Emoji";
@@ -223,13 +216,12 @@ export const DEFAULT_UI_OPTIONS: AppProps["UIOptions"] = {
    toggleTheme: null,
    saveAsImage: true,
  },
-  tools: {
-    image: true,
-  },
 };

 // breakpoints
 // -----------------------------------------------------------------------------
+// sm screen
+export const MQ_SM_MAX_WIDTH = 640;
 // md screen
 export const MQ_MAX_WIDTH_PORTRAIT = 730;
 export const MQ_MAX_WIDTH_LANDSCAPE = 1000;
@@ -345,33 +337,4 @@ export const DEFAULT_SIDEBAR = {
  defaultTab: LIBRARY_SIDEBAR_TAB,
 } as const;

-export const LIBRARY_DISABLED_TYPES = new Set([
-  "iframe",
-  "embeddable",
-  "image",
-] as const);
-
-// use these constants to easily identify reference sites
-export const TOOL_TYPE = {
-  selection: "selection",
-  rectangle: "rectangle",
-  diamond: "diamond",
-  ellipse: "ellipse",
-  arrow: "arrow",
-  line: "line",
-  freedraw: "freedraw",
-  text: "text",
-  image: "image",
-  eraser: "eraser",
-  hand: "hand",
-  frame: "frame",
-  magicframe: "magicframe",
-  embeddable: "embeddable",
-  laser: "laser",
-} as const;
-
-export const EDITOR_LS_KEYS = {
-  OAI_API_KEY: "excalidraw-oai-api-key",
-  // legacy naming (non)scheme
-  PUBLISH_LIBRARY: "publish-library-data",
-} as const;
+export const LIBRARY_DISABLED_TYPES = new Set(["embeddable", "image"] as const);
--- a/src/css/styles.scss
+++ b/src/css/styles.scss
@@ -5,11 +5,9 @@
  --zIndex-canvas: 1;
  --zIndex-interactiveCanvas: 2;
  --zIndex-wysiwyg: 3;
-  --zIndex-canvasButtons: 3;
  --zIndex-layerUI: 4;
  --zIndex-eyeDropperBackdrop: 5;
  --zIndex-eyeDropperPreview: 6;
-  --zIndex-hyperlinkContainer: 7;

  --zIndex-modal: 1000;
  --zIndex-popup: 1001;
@@ -533,12 +531,6 @@
    }
  }

-  input.is-redacted {
-    // we don't use type=password because browsers (chrome?) prompt
-    // you to save it which is annoying
-    -webkit-text-security: disc;
-  }
-
  input[type="text"],
  textarea:not(.excalidraw-wysiwyg) {
    color: var(--text-primary-color);
@@ -734,8 +726,4 @@
    letter-spacing: 0.6px;
    font-family: "Assistant";
  }
-
-  .excalidraw__paragraph {
-    margin: 1rem 0;
-  }
 }
--- a/src/cursor.ts
+++ b/src/cursor.ts
@@ -99,7 +99,7 @@ export const setCursorForShape = (
    interactiveCanvas.style.cursor = `url(${url}), auto`;
  } else if (!["image", "custom"].includes(appState.activeTool.type)) {
    interactiveCanvas.style.cursor = CURSOR_TYPE.CROSSHAIR;
-  } else if (appState.activeTool.type !== "image") {
+  } else {
    interactiveCanvas.style.cursor = CURSOR_TYPE.AUTO;
  }
 };
--- a/src/data/EditorLocalStorage.ts
+++ b/src/data/EditorLocalStorage.ts
@@ -1,51 +0,0 @@
-import { EDITOR_LS_KEYS } from "../constants";
-import { JSONValue } from "../types";
-
-export class EditorLocalStorage {
-  static has(key: typeof EDITOR_LS_KEYS[keyof typeof EDITOR_LS_KEYS]) {
-    try {
-      return !!window.localStorage.getItem(key);
-    } catch (error: any) {
-      console.warn(`localStorage.getItem error: ${error.message}`);
-      return false;
-    }
-  }
-
-  static get<T extends JSONValue>(
-    key: typeof EDITOR_LS_KEYS[keyof typeof EDITOR_LS_KEYS],
-  ) {
-    try {
-      const value = window.localStorage.getItem(key);
-      if (value) {
-        return JSON.parse(value) as T;
-      }
-      return null;
-    } catch (error: any) {
-      console.warn(`localStorage.getItem error: ${error.message}`);
-      return null;
-    }
-  }
-
-  static set = (
-    key: typeof EDITOR_LS_KEYS[keyof typeof EDITOR_LS_KEYS],
-    value: JSONValue,
-  ) => {
-    try {
-      window.localStorage.setItem(key, JSON.stringify(value));
-      return true;
-    } catch (error: any) {
-      console.warn(`localStorage.setItem error: ${error.message}`);
-      return false;
-    }
-  };
-
-  static delete = (
-    name: typeof EDITOR_LS_KEYS[keyof typeof EDITOR_LS_KEYS],
-  ) => {
-    try {
-      window.localStorage.removeItem(name);
-    } catch (error: any) {
-      console.warn(`localStorage.removeItem error: ${error.message}`);
-    }
-  };
-}
--- a/src/data/ai/types.ts
+++ b/src/data/ai/types.ts
@@ -1,300 +0,0 @@
-export namespace OpenAIInput {
-  type ChatCompletionContentPart =
-    | ChatCompletionContentPartText
-    | ChatCompletionContentPartImage;
-
-  interface ChatCompletionContentPartImage {
-    image_url: ChatCompletionContentPartImage.ImageURL;
-
-    /**
-     * The type of the content part.
-     */
-    type: "image_url";
-  }
-
-  namespace ChatCompletionContentPartImage {
-    export interface ImageURL {
-      /**
-       * Either a URL of the image or the base64 encoded image data.
-       */
-      url: string;
-
-      /**
-       * Specifies the detail level of the image.
-       */
-      detail?: "auto" | "low" | "high";
-    }
-  }
-
-  interface ChatCompletionContentPartText {
-    /**
-     * The text content.
-     */
-    text: string;
-
-    /**
-     * The type of the content part.
-     */
-    type: "text";
-  }
-
-  interface ChatCompletionUserMessageParam {
-    /**
-     * The contents of the user message.
-     */
-    content: string | Array<ChatCompletionContentPart> | null;
-
-    /**
-     * The role of the messages author, in this case `user`.
-     */
-    role: "user";
-  }
-
-  interface ChatCompletionSystemMessageParam {
-    /**
-     * The contents of the system message.
-     */
-    content: string | null;
-
-    /**
-     * The role of the messages author, in this case `system`.
-     */
-    role: "system";
-  }
-
-  export interface ChatCompletionCreateParamsBase {
-    /**
-     * A list of messages comprising the conversation so far.
-     * [Example Python code](https://cookbook.openai.com/examples/how_to_format_inputs_to_chatgpt_models).
-     */
-    messages: Array<
-      ChatCompletionUserMessageParam | ChatCompletionSystemMessageParam
-    >;
-
-    /**
-     * ID of the model to use. See the
-     * [model endpoint compatibility](https://platform.openai.com/docs/models/model-endpoint-compatibility)
-     * table for details on which models work with the Chat API.
-     */
-    model:
-      | (string & {})
-      | "gpt-4-1106-preview"
-      | "gpt-4-vision-preview"
-      | "gpt-4"
-      | "gpt-4-0314"
-      | "gpt-4-0613"
-      | "gpt-4-32k"
-      | "gpt-4-32k-0314"
-      | "gpt-4-32k-0613"
-      | "gpt-3.5-turbo"
-      | "gpt-3.5-turbo-16k"
-      | "gpt-3.5-turbo-0301"
-      | "gpt-3.5-turbo-0613"
-      | "gpt-3.5-turbo-16k-0613";
-
-    /**
-     * Number between -2.0 and 2.0. Positive values penalize new tokens based on their
-     * existing frequency in the text so far, decreasing the model's likelihood to
-     * repeat the same line verbatim.
-     *
-     * [See more information about frequency and presence penalties.](https://platform.openai.com/docs/guides/gpt/parameter-details)
-     */
-    frequency_penalty?: number | null;
-
-    /**
-     * Modify the likelihood of specified tokens appearing in the completion.
-     *
-     * Accepts a JSON object that maps tokens (specified by their token ID in the
-     * tokenizer) to an associated bias value from -100 to 100. Mathematically, the
-     * bias is added to the logits generated by the model prior to sampling. The exact
-     * effect will vary per model, but values between -1 and 1 should decrease or
-     * increase likelihood of selection; values like -100 or 100 should result in a ban
-     * or exclusive selection of the relevant token.
-     */
-    logit_bias?: Record<string, number> | null;
-
-    /**
-     * The maximum number of [tokens](/tokenizer) to generate in the chat completion.
-     *
-     * The total length of input tokens and generated tokens is limited by the model's
-     * context length.
-     * [Example Python code](https://cookbook.openai.com/examples/how_to_count_tokens_with_tiktoken)
-     * for counting tokens.
-     */
-    max_tokens?: number | null;
-
-    /**
-     * How many chat completion choices to generate for each input message.
-     */
-    n?: number | null;
-
-    /**
-     * Number between -2.0 and 2.0. Positive values penalize new tokens based on
-     * whether they appear in the text so far, increasing the model's likelihood to
-     * talk about new topics.
-     *
-     * [See more information about frequency and presence penalties.](https://platform.openai.com/docs/guides/gpt/parameter-details)
-     */
-    presence_penalty?: number | null;
-
-    /**
-     * This feature is in Beta. If specified, our system will make a best effort to
-     * sample deterministically, such that repeated requests with the same `seed` and
-     * parameters should return the same result. Determinism is not guaranteed, and you
-     * should refer to the `system_fingerprint` response parameter to monitor changes
-     * in the backend.
-     */
-    seed?: number | null;
-
-    /**
-     * Up to 4 sequences where the API will stop generating further tokens.
-     */
-    stop?: string | null | Array<string>;
-
-    /**
-     * If set, partial message deltas will be sent, like in ChatGPT. Tokens will be
-     * sent as data-only
-     * [server-sent events](https://developer.mozilla.org/en-US/docs/Web/API/Server-sent_events/Using_server-sent_events#Event_stream_format)
-     * as they become available, with the stream terminated by a `data: [DONE]`
-     * message.
-     * [Example Python code](https://cookbook.openai.com/examples/how_to_stream_completions).
-     */
-    stream?: boolean | null;
-
-    /**
-     * What sampling temperature to use, between 0 and 2. Higher values like 0.8 will
-     * make the output more random, while lower values like 0.2 will make it more
-     * focused and deterministic.
-     *
-     * We generally recommend altering this or `top_p` but not both.
-     */
-    temperature?: number | null;
-
-    /**
-     * An alternative to sampling with temperature, called nucleus sampling, where the
-     * model considers the results of the tokens with top_p probability mass. So 0.1
-     * means only the tokens comprising the top 10% probability mass are considered.
-     *
-     * We generally recommend altering this or `temperature` but not both.
-     */
-    top_p?: number | null;
-
-    /**
-     * A unique identifier representing your end-user, which can help OpenAI to monitor
-     * and detect abuse.
-     * [Learn more](https://platform.openai.com/docs/guides/safety-best-practices/end-user-ids).
-     */
-    user?: string;
-  }
-}
-
-export namespace OpenAIOutput {
-  export interface ChatCompletion {
-    /**
-     * A unique identifier for the chat completion.
-     */
-    id: string;
-
-    /**
-     * A list of chat completion choices. Can be more than one if `n` is greater
-     * than 1.
-     */
-    choices: Array<Choice>;
-
-    /**
-     * The Unix timestamp (in seconds) of when the chat completion was created.
-     */
-    created: number;
-
-    /**
-     * The model used for the chat completion.
-     */
-    model: string;
-
-    /**
-     * The object type, which is always `chat.completion`.
-     */
-    object: "chat.completion";
-
-    /**
-     * This fingerprint represents the backend configuration that the model runs with.
-     *
-     * Can be used in conjunction with the `seed` request parameter to understand when
-     * backend changes have been made that might impact determinism.
-     */
-    system_fingerprint?: string;
-
-    /**
-     * Usage statistics for the completion request.
-     */
-    usage?: CompletionUsage;
-  }
-  export interface Choice {
-    /**
-     * The reason the model stopped generating tokens. This will be `stop` if the model
-     * hit a natural stop point or a provided stop sequence, `length` if the maximum
-     * number of tokens specified in the request was reached, `content_filter` if
-     * content was omitted due to a flag from our content filters, `tool_calls` if the
-     * model called a tool, or `function_call` (deprecated) if the model called a
-     * function.
-     */
-    finish_reason:
-      | "stop"
-      | "length"
-      | "tool_calls"
-      | "content_filter"
-      | "function_call";
-
-    /**
-     * The index of the choice in the list of choices.
-     */
-    index: number;
-
-    /**
-     * A chat completion message generated by the model.
-     */
-    message: ChatCompletionMessage;
-  }
-
-  interface ChatCompletionMessage {
-    /**
-     * The contents of the message.
-     */
-    content: string | null;
-
-    /**
-     * The role of the author of this message.
-     */
-    role: "assistant";
-  }
-
-  /**
-   * Usage statistics for the completion request.
-   */
-  interface CompletionUsage {
-    /**
-     * Number of tokens in the generated completion.
-     */
-    completion_tokens: number;
-
-    /**
-     * Number of tokens in the prompt.
-     */
-    prompt_tokens: number;
-
-    /**
-     * Total number of tokens used in the request (prompt + completion).
-     */
-    total_tokens: number;
-  }
-
-  export interface APIError {
-    readonly status: 400 | 401 | 403 | 404 | 409 | 422 | 429 | 500 | undefined;
-    readonly headers: Headers | undefined;
-    readonly error: { message: string } | undefined;
-
-    readonly code: string | null | undefined;
-    readonly param: string | null | undefined;
-    readonly type: string | undefined;
-  }
-}
--- a/src/data/blob.ts
+++ b/src/data/blob.ts
@@ -3,7 +3,7 @@ import { cleanAppStateForExport } from "../appState";
 import { IMAGE_MIME_TYPES, MIME_TYPES } from "../constants";
 import { clearElementsForExport } from "../element";
 import { ExcalidrawElement, FileId } from "../element/types";
-import { CanvasError, ImageSceneDataError } from "../errors";
+import { CanvasError } from "../errors";
 import { t } from "../i18n";
 import { calculateScrollCenter } from "../scene";
 import { AppState, DataURL, LibraryItem } from "../types";
@@ -24,12 +24,15 @@ const parseFileContents = async (blob: Blob | File) => {
      ).decodePngMetadata(blob);
    } catch (error: any) {
      if (error.message === "INVALID") {
-        throw new ImageSceneDataError(
+        throw new DOMException(
          t("alerts.imageDoesNotContainScene"),
-          "IMAGE_NOT_CONTAINS_SCENE_DATA",
+          "EncodingError",
        );
      } else {
-        throw new ImageSceneDataError(t("alerts.cannotRestoreFromImage"));
+        throw new DOMException(
+          t("alerts.cannotRestoreFromImage"),
+          "EncodingError",
+        );
      }
    }
  } else {
@@ -55,12 +58,15 @@ const parseFileContents = async (blob: Blob | File) => {
        });
      } catch (error: any) {
        if (error.message === "INVALID") {
-          throw new ImageSceneDataError(
+          throw new DOMException(
            t("alerts.imageDoesNotContainScene"),
-            "IMAGE_NOT_CONTAINS_SCENE_DATA",
+            "EncodingError",
          );
        } else {
-          throw new ImageSceneDataError(t("alerts.cannotRestoreFromImage"));
+          throw new DOMException(
+            t("alerts.cannotRestoreFromImage"),
+            "EncodingError",
+          );
        }
      }
    }
@@ -125,19 +131,8 @@ export const loadSceneOrLibraryFromBlob = async (
  fileHandle?: FileSystemHandle | null,
 ) => {
  const contents = await parseFileContents(blob);
-  let data;
  try {
-    try {
-      data = JSON.parse(contents);
-    } catch (error: any) {
-      if (isSupportedImageFile(blob)) {
-        throw new ImageSceneDataError(
-          t("alerts.imageDoesNotContainScene"),
-          "IMAGE_NOT_CONTAINS_SCENE_DATA",
-        );
-      }
-      throw error;
-    }
+    const data = JSON.parse(contents);
    if (isValidExcalidrawData(data)) {
      return {
        type: MIME_TYPES.excalidraw,
@@ -167,9 +162,7 @@ export const loadSceneOrLibraryFromBlob = async (
    }
    throw new Error(t("alerts.couldNotLoadInvalidFile"));
  } catch (error: any) {
-    if (error instanceof ImageSceneDataError) {
-      throw error;
-    }
+    console.error(error.message);
    throw new Error(t("alerts.couldNotLoadInvalidFile"));
  }
 };
--- a/src/data/index.ts
+++ b/src/data/index.ts
@@ -3,20 +3,11 @@ import {
  copyTextToSystemClipboard,
 } from "../clipboard";
 import { DEFAULT_EXPORT_PADDING, isFirefox, MIME_TYPES } from "../constants";
-import { getNonDeletedElements } from "../element";
-import { isFrameLikeElement } from "../element/typeChecks";
-import {
-  ExcalidrawElement,
-  ExcalidrawFrameLikeElement,
-  NonDeletedExcalidrawElement,
-} from "../element/types";
+import { NonDeletedExcalidrawElement } from "../element/types";
 import { t } from "../i18n";
-import { elementsOverlappingBBox } from "../packages/withinBounds";
-import { isSomeElementSelected, getSelectedElements } from "../scene";
 import { exportToCanvas, exportToSvg } from "../scene/export";
 import { ExportType } from "../scene/types";
 import { AppState, BinaryFiles } from "../types";
-import { cloneJSON } from "../utils";
 import { canvasToBlob } from "./blob";
 import { fileSave, FileSystemHandle } from "./filesystem";
 import { serializeAsJSON } from "./json";
@@ -24,64 +15,9 @@ import { serializeAsJSON } from "./json";
 export { loadFromBlob } from "./blob";
 export { loadFromJSON, saveAsJSON } from "./json";

-export type ExportedElements = readonly NonDeletedExcalidrawElement[] & {
-  _brand: "exportedElements";
-};
-
-export const prepareElementsForExport = (
-  elements: readonly ExcalidrawElement[],
-  { selectedElementIds }: Pick<AppState, "selectedElementIds">,
-  exportSelectionOnly: boolean,
-) => {
-  elements = getNonDeletedElements(elements);
-
-  const isExportingSelection =
-    exportSelectionOnly &&
-    isSomeElementSelected(elements, { selectedElementIds });
-
-  let exportingFrame: ExcalidrawFrameLikeElement | null = null;
-  let exportedElements = isExportingSelection
-    ? getSelectedElements(
-        elements,
-        { selectedElementIds },
-        {
-          includeBoundTextElement: true,
-        },
-      )
-    : elements;
-
-  if (isExportingSelection) {
-    if (
-      exportedElements.length === 1 &&
-      isFrameLikeElement(exportedElements[0])
-    ) {
-      exportingFrame = exportedElements[0];
-      exportedElements = elementsOverlappingBBox({
-        elements,
-        bounds: exportingFrame,
-        type: "overlap",
-      });
-    } else if (exportedElements.length > 1) {
-      exportedElements = getSelectedElements(
-        elements,
-        { selectedElementIds },
-        {
-          includeBoundTextElement: true,
-          includeElementsInFrames: true,
-        },
-      );
-    }
-  }
-
-  return {
-    exportingFrame,
-    exportedElements: cloneJSON(exportedElements) as ExportedElements,
-  };
-};
-
 export const exportCanvas = async (
  type: Omit<ExportType, "backend">,
-  elements: ExportedElements,
+  elements: readonly NonDeletedExcalidrawElement[],
  appState: AppState,
  files: BinaryFiles,
  {
@@ -90,14 +26,12 @@ export const exportCanvas = async (
    viewBackgroundColor,
    name,
    fileHandle = null,
-    exportingFrame = null,
  }: {
    exportBackground: boolean;
    exportPadding?: number;
    viewBackgroundColor: string;
    name: string;
    fileHandle?: FileSystemHandle | null;
-    exportingFrame: ExcalidrawFrameLikeElement | null;
  },
 ) => {
  if (elements.length === 0) {
@@ -115,7 +49,6 @@ export const exportCanvas = async (
        exportEmbedScene: appState.exportEmbedScene && type === "svg",
      },
      files,
-      { exportingFrame },
    );
    if (type === "svg") {
      return await fileSave(
@@ -137,7 +70,6 @@ export const exportCanvas = async (
    exportBackground,
    viewBackgroundColor,
    exportPadding,
-    exportingFrame,
  });

  if (type === "png") {
--- a/src/data/library.ts
+++ b/src/data/library.ts
@@ -23,7 +23,6 @@ import {
  LIBRARY_SIDEBAR_TAB,
 } from "../constants";
 import { libraryItemSvgsCache } from "../hooks/useLibraryItemSvg";
-import { cloneJSON } from "../utils";

 export const libraryItemsAtom = atom<{
  status: "loading" | "loaded";
@@ -32,7 +31,7 @@ export const libraryItemsAtom = atom<{
 }>({ status: "loaded", isInitialized: true, libraryItems: [] });

 const cloneLibraryItems = (libraryItems: LibraryItems): LibraryItems =>
-  cloneJSON(libraryItems);
+  JSON.parse(JSON.stringify(libraryItems));

 /**
 * checks if library item does not exist already in current library
--- a/src/data/magic.ts
+++ b/src/data/magic.ts
@@ -1,104 +0,0 @@
-import { Theme } from "../element/types";
-import { DataURL } from "../types";
-import { OpenAIInput, OpenAIOutput } from "./ai/types";
-
-export type MagicCacheData =
-  | {
-      status: "pending";
-    }
-  | { status: "done"; html: string }
-  | {
-      status: "error";
-      message?: string;
-      code: "ERR_GENERATION_INTERRUPTED" | string;
-    };
-
-const SYSTEM_PROMPT = `You are a skilled front-end developer who builds interactive prototypes from wireframes, and is an expert at CSS Grid and Flex design.
-Your role is to transform low-fidelity wireframes into working front-end HTML code.
-
-YOU MUST FOLLOW FOLLOWING RULES:
-
- Use HTML, CSS, JavaScript to build a responsive, accessible, polished prototype
- Leverage Tailwind for styling and layout (import as script <script src="https://cdn.tailwindcss.com"></script>)
- Inline JavaScript when needed
- Fetch dependencies from CDNs when needed (using unpkg or skypack)
- Source images from Unsplash or create applicable placeholders
- Interpret annotations as intended vs literal UI
- Fill gaps using your expertise in UX and business logic
- generate primarily for desktop UI, but make it responsive.
- Use grid and flexbox wherever applicable.
- Convert the wireframe in its entirety, don't omit elements if possible.
-
-If the wireframes, diagrams, or text is unclear or unreadable, refer to provided text for clarification.
-
-Your goal is a production-ready prototype that brings the wireframes to life.
-
-Please output JUST THE HTML file containing your best attempt at implementing the provided wireframes.`;
-
-export async function diagramToHTML({
-  image,
-  apiKey,
-  text,
-  theme = "light",
-}: {
-  image: DataURL;
-  apiKey: string;
-  text: string;
-  theme?: Theme;
-}) {
-  const body: OpenAIInput.ChatCompletionCreateParamsBase = {
-    model: "gpt-4-vision-preview",
-    // 4096 are max output tokens allowed for `gpt-4-vision-preview` currently
-    max_tokens: 4096,
-    temperature: 0.1,
-    messages: [
-      {
-        role: "system",
-        content: SYSTEM_PROMPT,
-      },
-      {
-        role: "user",
-        content: [
-          {
-            type: "image_url",
-            image_url: {
-              url: image,
-              detail: "high",
-            },
-          },
-          {
-            type: "text",
-            text: `Above is the reference wireframe. Please make a new website based on these and return just the HTML file. Also, please make it for the ${theme} theme. What follows are the wireframe's text annotations (if any)...`,
-          },
-          {
-            type: "text",
-            text,
-          },
-        ],
-      },
-    ],
-  };
-
-  let result:
-    | ({ ok: true } & OpenAIOutput.ChatCompletion)
-    | ({ ok: false } & OpenAIOutput.APIError);
-
-  const resp = await fetch("https://api.openai.com/v1/chat/completions", {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-      Authorization: `Bearer ${apiKey}`,
-    },
-    body: JSON.stringify(body),
-  });
-
-  if (resp.ok) {
-    const json: OpenAIOutput.ChatCompletion = await resp.json();
-    result = { ...json, ok: true };
-  } else {
-    const json: OpenAIOutput.APIError = await resp.json();
-    result = { ...json, ok: false };
-  }
-
-  return result;
-}
--- a/src/data/resave.ts
+++ b/src/data/resave.ts
@@ -1,6 +1,7 @@
 import { ExcalidrawElement } from "../element/types";
 import { AppState, BinaryFiles } from "../types";
-import { exportCanvas, prepareElementsForExport } from ".";
+import { exportCanvas } from ".";
+import { getNonDeletedElements } from "../element";
 import { getFileHandleType, isImageFileHandleType } from "./blob";

 export const resaveAsImageWithScene = async (
@@ -22,19 +23,18 @@ export const resaveAsImageWithScene = async (
    exportEmbedScene: true,
  };

-  const { exportedElements, exportingFrame } = prepareElementsForExport(
-    elements,
+  await exportCanvas(
+    fileHandleType,
+    getNonDeletedElements(elements),
    appState,
-    false,
+    files,
+    {
+      exportBackground,
+      viewBackgroundColor,
+      name,
+      fileHandle,
+    },
  );

-  await exportCanvas(fileHandleType, exportedElements, appState, files, {
-    exportBackground,
-    viewBackgroundColor,
-    name,
-    fileHandle,
-    exportingFrame,
-  });
-
  return { fileHandle };
 };
--- a/src/data/restore.ts
+++ b/src/data/restore.ts
@@ -1,6 +1,5 @@
 import {
  ExcalidrawElement,
-  ExcalidrawElementType,
  ExcalidrawSelectionElement,
  ExcalidrawTextElement,
  FontFamilyValues,
@@ -69,7 +68,6 @@ export const AllowedExcalidrawActiveTools: Record<
  embeddable: true,
  hand: true,
  laser: false,
-  magicframe: false,
 };

 export type RestoredDataState = {
@@ -113,7 +111,7 @@ const restoreElementWithProperties = <
    // @ts-ignore TS complains here but type checks the call sites fine.
    keyof K
  > &
-    Partial<Pick<ExcalidrawElement, "type" | "x" | "y" | "customData">>,
+    Partial<Pick<ExcalidrawElement, "type" | "x" | "y">>,
 ): T => {
  const base: Pick<T, keyof ExcalidrawElement> & {
    [PRECEDING_ELEMENT_KEY]?: string;
@@ -161,9 +159,8 @@ const restoreElementWithProperties = <
    locked: element.locked ?? false,
  };

-  if ("customData" in element || "customData" in extra) {
-    base.customData =
-      "customData" in extra ? extra.customData : element.customData;
+  if ("customData" in element) {
+    base.customData = element.customData;
  }

  if (PRECEDING_ELEMENT_KEY in element) {
@@ -276,7 +273,7 @@ const restoreElement = (

      return restoreElementWithProperties(element, {
        type:
-          (element.type as ExcalidrawElementType | "draw") === "draw"
+          (element.type as ExcalidrawElement["type"] | "draw") === "draw"
            ? "line"
            : element.type,
        startBinding: repairBinding(element.startBinding),
@@ -292,19 +289,15 @@ const restoreElement = (

    // generic elements
    case "ellipse":
+      return restoreElementWithProperties(element, {});
    case "rectangle":
+      return restoreElementWithProperties(element, {});
    case "diamond":
      return restoreElementWithProperties(element, {});
-    case "iframe":
-      return restoreElementWithProperties(element, {
-        scale: element.scale ?? [1, 1],
-      });
    case "embeddable":
      return restoreElementWithProperties(element, {
        validated: null,
-        scale: element.scale ?? [1, 1],
      });
-    case "magicframe":
    case "frame":
      return restoreElementWithProperties(element, {
        name: element.name ?? null,
--- a/src/data/transform.ts
+++ b/src/data/transform.ts
@@ -15,7 +15,6 @@ import {
  ElementConstructorOpts,
  newFrameElement,
  newImageElement,
-  newMagicFrameElement,
  newTextElement,
 } from "../element/newElement";
 import {
@@ -27,13 +26,12 @@ import {
  ExcalidrawArrowElement,
  ExcalidrawBindableElement,
  ExcalidrawElement,
+  ExcalidrawEmbeddableElement,
  ExcalidrawFrameElement,
  ExcalidrawFreeDrawElement,
  ExcalidrawGenericElement,
-  ExcalidrawIframeLikeElement,
  ExcalidrawImageElement,
  ExcalidrawLinearElement,
-  ExcalidrawMagicFrameElement,
  ExcalidrawSelectionElement,
  ExcalidrawTextElement,
  FileId,
@@ -42,7 +40,7 @@ import {
  VerticalAlign,
 } from "../element/types";
 import { MarkOptional } from "../utility-types";
-import { assertNever, cloneJSON, getFontString } from "../utils";
+import { assertNever, getFontString } from "../utils";
 import { getSizeFromPoints } from "../points";
 import { randomId } from "../random";

@@ -63,12 +61,7 @@ export type ValidLinearElement = {
            | {
                type: Exclude<
                  ExcalidrawBindableElement["type"],
-                  | "image"
-                  | "text"
-                  | "frame"
-                  | "magicframe"
-                  | "embeddable"
-                  | "iframe"
+                  "image" | "text" | "frame" | "embeddable"
                >;
                id?: ExcalidrawGenericElement["id"];
              }
@@ -76,12 +69,7 @@ export type ValidLinearElement = {
                id: ExcalidrawGenericElement["id"];
                type?: Exclude<
                  ExcalidrawBindableElement["type"],
-                  | "image"
-                  | "text"
-                  | "frame"
-                  | "magicframe"
-                  | "embeddable"
-                  | "iframe"
+                  "image" | "text" | "frame" | "embeddable"
                >;
              }
          )
@@ -105,12 +93,7 @@ export type ValidLinearElement = {
            | {
                type: Exclude<
                  ExcalidrawBindableElement["type"],
-                  | "image"
-                  | "text"
-                  | "frame"
-                  | "magicframe"
-                  | "embeddable"
-                  | "iframe"
+                  "image" | "text" | "frame" | "embeddable"
                >;
                id?: ExcalidrawGenericElement["id"];
              }
@@ -118,12 +101,7 @@ export type ValidLinearElement = {
                id: ExcalidrawGenericElement["id"];
                type?: Exclude<
                  ExcalidrawBindableElement["type"],
-                  | "image"
-                  | "text"
-                  | "frame"
-                  | "magicframe"
-                  | "embeddable"
-                  | "iframe"
+                  "image" | "text" | "frame" | "embeddable"
                >;
              }
          )
@@ -159,7 +137,7 @@ export type ValidContainer =
 export type ExcalidrawElementSkeleton =
  | Extract<
      Exclude<ExcalidrawElement, ExcalidrawSelectionElement>,
-      ExcalidrawIframeLikeElement | ExcalidrawFreeDrawElement
+      ExcalidrawEmbeddableElement | ExcalidrawFreeDrawElement
    >
  | ({
      type: Extract<ExcalidrawLinearElement["type"], "line">;
@@ -185,12 +163,7 @@ export type ExcalidrawElementSkeleton =
      type: "frame";
      children: readonly ExcalidrawElement["id"][];
      name?: string;
-    } & Partial<ExcalidrawFrameElement>)
-  | ({
-      type: "magicframe";
-      children: readonly ExcalidrawElement["id"][];
-      name?: string;
-    } & Partial<ExcalidrawMagicFrameElement>);
+    } & Partial<ExcalidrawFrameElement>);

 const DEFAULT_LINEAR_ELEMENT_PROPS = {
  width: 100,
@@ -395,8 +368,7 @@ const bindLinearElementToElement = (
  // Update start/end points by 0.5 so bindings don't overlap with start/end bound element coordinates.
  const endPointIndex = linearElement.points.length - 1;
  const delta = 0.5;
-
-  const newPoints = cloneJSON(linearElement.points) as [number, number][];
+  const newPoints = JSON.parse(JSON.stringify(linearElement.points));
  // left to right so shift the arrow towards right
  if (
    linearElement.points[endPointIndex][0] >
@@ -467,7 +439,9 @@ export const convertToExcalidrawElements = (
  if (!elementsSkeleton) {
    return [];
  }
-  const elements = cloneJSON(elementsSkeleton);
+  const elements: ExcalidrawElementSkeleton[] = JSON.parse(
+    JSON.stringify(elementsSkeleton),
+  );
  const elementStore = new ElementStore();
  const elementsWithIds = new Map<string, ExcalidrawElementSkeleton>();
  const oldToNewElementIdMap = new Map<string, string>();
@@ -574,16 +548,7 @@ export const convertToExcalidrawElements = (
        });
        break;
      }
-      case "magicframe": {
-        excalidrawElement = newMagicFrameElement({
-          x: 0,
-          y: 0,
-          ...element,
-        });
-        break;
-      }
      case "freedraw":
-      case "iframe":
      case "embeddable": {
        excalidrawElement = element;
        break;
@@ -692,7 +657,7 @@ export const convertToExcalidrawElements = (
  // need to calculate coordinates and dimensions of frame which is possibe after all
  // frame children are processed.
  for (const [id, element] of elementsWithIds) {
-    if (element.type !== "frame" && element.type !== "magicframe") {
+    if (element.type !== "frame") {
      continue;
    }
    const frame = elementStore.getElement(id);
--- a/src/element/ElementCanvasButtons.scss
+++ b/src/element/ElementCanvasButtons.scss
@@ -1,14 +0,0 @@
-.excalidraw {
-  .excalidraw-canvas-buttons {
-    position: absolute;
-
-    box-shadow: 0px 2px 4px 0 rgb(0 0 0 / 30%);
-    z-index: var(--zIndex-canvasButtons);
-    background: var(--island-bg-color);
-    border-radius: var(--border-radius-lg);
-
-    display: flex;
-    flex-direction: column;
-    gap: 0.375rem;
-  }
-}
--- a/src/element/ElementCanvasButtons.tsx
+++ b/src/element/ElementCanvasButtons.tsx
@@ -1,60 +0,0 @@
-import { AppState } from "../types";
-import { sceneCoordsToViewportCoords } from "../utils";
-import { NonDeletedExcalidrawElement } from "./types";
-import { getElementAbsoluteCoords } from ".";
-import { useExcalidrawAppState } from "../components/App";
-
-import "./ElementCanvasButtons.scss";
-
-const CONTAINER_PADDING = 5;
-
-const getContainerCoords = (
-  element: NonDeletedExcalidrawElement,
-  appState: AppState,
-) => {
-  const [x1, y1] = getElementAbsoluteCoords(element);
-  const { x: viewportX, y: viewportY } = sceneCoordsToViewportCoords(
-    { sceneX: x1 + element.width, sceneY: y1 },
-    appState,
-  );
-  const x = viewportX - appState.offsetLeft + 10;
-  const y = viewportY - appState.offsetTop;
-  return { x, y };
-};
-
-export const ElementCanvasButtons = ({
-  children,
-  element,
-}: {
-  children: React.ReactNode;
-  element: NonDeletedExcalidrawElement;
-}) => {
-  const appState = useExcalidrawAppState();
-
-  if (
-    appState.contextMenu ||
-    appState.draggingElement ||
-    appState.resizingElement ||
-    appState.isRotating ||
-    appState.openMenu ||
-    appState.viewModeEnabled
-  ) {
-    return null;
-  }
-
-  const { x, y } = getContainerCoords(element, appState);
-
-  return (
-    <div
-      className="excalidraw-canvas-buttons"
-      style={{
-        top: `${y}px`,
-        left: `${x}px`,
-        // width: CONTAINER_WIDTH,
-        padding: CONTAINER_PADDING,
-      }}
-    >
-      {children}
-    </div>
-  );
-};
--- a/src/element/Hyperlink.scss
+++ b/src/element/Hyperlink.scss
@@ -6,7 +6,7 @@
  justify-content: space-between;
  position: absolute;
  box-shadow: 0px 2px 4px 0 rgb(0 0 0 / 30%);
-  z-index: var(--zIndex-hyperlinkContainer);
+  z-index: 100;
  background: var(--island-bg-color);
  border-radius: var(--border-radius-md);
  box-sizing: border-box;
--- a/src/element/Hyperlink.tsx
+++ b/src/element/Hyperlink.tsx
@@ -121,7 +121,7 @@ export const Hyperlink = ({
          setToast({ message: embedLink.warning, closable: true });
        }
        const ar = embedLink
-          ? embedLink.intrinsicSize.w / embedLink.intrinsicSize.h
+          ? embedLink.aspectRatio.w / embedLink.aspectRatio.h
          : 1;
        const hasLinkChanged =
          embeddableLinkCache.get(element.id) !== element.link;
@@ -210,7 +210,6 @@ export const Hyperlink = ({
  };
  const { x, y } = getCoordsForPopover(element, appState);
  if (
-    appState.contextMenu ||
    appState.draggingElement ||
    appState.resizingElement ||
    appState.isRotating ||
--- a/src/element/bounds.ts
+++ b/src/element/bounds.ts
@@ -22,7 +22,6 @@ import { getBoundTextElement, getContainerElement } from "./textElement";
 import { LinearElementEditor } from "./linearElementEditor";
 import { Mutable } from "../utility-types";
 import { ShapeCache } from "../scene/ShapeCache";
-import Scene from "../scene/Scene";

 export type RectangleBox = {
  x: number;
@@ -60,17 +59,10 @@ export class ElementBounds {

    const bounds = ElementBounds.calculateBounds(element);

-    // hack to ensure that downstream checks could retrieve element Scene
-    // so as to have correctly calculated bounds
-    // FIXME remove when we get rid of all the id:Scene / element:Scene mapping
-    const shouldCache = Scene.getScene(element);
-
-    if (shouldCache) {
-      ElementBounds.boundsCache.set(element, {
-        version: element.version,
-        bounds,
-      });
-    }
+    ElementBounds.boundsCache.set(element, {
+      version: element.version,
+      bounds,
+    });

    return bounds;
  }
--- a/src/element/collision.ts
+++ b/src/element/collision.ts
@@ -18,6 +18,7 @@ import {
  ExcalidrawBindableElement,
  ExcalidrawElement,
  ExcalidrawRectangleElement,
+  ExcalidrawEmbeddableElement,
  ExcalidrawDiamondElement,
  ExcalidrawTextElement,
  ExcalidrawEllipseElement,
@@ -26,8 +27,7 @@ import {
  ExcalidrawImageElement,
  ExcalidrawLinearElement,
  StrokeRoundness,
-  ExcalidrawFrameLikeElement,
-  ExcalidrawIframeLikeElement,
+  ExcalidrawFrameElement,
 } from "./types";

 import {
@@ -41,8 +41,7 @@ import { Drawable } from "roughjs/bin/core";
 import { AppState } from "../types";
 import {
  hasBoundTextElement,
-  isFrameLikeElement,
-  isIframeLikeElement,
+  isEmbeddableElement,
  isImageElement,
 } from "./typeChecks";
 import { isTextElement } from ".";
@@ -65,7 +64,7 @@ const isElementDraggableFromInside = (
  const isDraggableFromInside =
    !isTransparent(element.backgroundColor) ||
    hasBoundTextElement(element) ||
-    isIframeLikeElement(element);
+    isEmbeddableElement(element);
  if (element.type === "line") {
    return isDraggableFromInside && isPathALoop(element.points);
  }
@@ -187,7 +186,7 @@ export const isPointHittingElementBoundingBox = (
  // by its frame, whether it has been selected or not
  // this logic here is not ideal
  // TODO: refactor it later...
-  if (isFrameLikeElement(element)) {
+  if (element.type === "frame") {
    return hitTestPointAgainstElement({
      element,
      point: [x, y],
@@ -256,7 +255,6 @@ type HitTestArgs = {
 const hitTestPointAgainstElement = (args: HitTestArgs): boolean => {
  switch (args.element.type) {
    case "rectangle":
-    case "iframe":
    case "embeddable":
    case "image":
    case "text":
@@ -284,8 +282,7 @@ const hitTestPointAgainstElement = (args: HitTestArgs): boolean => {
        "This should not happen, we need to investigate why it does.",
      );
      return false;
-    case "frame":
-    case "magicframe": {
+    case "frame": {
      // check distance to frame element first
      if (
        args.check(
@@ -317,10 +314,8 @@ export const distanceToBindableElement = (
    case "rectangle":
    case "image":
    case "text":
-    case "iframe":
    case "embeddable":
    case "frame":
-    case "magicframe":
      return distanceToRectangle(element, point);
    case "diamond":
      return distanceToDiamond(element, point);
@@ -351,8 +346,8 @@ const distanceToRectangle = (
    | ExcalidrawTextElement
    | ExcalidrawFreeDrawElement
    | ExcalidrawImageElement
-    | ExcalidrawIframeLikeElement
-    | ExcalidrawFrameLikeElement,
+    | ExcalidrawEmbeddableElement
+    | ExcalidrawFrameElement,
  point: Point,
 ): number => {
  const [, pointRel, hwidth, hheight] = pointRelativeToElement(element, point);
@@ -667,10 +662,8 @@ export const determineFocusDistance = (
    case "rectangle":
    case "image":
    case "text":
-    case "iframe":
    case "embeddable":
    case "frame":
-    case "magicframe":
      ret = c / (hwidth * (nabs + q * mabs));
      break;
    case "diamond":
@@ -707,10 +700,8 @@ export const determineFocusPoint = (
    case "image":
    case "text":
    case "diamond":
-    case "iframe":
    case "embeddable":
    case "frame":
-    case "magicframe":
      point = findFocusPointForRectangulars(element, focus, adjecentPointRel);
      break;
    case "ellipse":
@@ -761,10 +752,8 @@ const getSortedElementLineIntersections = (
    case "image":
    case "text":
    case "diamond":
-    case "iframe":
    case "embeddable":
    case "frame":
-    case "magicframe":
      const corners = getCorners(element);
      intersections = corners
        .flatMap((point, i) => {
@@ -799,8 +788,8 @@ const getCorners = (
    | ExcalidrawImageElement
    | ExcalidrawDiamondElement
    | ExcalidrawTextElement
-    | ExcalidrawIframeLikeElement
-    | ExcalidrawFrameLikeElement,
+    | ExcalidrawEmbeddableElement
+    | ExcalidrawFrameElement,
  scale: number = 1,
 ): GA.Point[] => {
  const hx = (scale * element.width) / 2;
@@ -809,10 +798,8 @@ const getCorners = (
    case "rectangle":
    case "image":
    case "text":
-    case "iframe":
    case "embeddable":
    case "frame":
-    case "magicframe":
      return [
        GA.point(hx, hy),
        GA.point(hx, -hy),
@@ -961,8 +948,8 @@ export const findFocusPointForRectangulars = (
    | ExcalidrawImageElement
    | ExcalidrawDiamondElement
    | ExcalidrawTextElement
-    | ExcalidrawIframeLikeElement
-    | ExcalidrawFrameLikeElement,
+    | ExcalidrawEmbeddableElement
+    | ExcalidrawFrameElement,
  // Between -1 and 1 for how far away should the focus point be relative
  // to the size of the element. Sign determines orientation.
  relativeDistance: number,
--- a/src/element/dragElements.ts
+++ b/src/element/dragElements.ts
@@ -11,7 +11,7 @@ import Scene from "../scene/Scene";
 import {
  isArrowElement,
  isBoundToContainer,
-  isFrameLikeElement,
+  isFrameElement,
 } from "./typeChecks";

 export const dragSelectedElements = (
@@ -33,7 +33,7 @@ export const dragSelectedElements = (
    selectedElements,
  );
  const frames = selectedElements
-    .filter((e) => isFrameLikeElement(e))
+    .filter((e) => isFrameElement(e))
    .map((f) => f.id);

  if (frames.length > 0) {
--- a/src/element/embeddable.ts
+++ b/src/element/embeddable.ts
@@ -6,22 +6,28 @@ import { getFontString, updateActiveTool } from "../utils";
 import { setCursorForShape } from "../cursor";
 import { newTextElement } from "./newElement";
 import { getContainerElement, wrapText } from "./textElement";
-import {
-  isFrameLikeElement,
-  isIframeElement,
-  isIframeLikeElement,
-} from "./typeChecks";
+import { isEmbeddableElement } from "./typeChecks";
 import {
  ExcalidrawElement,
-  ExcalidrawIframeLikeElement,
-  IframeData,
+  ExcalidrawEmbeddableElement,
  NonDeletedExcalidrawElement,
+  Theme,
 } from "./types";

-const embeddedLinkCache = new Map<string, IframeData>();
+type EmbeddedLink =
+  | ({
+      aspectRatio: { w: number; h: number };
+      warning?: string;
+    } & (
+      | { type: "video" | "generic"; link: string }
+      | { type: "document"; srcdoc: (theme: Theme) => string }
+    ))
+  | null;
+
+const embeddedLinkCache = new Map<string, EmbeddedLink>();

 const RE_YOUTUBE =
-  /^(?:http(?:s)?:\/\/)?(?:www\.)?youtu(?:be\.com|\.be)\/(embed\/|watch\?v=|shorts\/|playlist\?list=|embed\/videoseries\?list=)?([a-zA-Z0-9_-]+)(?:\?t=|.*&t=|\?start=|.*&start=)?([a-zA-Z0-9_-]+)?[^\s]*$/;
+  /^(?:http(?:s)?:\/\/)?(?:www\.)?youtu(?:be\.com|\.be)\/(embed\/|watch\?v=|shorts\/|playlist\?list=|embed\/videoseries\?list=)?([a-zA-Z0-9_-]+)(?:\?t=|&t=|\?start=|&start=)?([a-zA-Z0-9_-]+)?[^\s]*$/;

 const RE_VIMEO =
  /^(?:http(?:s)?:\/\/)?(?:(?:w){3}.)?(?:player\.)?vimeo\.com\/(?:video\/)?([^?\s]+)(?:\?.*)?$/;
@@ -58,16 +64,13 @@ const ALLOWED_DOMAINS = new Set([
  "stackblitz.com",
  "val.town",
  "giphy.com",
-  "dddice.com",
 ]);

-export const createSrcDoc = (body: string) => {
+const createSrcDoc = (body: string) => {
  return `<html><body>${body}</body></html>`;
 };

-export const getEmbedLink = (
-  link: string | null | undefined,
-): IframeData | null => {
+export const getEmbedLink = (link: string | null | undefined): EmbeddedLink => {
  if (!link) {
    return null;
  }
@@ -100,12 +103,8 @@ export const getEmbedLink = (
        break;
    }
    aspectRatio = isPortrait ? { w: 315, h: 560 } : { w: 560, h: 315 };
-    embeddedLinkCache.set(originalLink, {
-      link,
-      intrinsicSize: aspectRatio,
-      type,
-    });
-    return { link, intrinsicSize: aspectRatio, type };
+    embeddedLinkCache.set(originalLink, { link, aspectRatio, type });
+    return { link, aspectRatio, type };
  }

  const vimeoLink = link.match(RE_VIMEO);
@@ -119,12 +118,8 @@ export const getEmbedLink = (
    aspectRatio = { w: 560, h: 315 };
    //warning deliberately ommited so it is displayed only once per link
    //same link next time will be served from cache
-    embeddedLinkCache.set(originalLink, {
-      link,
-      intrinsicSize: aspectRatio,
-      type,
-    });
-    return { link, intrinsicSize: aspectRatio, type, warning };
+    embeddedLinkCache.set(originalLink, { link, aspectRatio, type });
+    return { link, aspectRatio, type, warning };
  }

  const figmaLink = link.match(RE_FIGMA);
@@ -134,35 +129,27 @@ export const getEmbedLink = (
      link,
    )}`;
    aspectRatio = { w: 550, h: 550 };
-    embeddedLinkCache.set(originalLink, {
-      link,
-      intrinsicSize: aspectRatio,
-      type,
-    });
-    return { link, intrinsicSize: aspectRatio, type };
+    embeddedLinkCache.set(originalLink, { link, aspectRatio, type });
+    return { link, aspectRatio, type };
  }

  const valLink = link.match(RE_VALTOWN);
  if (valLink) {
    link =
      valLink[1] === "embed" ? valLink[0] : valLink[0].replace("/v", "/embed");
-    embeddedLinkCache.set(originalLink, {
-      link,
-      intrinsicSize: aspectRatio,
-      type,
-    });
-    return { link, intrinsicSize: aspectRatio, type };
+    embeddedLinkCache.set(originalLink, { link, aspectRatio, type });
+    return { link, aspectRatio, type };
  }

  if (RE_TWITTER.test(link)) {
-    let ret: IframeData;
+    let ret: EmbeddedLink;
    // assume embed code
    if (/<blockquote/.test(link)) {
      const srcDoc = createSrcDoc(link);
      ret = {
        type: "document",
        srcdoc: () => srcDoc,
-        intrinsicSize: { w: 480, h: 480 },
+        aspectRatio: { w: 480, h: 480 },
      };
      // assume regular tweet url
    } else {
@@ -172,7 +159,7 @@ export const getEmbedLink = (
          createSrcDoc(
            `<blockquote class="twitter-tweet" data-dnt="true" data-theme="${theme}"><a href="${link}"></a></blockquote> <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>`,
          ),
-        intrinsicSize: { w: 480, h: 480 },
+        aspectRatio: { w: 480, h: 480 },
      };
    }
    embeddedLinkCache.set(originalLink, ret);
@@ -180,14 +167,14 @@ export const getEmbedLink = (
  }

  if (RE_GH_GIST.test(link)) {
-    let ret: IframeData;
+    let ret: EmbeddedLink;
    // assume embed code
    if (/<script>/.test(link)) {
      const srcDoc = createSrcDoc(link);
      ret = {
        type: "document",
        srcdoc: () => srcDoc,
-        intrinsicSize: { w: 550, h: 720 },
+        aspectRatio: { w: 550, h: 720 },
      };
      // assume regular url
    } else {
@@ -202,26 +189,26 @@ export const getEmbedLink = (
            .gist .gist-file { height: calc(100vh - 2px); padding: 0px; display: grid; grid-template-rows: 1fr auto; }
          </style>
        `),
-        intrinsicSize: { w: 550, h: 720 },
+        aspectRatio: { w: 550, h: 720 },
      };
    }
    embeddedLinkCache.set(link, ret);
    return ret;
  }

-  embeddedLinkCache.set(link, { link, intrinsicSize: aspectRatio, type });
-  return { link, intrinsicSize: aspectRatio, type };
+  embeddedLinkCache.set(link, { link, aspectRatio, type });
+  return { link, aspectRatio, type };
 };

-export const isIframeLikeOrItsLabel = (
+export const isEmbeddableOrFrameLabel = (
  element: NonDeletedExcalidrawElement,
 ): Boolean => {
-  if (isIframeLikeElement(element)) {
+  if (isEmbeddableElement(element)) {
    return true;
  }
  if (element.type === "text") {
    const container = getContainerElement(element);
-    if (container && isFrameLikeElement(container)) {
+    if (container && isEmbeddableElement(container)) {
      return true;
    }
  }
@@ -229,16 +216,10 @@ export const isIframeLikeOrItsLabel = (
 };

 export const createPlaceholderEmbeddableLabel = (
-  element: ExcalidrawIframeLikeElement,
+  element: ExcalidrawEmbeddableElement,
 ): ExcalidrawElement => {
-  let text: string;
-  if (isIframeElement(element)) {
-    text = "IFrame element";
-  } else {
-    text =
-      !element.link || element?.link === "" ? "Empty Web-Embed" : element.link;
-  }
-
+  const text =
+    !element.link || element?.link === "" ? "Empty Web-Embed" : element.link;
  const fontSize = Math.max(
    Math.min(element.width / 2, element.width / text.length),
    element.width / 30,
--- a/src/element/index.ts
+++ b/src/element/index.ts
@@ -2,6 +2,7 @@ import {
  ExcalidrawElement,
  NonDeletedExcalidrawElement,
  NonDeleted,
+  ExcalidrawFrameElement,
 } from "./types";
 import { isInvisiblySmallElement } from "./sizeHelpers";
 import { isLinearElementType } from "./typeChecks";
@@ -49,7 +50,11 @@ export {
  getDragOffsetXY,
  dragNewElement,
 } from "./dragElements";
-export { isTextElement, isExcalidrawElement } from "./typeChecks";
+export {
+  isTextElement,
+  isExcalidrawElement,
+  isFrameElement,
+} from "./typeChecks";
 export { textWysiwyg } from "./textWysiwyg";
 export { redrawTextBoundingBox } from "./textElement";
 export {
@@ -69,10 +74,17 @@ export const getVisibleElements = (elements: readonly ExcalidrawElement[]) =>
    (el) => !el.isDeleted && !isInvisiblySmallElement(el),
  ) as readonly NonDeletedExcalidrawElement[];

-export const getNonDeletedElements = <T extends ExcalidrawElement>(
-  elements: readonly T[],
+export const getNonDeletedElements = (elements: readonly ExcalidrawElement[]) =>
+  elements.filter(
+    (element) => !element.isDeleted,
+  ) as readonly NonDeletedExcalidrawElement[];
+
+export const getNonDeletedFrames = (
+  frames: readonly ExcalidrawFrameElement[],
 ) =>
-  elements.filter((element) => !element.isDeleted) as readonly NonDeleted<T>[];
+  frames.filter(
+    (frame) => !frame.isDeleted,
+  ) as readonly NonDeleted<ExcalidrawFrameElement>[];

 export const isNonDeletedElement = <T extends ExcalidrawElement>(
  element: T,
--- a/src/element/newElement.ts
+++ b/src/element/newElement.ts
@@ -14,8 +14,6 @@ import {
  ExcalidrawTextContainer,
  ExcalidrawFrameElement,
  ExcalidrawEmbeddableElement,
-  ExcalidrawMagicFrameElement,
-  ExcalidrawIframeElement,
 } from "../element/types";
 import {
  arrayToMap,
@@ -142,18 +140,6 @@ export const newEmbeddableElement = (
  return {
    ..._newElementBase<ExcalidrawEmbeddableElement>("embeddable", opts),
    validated: opts.validated,
-    scale: [1, 1],
-  };
-};
-
-export const newIframeElement = (
-  opts: {
-    type: "iframe";
-  } & ElementConstructorOpts,
-): NonDeleted<ExcalidrawIframeElement> => {
-  return {
-    ..._newElementBase<ExcalidrawIframeElement>("iframe", opts),
-    scale: [1, 1],
  };
 };

@@ -174,23 +160,6 @@ export const newFrameElement = (
  return frameElement;
 };

-export const newMagicFrameElement = (
-  opts: {
-    name?: string;
-  } & ElementConstructorOpts,
-): NonDeleted<ExcalidrawMagicFrameElement> => {
-  const frameElement = newElementWith(
-    {
-      ..._newElementBase<ExcalidrawMagicFrameElement>("magicframe", opts),
-      type: "magicframe",
-      name: opts?.name || null,
-    },
-    {},
-  );
-
-  return frameElement;
-};
-
 /** computes element x/y offset based on textAlign/verticalAlign */
 const getTextElementPositionOffsets = (
  opts: {
--- a/src/element/resizeElements.ts
+++ b/src/element/resizeElements.ts
@@ -27,8 +27,7 @@ import {
 import {
  isArrowElement,
  isBoundToContainer,
-  isIframeLikeElement,
-  isFrameLikeElement,
+  isFrameElement,
  isFreeDrawElement,
  isImageElement,
  isLinearElement,
@@ -164,7 +163,7 @@ const rotateSingleElement = (
  const cx = (x1 + x2) / 2;
  const cy = (y1 + y2) / 2;
  let angle: number;
-  if (isFrameLikeElement(element)) {
+  if (isFrameElement(element)) {
    angle = 0;
  } else {
    angle = (5 * Math.PI) / 2 + Math.atan2(pointerY - cy, pointerX - cx);
@@ -587,31 +586,15 @@ export const resizeSingleElement = (
  };

  if ("scale" in element && "scale" in stateAtResizeStart) {
-    if (isIframeLikeElement(element)) {
-      if (shouldMaintainAspectRatio) {
-        const scale: [number, number] = [
-          Math.abs(
-            eleNewWidth /
-              (stateAtResizeStart.width / stateAtResizeStart.scale[0]),
-          ),
-          Math.abs(
-            eleNewHeight /
-              (stateAtResizeStart.height / stateAtResizeStart.scale[1]),
-          ),
-        ];
-        mutateElement(element, { scale });
-      }
-    } else {
-      mutateElement(element, {
-        scale: [
-          // defaulting because scaleX/Y can be 0/-0
-          (Math.sign(newBoundsX2 - stateAtResizeStart.x) ||
-            stateAtResizeStart.scale[0]) * stateAtResizeStart.scale[0],
-          (Math.sign(newBoundsY2 - stateAtResizeStart.y) ||
-            stateAtResizeStart.scale[1]) * stateAtResizeStart.scale[1],
-        ],
-      });
-    }
+    mutateElement(element, {
+      scale: [
+        // defaulting because scaleX/Y can be 0/-0
+        (Math.sign(newBoundsX2 - stateAtResizeStart.x) ||
+          stateAtResizeStart.scale[0]) * stateAtResizeStart.scale[0],
+        (Math.sign(newBoundsY2 - stateAtResizeStart.y) ||
+          stateAtResizeStart.scale[1]) * stateAtResizeStart.scale[1],
+      ],
+    });
  }

  if (
@@ -917,7 +900,7 @@ const rotateMultipleElements = (
  }

  elements
-    .filter((element) => !isFrameLikeElement(element))
+    .filter((element) => element.type !== "frame")
    .forEach((element) => {
      const [x1, y1, x2, y2] = getElementAbsoluteCoords(element);
      const cx = (x1 + x2) / 2;
--- a/src/element/textElement.ts
+++ b/src/element/textElement.ts
@@ -1,7 +1,6 @@
 import { getFontString, arrayToMap, isTestEnv } from "../utils";
 import {
  ExcalidrawElement,
-  ExcalidrawElementType,
  ExcalidrawTextContainer,
  ExcalidrawTextElement,
  ExcalidrawTextElementWithContainer,
@@ -868,7 +867,7 @@ const VALID_CONTAINER_TYPES = new Set([
 ]);

 export const isValidTextContainer = (element: {
-  type: ExcalidrawElementType;
+  type: ExcalidrawElement["type"];
 }) => VALID_CONTAINER_TYPES.has(element.type);

 export const computeContainerDimensionForBoundText = (
--- a/src/element/textWysiwyg.test.tsx
+++ b/src/element/textWysiwyg.test.tsx
@@ -249,10 +249,8 @@ describe("textWysiwyg", () => {

    beforeEach(async () => {
      await render(<Excalidraw handleKeyboardGlobally={true} />);
-      // @ts-ignore
-      h.app.refreshViewportBreakpoints();
-      // @ts-ignore
-      h.app.refreshEditorBreakpoints();
+      //@ts-ignore
+      h.app.refreshDeviceState(h.app.excalidrawContainerRef.current!);

      textElement = UI.createElement("text");

--- a/src/element/transformHandles.ts
+++ b/src/element/transformHandles.ts
@@ -8,7 +8,7 @@ import { Bounds, getElementAbsoluteCoords } from "./bounds";
 import { rotate } from "../math";
 import { InteractiveCanvasAppState, Zoom } from "../types";
 import { isTextElement } from ".";
-import { isFrameLikeElement, isLinearElement } from "./typeChecks";
+import { isFrameElement, isLinearElement } from "./typeChecks";
 import { DEFAULT_SPACING } from "../renderer/renderScene";

 export type TransformHandleDirection =
@@ -257,7 +257,7 @@ export const getTransformHandles = (
    }
  } else if (isTextElement(element)) {
    omitSides = OMIT_SIDES_FOR_TEXT_ELEMENT;
-  } else if (isFrameLikeElement(element)) {
+  } else if (isFrameElement(element)) {
    omitSides = {
      rotation: true,
    };
--- a/src/element/typeChecks.ts
+++ b/src/element/typeChecks.ts
@@ -1,13 +1,13 @@
 import { ROUNDNESS } from "../constants";
-import { ElementOrToolType } from "../types";
+import { AppState } from "../types";
 import { MarkNonNullable } from "../utility-types";
-import { assertNever } from "../utils";
 import {
  ExcalidrawElement,
  ExcalidrawTextElement,
  ExcalidrawEmbeddableElement,
  ExcalidrawLinearElement,
  ExcalidrawBindableElement,
+  ExcalidrawGenericElement,
  ExcalidrawFreeDrawElement,
  InitializedExcalidrawImageElement,
  ExcalidrawImageElement,
@@ -15,13 +15,21 @@ import {
  ExcalidrawTextContainer,
  ExcalidrawFrameElement,
  RoundnessType,
-  ExcalidrawFrameLikeElement,
-  ExcalidrawElementType,
-  ExcalidrawIframeElement,
-  ExcalidrawIframeLikeElement,
-  ExcalidrawMagicFrameElement,
 } from "./types";

+export const isGenericElement = (
+  element: ExcalidrawElement | null,
+): element is ExcalidrawGenericElement => {
+  return (
+    element != null &&
+    (element.type === "selection" ||
+      element.type === "rectangle" ||
+      element.type === "diamond" ||
+      element.type === "ellipse" ||
+      element.type === "embeddable")
+  );
+};
+
 export const isInitializedImageElement = (
  element: ExcalidrawElement | null,
 ): element is InitializedExcalidrawImageElement => {
@@ -40,20 +48,6 @@ export const isEmbeddableElement = (
  return !!element && element.type === "embeddable";
 };

-export const isIframeElement = (
-  element: ExcalidrawElement | null,
-): element is ExcalidrawIframeElement => {
-  return !!element && element.type === "iframe";
-};
-
-export const isIframeLikeElement = (
-  element: ExcalidrawElement | null,
-): element is ExcalidrawIframeLikeElement => {
-  return (
-    !!element && (element.type === "iframe" || element.type === "embeddable")
-  );
-};
-
 export const isTextElement = (
  element: ExcalidrawElement | null,
 ): element is ExcalidrawTextElement => {
@@ -66,21 +60,6 @@ export const isFrameElement = (
  return element != null && element.type === "frame";
 };

-export const isMagicFrameElement = (
-  element: ExcalidrawElement | null,
-): element is ExcalidrawMagicFrameElement => {
-  return element != null && element.type === "magicframe";
-};
-
-export const isFrameLikeElement = (
-  element: ExcalidrawElement | null,
-): element is ExcalidrawFrameLikeElement => {
-  return (
-    element != null &&
-    (element.type === "frame" || element.type === "magicframe")
-  );
-};
-
 export const isFreeDrawElement = (
  element?: ExcalidrawElement | null,
 ): element is ExcalidrawFreeDrawElement => {
@@ -88,7 +67,7 @@ export const isFreeDrawElement = (
 };

 export const isFreeDrawElementType = (
-  elementType: ExcalidrawElementType,
+  elementType: ExcalidrawElement["type"],
 ): boolean => {
  return elementType === "freedraw";
 };
@@ -106,7 +85,7 @@ export const isArrowElement = (
 };

 export const isLinearElementType = (
-  elementType: ElementOrToolType,
+  elementType: AppState["activeTool"]["type"],
 ): boolean => {
  return (
    elementType === "arrow" || elementType === "line" // || elementType === "freedraw"
@@ -125,7 +104,7 @@ export const isBindingElement = (
 };

 export const isBindingElementType = (
-  elementType: ElementOrToolType,
+  elementType: AppState["activeTool"]["type"],
 ): boolean => {
  return elementType === "arrow";
 };
@@ -141,10 +120,8 @@ export const isBindableElement = (
      element.type === "diamond" ||
      element.type === "ellipse" ||
      element.type === "image" ||
-      element.type === "iframe" ||
      element.type === "embeddable" ||
      element.type === "frame" ||
-      element.type === "magicframe" ||
      (element.type === "text" && !element.containerId))
  );
 };
@@ -163,34 +140,17 @@ export const isTextBindableContainer = (
  );
 };

-export const isExcalidrawElement = (
-  element: any,
-): element is ExcalidrawElement => {
-  const type: ExcalidrawElementType | undefined = element?.type;
-  if (!type) {
-    return false;
-  }
-  switch (type) {
-    case "text":
-    case "diamond":
-    case "rectangle":
-    case "iframe":
-    case "embeddable":
-    case "ellipse":
-    case "arrow":
-    case "freedraw":
-    case "line":
-    case "frame":
-    case "magicframe":
-    case "image":
-    case "selection": {
-      return true;
-    }
-    default: {
-      assertNever(type, null);
-      return false;
-    }
-  }
+export const isExcalidrawElement = (element: any): boolean => {
+  return (
+    element?.type === "text" ||
+    element?.type === "diamond" ||
+    element?.type === "rectangle" ||
+    element?.type === "embeddable" ||
+    element?.type === "ellipse" ||
+    element?.type === "arrow" ||
+    element?.type === "freedraw" ||
+    element?.type === "line"
+  );
 };

 export const hasBoundTextElement = (
@@ -214,7 +174,7 @@ export const isBoundToContainer = (
 };

 export const isUsingAdaptiveRadius = (type: string) =>
-  type === "rectangle" || type === "embeddable" || type === "iframe";
+  type === "rectangle" || type === "embeddable";

 export const isUsingProportionalRadius = (type: string) =>
  type === "line" || type === "arrow" || type === "diamond";
--- a/src/element/types.ts
+++ b/src/element/types.ts
@@ -7,7 +7,6 @@ import {
  VERTICAL_ALIGN,
 } from "../constants";
 import { MarkNonNullable, ValueOf } from "../utility-types";
-import { MagicCacheData } from "../data/magic";

 export type ChartType = "bar" | "line";
 export type FillStyle = "hachure" | "cross-hatch" | "solid" | "zigzag";
@@ -96,30 +95,8 @@ export type ExcalidrawEmbeddableElement = _ExcalidrawElementBase &
     * may not have access to host-app supplied url validator during restore.
     */
    validated: boolean | null;
-    scale: [number, number];
  }>;

-export type ExcalidrawIframeElement = _ExcalidrawElementBase &
-  Readonly<{
-    type: "iframe";
-    // TODO move later to AI-specific frame
-    customData?: { generationData?: MagicCacheData };
-    scale: [number, number];
-  }>;
-
-export type ExcalidrawIframeLikeElement =
-  | ExcalidrawIframeElement
-  | ExcalidrawEmbeddableElement;
-
-export type IframeData =
-  | {
-      intrinsicSize: { w: number; h: number };
-      warning?: string;
-    } & (
-      | { type: "video" | "generic"; link: string }
-      | { type: "document"; srcdoc: (theme: Theme) => string }
-    );
-
 export type ExcalidrawImageElement = _ExcalidrawElementBase &
  Readonly<{
    type: "image";
@@ -140,15 +117,6 @@ export type ExcalidrawFrameElement = _ExcalidrawElementBase & {
  name: string | null;
 };

-export type ExcalidrawMagicFrameElement = _ExcalidrawElementBase & {
-  type: "magicframe";
-  name: string | null;
-};
-
-export type ExcalidrawFrameLikeElement =
-  | ExcalidrawFrameElement
-  | ExcalidrawMagicFrameElement;
-
 /**
 * These are elements that don't have any additional properties.
 */
@@ -170,8 +138,6 @@ export type ExcalidrawElement =
  | ExcalidrawFreeDrawElement
  | ExcalidrawImageElement
  | ExcalidrawFrameElement
-  | ExcalidrawMagicFrameElement
-  | ExcalidrawIframeElement
  | ExcalidrawEmbeddableElement;

 export type NonDeleted<TElement extends ExcalidrawElement> = TElement & {
@@ -204,10 +170,8 @@ export type ExcalidrawBindableElement =
  | ExcalidrawEllipseElement
  | ExcalidrawTextElement
  | ExcalidrawImageElement
-  | ExcalidrawIframeElement
  | ExcalidrawEmbeddableElement
-  | ExcalidrawFrameElement
-  | ExcalidrawMagicFrameElement;
+  | ExcalidrawFrameElement;

 export type ExcalidrawTextContainer =
  | ExcalidrawRectangleElement
@@ -253,5 +217,3 @@ export type ExcalidrawFreeDrawElement = _ExcalidrawElementBase &
  }>;

 export type FileId = string & { _brand: "FileId" };
-
-export type ExcalidrawElementType = ExcalidrawElement["type"];
--- a/src/errors.ts
+++ b/src/errors.ts
@@ -16,19 +16,3 @@ export class AbortError extends DOMException {
    super(message, "AbortError");
  }
 }
-
-type ImageSceneDataErrorCode =
-  | "IMAGE_NOT_CONTAINS_SCENE_DATA"
-  | "IMAGE_SCENE_DATA_ERROR";
-
-export class ImageSceneDataError extends Error {
-  public code;
-  constructor(
-    message = "Image Scene Data Error",
-    code: ImageSceneDataErrorCode = "IMAGE_SCENE_DATA_ERROR",
-  ) {
-    super(message);
-    this.name = "EncodingError";
-    this.code = code;
-  }
-}
--- a/src/frame.ts
+++ b/src/frame.ts
@@ -5,7 +5,7 @@ import {
 } from "./element";
 import {
  ExcalidrawElement,
-  ExcalidrawFrameLikeElement,
+  ExcalidrawFrameElement,
  NonDeleted,
  NonDeletedExcalidrawElement,
 } from "./element/types";
@@ -18,11 +18,11 @@ import { arrayToMap } from "./utils";
 import { mutateElement } from "./element/mutateElement";
 import { AppClassProperties, AppState, StaticCanvasAppState } from "./types";
 import { getElementsWithinSelection, getSelectedElements } from "./scene";
+import { isFrameElement } from "./element";
 import { getElementsInGroup, selectGroupsFromGivenElements } from "./groups";
 import Scene, { ExcalidrawElementsIncludingDeleted } from "./scene/Scene";
 import { getElementLineSegments } from "./element/bounds";
 import { doLineSegmentsIntersect } from "./packages/utils";
-import { isFrameElement, isFrameLikeElement } from "./element/typeChecks";

 // --------------------------- Frame State ------------------------------------
 export const bindElementsToFramesAfterDuplication = (
@@ -58,7 +58,7 @@ export const bindElementsToFramesAfterDuplication = (

 export function isElementIntersectingFrame(
  element: ExcalidrawElement,
-  frame: ExcalidrawFrameLikeElement,
+  frame: ExcalidrawFrameElement,
 ) {
  const frameLineSegments = getElementLineSegments(frame);

@@ -75,20 +75,20 @@ export function isElementIntersectingFrame(

 export const getElementsCompletelyInFrame = (
  elements: readonly ExcalidrawElement[],
-  frame: ExcalidrawFrameLikeElement,
+  frame: ExcalidrawFrameElement,
 ) =>
-  omitGroupsContainingFrameLikes(
+  omitGroupsContainingFrames(
    getElementsWithinSelection(elements, frame, false),
  ).filter(
    (element) =>
-      (!isFrameLikeElement(element) && !element.frameId) ||
+      (element.type !== "frame" && !element.frameId) ||
      element.frameId === frame.id,
  );

 export const isElementContainingFrame = (
  elements: readonly ExcalidrawElement[],
  element: ExcalidrawElement,
-  frame: ExcalidrawFrameLikeElement,
+  frame: ExcalidrawFrameElement,
 ) => {
  return getElementsWithinSelection(elements, element).some(
    (e) => e.id === frame.id,
@@ -97,12 +97,12 @@ export const isElementContainingFrame = (

 export const getElementsIntersectingFrame = (
  elements: readonly ExcalidrawElement[],
-  frame: ExcalidrawFrameLikeElement,
+  frame: ExcalidrawFrameElement,
 ) => elements.filter((element) => isElementIntersectingFrame(element, frame));

 export const elementsAreInFrameBounds = (
  elements: readonly ExcalidrawElement[],
-  frame: ExcalidrawFrameLikeElement,
+  frame: ExcalidrawFrameElement,
 ) => {
  const [selectionX1, selectionY1, selectionX2, selectionY2] =
    getElementAbsoluteCoords(frame);
@@ -120,7 +120,7 @@ export const elementsAreInFrameBounds = (

 export const elementOverlapsWithFrame = (
  element: ExcalidrawElement,
-  frame: ExcalidrawFrameLikeElement,
+  frame: ExcalidrawFrameElement,
 ) => {
  return (
    elementsAreInFrameBounds([element], frame) ||
@@ -134,7 +134,7 @@ export const isCursorInFrame = (
    x: number;
    y: number;
  },
-  frame: NonDeleted<ExcalidrawFrameLikeElement>,
+  frame: NonDeleted<ExcalidrawFrameElement>,
 ) => {
  const [fx1, fy1, fx2, fy2] = getElementAbsoluteCoords(frame);

@@ -148,7 +148,7 @@ export const isCursorInFrame = (
 export const groupsAreAtLeastIntersectingTheFrame = (
  elements: readonly NonDeletedExcalidrawElement[],
  groupIds: readonly string[],
-  frame: ExcalidrawFrameLikeElement,
+  frame: ExcalidrawFrameElement,
 ) => {
  const elementsInGroup = groupIds.flatMap((groupId) =>
    getElementsInGroup(elements, groupId),
@@ -168,7 +168,7 @@ export const groupsAreAtLeastIntersectingTheFrame = (
 export const groupsAreCompletelyOutOfFrame = (
  elements: readonly NonDeletedExcalidrawElement[],
  groupIds: readonly string[],
-  frame: ExcalidrawFrameLikeElement,
+  frame: ExcalidrawFrameElement,
 ) => {
  const elementsInGroup = groupIds.flatMap((groupId) =>
    getElementsInGroup(elements, groupId),
@@ -192,61 +192,33 @@ export const groupsAreCompletelyOutOfFrame = (
 /**
 * Returns a map of frameId to frame elements. Includes empty frames.
 */
-export const groupByFrameLikes = (elements: readonly ExcalidrawElement[]) => {
+export const groupByFrames = (elements: readonly ExcalidrawElement[]) => {
  const frameElementsMap = new Map<
    ExcalidrawElement["id"],
    ExcalidrawElement[]
  >();

  for (const element of elements) {
-    const frameId = isFrameLikeElement(element) ? element.id : element.frameId;
+    const frameId = isFrameElement(element) ? element.id : element.frameId;
    if (frameId && !frameElementsMap.has(frameId)) {
-      frameElementsMap.set(frameId, getFrameChildren(elements, frameId));
+      frameElementsMap.set(frameId, getFrameElements(elements, frameId));
    }
  }

  return frameElementsMap;
 };

-export const getFrameChildren = (
+export const getFrameElements = (
  allElements: ExcalidrawElementsIncludingDeleted,
  frameId: string,
 ) => allElements.filter((element) => element.frameId === frameId);

-export const getFrameLikeElements = (
-  allElements: ExcalidrawElementsIncludingDeleted,
-): ExcalidrawFrameLikeElement[] => {
-  return allElements.filter((element): element is ExcalidrawFrameLikeElement =>
-    isFrameLikeElement(element),
-  );
-};
-
-/**
- * Returns ExcalidrawFrameElements and non-frame-children elements.
- *
- * Considers children as root elements if they point to a frame parent
- * non-existing in the elements set.
- *
- * Considers non-frame bound elements (container or arrow labels) as root.
- */
-export const getRootElements = (
-  allElements: ExcalidrawElementsIncludingDeleted,
-) => {
-  const frameElements = arrayToMap(getFrameLikeElements(allElements));
-  return allElements.filter(
-    (element) =>
-      frameElements.has(element.id) ||
-      !element.frameId ||
-      !frameElements.has(element.frameId),
-  );
-};
-
 export const getElementsInResizingFrame = (
  allElements: ExcalidrawElementsIncludingDeleted,
-  frame: ExcalidrawFrameLikeElement,
+  frame: ExcalidrawFrameElement,
  appState: AppState,
 ): ExcalidrawElement[] => {
-  const prevElementsInFrame = getFrameChildren(allElements, frame.id);
+  const prevElementsInFrame = getFrameElements(allElements, frame.id);
  const nextElementsInFrame = new Set<ExcalidrawElement>(prevElementsInFrame);

  const elementsCompletelyInFrame = new Set([
@@ -336,9 +308,9 @@ export const getElementsInResizingFrame = (

 export const getElementsInNewFrame = (
  allElements: ExcalidrawElementsIncludingDeleted,
-  frame: ExcalidrawFrameLikeElement,
+  frame: ExcalidrawFrameElement,
 ) => {
-  return omitGroupsContainingFrameLikes(
+  return omitGroupsContainingFrames(
    allElements,
    getElementsCompletelyInFrame(allElements, frame),
  );
@@ -356,12 +328,12 @@ export const getContainingFrame = (
  if (element.frameId) {
    if (elementsMap) {
      return (elementsMap.get(element.frameId) ||
-        null) as null | ExcalidrawFrameLikeElement;
+        null) as null | ExcalidrawFrameElement;
    }
    return (
      (Scene.getScene(element)?.getElement(
        element.frameId,
-      ) as ExcalidrawFrameLikeElement) || null
+      ) as ExcalidrawFrameElement) || null
    );
  }
  return null;
@@ -377,7 +349,7 @@ export const getContainingFrame = (
 export const addElementsToFrame = (
  allElements: ExcalidrawElementsIncludingDeleted,
  elementsToAdd: NonDeletedExcalidrawElement[],
-  frame: ExcalidrawFrameLikeElement,
+  frame: ExcalidrawFrameElement,
 ) => {
  const { currTargetFrameChildrenMap } = allElements.reduce(
    (acc, element, index) => {
@@ -397,7 +369,7 @@ export const addElementsToFrame = (

  // - add bound text elements if not already in the array
  // - filter out elements that are already in the frame
-  for (const element of omitGroupsContainingFrameLikes(
+  for (const element of omitGroupsContainingFrames(
    allElements,
    elementsToAdd,
  )) {
@@ -438,7 +410,7 @@ export const removeElementsFromFrame = (
  >();

  const toRemoveElementsByFrame = new Map<
-    ExcalidrawFrameLikeElement["id"],
+    ExcalidrawFrameElement["id"],
    ExcalidrawElement[]
  >();

@@ -474,17 +446,17 @@ export const removeElementsFromFrame = (

 export const removeAllElementsFromFrame = (
  allElements: ExcalidrawElementsIncludingDeleted,
-  frame: ExcalidrawFrameLikeElement,
+  frame: ExcalidrawFrameElement,
  appState: AppState,
 ) => {
-  const elementsInFrame = getFrameChildren(allElements, frame.id);
+  const elementsInFrame = getFrameElements(allElements, frame.id);
  return removeElementsFromFrame(allElements, elementsInFrame, appState);
 };

 export const replaceAllElementsInFrame = (
  allElements: ExcalidrawElementsIncludingDeleted,
  nextElementsInFrame: ExcalidrawElement[],
-  frame: ExcalidrawFrameLikeElement,
+  frame: ExcalidrawFrameElement,
  appState: AppState,
 ) => {
  return addElementsToFrame(
@@ -524,7 +496,7 @@ export const updateFrameMembershipOfSelectedElements = (
  elementsToFilter.forEach((element) => {
    if (
      element.frameId &&
-      !isFrameLikeElement(element) &&
+      !isFrameElement(element) &&
      !isElementInFrame(element, allElements, appState)
    ) {
      elementsToRemove.add(element);
@@ -540,7 +512,7 @@ export const updateFrameMembershipOfSelectedElements = (
 * filters out elements that are inside groups that contain a frame element
 * anywhere in the group tree
 */
-export const omitGroupsContainingFrameLikes = (
+export const omitGroupsContainingFrames = (
  allElements: ExcalidrawElementsIncludingDeleted,
  /** subset of elements you want to filter. Optional perf optimization so we
   * don't have to filter all elements unnecessarily
@@ -558,9 +530,7 @@ export const omitGroupsContainingFrameLikes = (
  const rejectedGroupIds = new Set<string>();
  for (const groupId of uniqueGroupIds) {
    if (
-      getElementsInGroup(allElements, groupId).some((el) =>
-        isFrameLikeElement(el),
-      )
+      getElementsInGroup(allElements, groupId).some((el) => isFrameElement(el))
    ) {
      rejectedGroupIds.add(groupId);
    }
@@ -638,7 +608,7 @@ export const isElementInFrame = (
    }

    for (const elementInGroup of allElementsInGroup) {
-      if (isFrameLikeElement(elementInGroup)) {
+      if (isFrameElement(elementInGroup)) {
        return false;
      }
    }
@@ -652,15 +622,3 @@ export const isElementInFrame = (

  return false;
 };
-
-export const getFrameLikeTitle = (
-  element: ExcalidrawFrameLikeElement,
-  frameIdx: number,
-) => {
-  const existingName = element.name?.trim();
-  if (existingName) {
-    return existingName;
-  }
-  // TODO name frames AI only is specific to AI frames
-  return isFrameElement(element) ? `Frame ${frameIdx}` : `AI Frame ${frameIdx}`;
-};
--- a/Show More
+++ b/Show More