Coderabbit test

.env.development

@@ -1,5 +1,3 @@
-MODE="development"
-
 VITE_APP_BACKEND_V2_GET_URL=https://json-dev.excalidraw.com/api/v2/
 VITE_APP_BACKEND_V2_POST_URL=https://json-dev.excalidraw.com/api/v2/post/
 

.env.production

@@ -1,5 +1,3 @@
-MODE="production"
-
 VITE_APP_BACKEND_V2_GET_URL=https://json.excalidraw.com/api/v2/
 VITE_APP_BACKEND_V2_POST_URL=https://json.excalidraw.com/api/v2/post/
 

.github/copilot-instructions.md

@@ -1,45 +0,0 @@
-# Project coding standards
-
-## Generic Communication Guidelines
-
-- Be succint and be aware that expansive generative AI answers are costly and slow
-- Avoid providing explanations, trying to teach unless asked for, your chat partner is an expert
-- Stop apologising if corrected, just provide the correct information or code
-- Prefer code unless asked for explanation
-- Stop summarizing what you've changed after modifications unless asked for
-
-## TypeScript Guidelines
-
-- Use TypeScript for all new code
-- Where possible, prefer implementations without allocation
-- When there is an option, opt for more performant solutions and trade RAM usage for less CPU cycles
-- Prefer immutable data (const, readonly)
-- Use optional chaining (?.) and nullish coalescing (??) operators
-
-## React Guidelines
-
-- Use functional components with hooks
-- Follow the React hooks rules (no conditional hooks)
-- Keep components small and focused
-- Use CSS modules for component styling
-
-## Naming Conventions
-
-- Use PascalCase for component names, interfaces, and type aliases
-- Use camelCase for variables, functions, and methods
-- Use ALL_CAPS for constants
-
-## Error Handling
-
-- Use try/catch blocks for async operations
-- Implement proper error boundaries in React components
-- Always log errors with contextual information
-
-## Testing
-
-- Always attempt to fix #problems
-- Always offer to run `yarn test:app` in the project root after modifications are complete and attempt fixing the issues reported
-
-## Types
-
-- Always include `packages/math/src/types.ts` in the context when your write math related code and always use the Point type instead of { x, y}

.github/workflows/autorelease-excalidraw.yml

@@ -24,4 +24,4 @@ jobs:
       - name: Auto release
         run: |
           yarn add @actions/core -W
-          yarn release --tag=next --non-interactive
+          yarn autorelease

.github/workflows/autorelease-preview.yml

@@ -0,0 +1,55 @@
+name: Auto release excalidraw preview
+on:
+  issue_comment:
+    types: [created, edited]
+
+jobs:
+  Auto-release-excalidraw-preview:
+    name: Auto release preview
+    if: github.event.comment.body == '@excalibot trigger release' && github.event.issue.pull_request
+    runs-on: ubuntu-latest
+    steps:
+      - name: React to release comment
+        uses: peter-evans/create-or-update-comment@v1
+        with:
+          token: ${{ secrets.PUSH_TRANSLATIONS_COVERAGE_PAT }}
+          comment-id: ${{ github.event.comment.id }}
+          reactions: "+1"
+      - name: Get PR SHA
+        id: sha
+        uses: actions/github-script@v4
+        with:
+          result-encoding: string
+          script: |
+            const { owner, repo, number } = context.issue;
+            const pr = await github.pulls.get({
+              owner,
+              repo,
+              pull_number: number,
+            });
+            return pr.data.head.sha
+      - uses: actions/checkout@v2
+        with:
+          ref: ${{ steps.sha.outputs.result }}
+          fetch-depth: 2
+      - name: Setup Node.js 18.x
+        uses: actions/setup-node@v2
+        with:
+          node-version: 18.x
+      - name: Set up publish access
+        run: |
+          npm config set //registry.npmjs.org/:_authToken ${NPM_TOKEN}
+        env:
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+      - name: Auto release preview
+        id: "autorelease"
+        run: |
+          yarn add @actions/core -W
+          yarn autorelease preview ${{ github.event.issue.number }}
+      - name: Post comment post release
+        if: always()
+        uses: peter-evans/create-or-update-comment@v1
+        with:
+          token: ${{ secrets.PUSH_TRANSLATIONS_COVERAGE_PAT }}
+          issue-number: ${{ github.event.issue.number }}
+          body: "@${{ github.event.comment.user.login }} ${{ steps.autorelease.outputs.result }}"

.github/workflows/publish-docker.yml

@@ -17,14 +17,9 @@ jobs:
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v3
         with:
           context: .
           push: true
           tags: excalidraw/excalidraw:latest
-          platforms: linux/amd64, linux/arm64, linux/arm/v7

.gitignore

@@ -25,5 +25,4 @@ packages/excalidraw/types
 coverage
 dev-dist
 html
-meta*.json
+meta*.json
-.claude

.nvmrc

@@ -0,0 +1 @@
+18

CLAUDE.md

@@ -1,34 +0,0 @@
-# CLAUDE.md
-
-## Project Structure
-
-Excalidraw is a **monorepo** with a clear separation between the core library and the application:
-
-- **`packages/excalidraw/`** - Main React component library published to npm as `@excalidraw/excalidraw`
-- **`excalidraw-app/`** - Full-featured web application (excalidraw.com) that uses the library
-- **`packages/`** - Core packages: `@excalidraw/common`, `@excalidraw/element`, `@excalidraw/math`, `@excalidraw/utils`
-- **`examples/`** - Integration examples (NextJS, browser script)
-
-## Development Workflow
-
-1. **Package Development**: Work in `packages/*` for editor features
-2. **App Development**: Work in `excalidraw-app/` for app-specific features
-3. **Testing**: Always run `yarn test:update` before committing
-4. **Type Safety**: Use `yarn test:typecheck` to verify TypeScript
-
-## Development Commands
-
-```bash
-yarn test:typecheck  # TypeScript type checking
-yarn test:update     # Run all tests (with snapshot updates)
-yarn fix             # Auto-fix formatting and linting issues
-```
-
-## Architecture Notes
-
-### Package System
-
-- Uses Yarn workspaces for monorepo management
-- Internal packages use path aliases (see `vitest.config.mts`)
-- Build system uses esbuild for packages, Vite for the app
-- TypeScript throughout with strict configuration

Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=${BUILDPLATFORM} node:18 AS build
+FROM node:18 AS build
 
 WORKDIR /opt/node_app
 
@@ -6,14 +6,13 @@ COPY . .
 
 # do not ignore optional dependencies:
 # Error: Cannot find module @rollup/rollup-linux-x64-gnu
-RUN --mount=type=cache,target=/root/.cache/yarn \
+RUN yarn --network-timeout 600000
-    npm_config_target_arch=${TARGETARCH} yarn --network-timeout 600000
 
 ARG NODE_ENV=production
 
-RUN npm_config_target_arch=${TARGETARCH} yarn build:app:docker
+RUN yarn build:app:docker
 
-FROM --platform=${TARGETPLATFORM} nginx:1.27-alpine
+FROM nginx:1.27-alpine
 
 COPY --from=build /opt/node_app/excalidraw-app/build /usr/share/nginx/html
 

README.md

@@ -40,6 +40,7 @@
   <a href="https://twitter.com/excalidraw">
     <img alt="Follow Excalidraw on Twitter" src="https://img.shields.io/twitter/follow/excalidraw.svg?label=follow+@excalidraw&style=social&logo=twitter"/>
   </a>
+  <img alt"CodeRabbit Reviews" src="https://img.shields.io/coderabbit/prs/github/excalidraw/excalidraw?utm_source=oss&utm_medium=github&utm_campaign=excalidraw%2Fexcalidraw&labelColor=171717&color=FF570A&link=https%3A%2F%2Fcoderabbit.ai&label=CodeRabbit+Reviews"/>
 </p>
 
 <div align="center">

dev-docs/docs/@excalidraw/excalidraw/api/children-components/footer.mdx

@@ -9,7 +9,7 @@ You will need to import the `Footer` component from the package and wrap your co
 ```jsx live
 function App() {
   return (
-    <div style={{ height: "500px" }}>
+    <div style={{ height: "500px"}}>
       <Excalidraw>
         <Footer>
           <button
@@ -27,19 +27,19 @@ function App() {
 
 This will only work for `Desktop` devices.
 
-For `mobile` you will need to render it inside the [MainMenu](#mainmenu). You can use the [`useEditorInterface`](#useEditorInterface) hook to check the type of device, this will be available only inside the `children` of `Excalidraw` component.
+For `mobile` you will need to render it inside the [MainMenu](#mainmenu). You can use the [`useDevice`](#useDevice) hook to check the type of device, this will be available only inside the `children` of `Excalidraw` component.
 
 Open the `Menu` in the below playground and you will see the `custom footer` rendered.
 
 ```jsx live noInline
 const MobileFooter = ({}) => {
-  const editorInterface = useEditorInterface();
+  const device = useDevice();
-  if (editorInterface.formFactor === "phone") {
+  if (device.editor.isMobile) {
     return (
       <Footer>
         <button
           className="custom-footer"
-          style={{ marginLeft: "20px", height: "2rem" }}
+          style= {{ marginLeft: '20px', height: '2rem'}}
           onClick={() => alert("This is custom footer in mobile menu")}
         >
           custom footer

dev-docs/docs/@excalidraw/excalidraw/api/props/excalidraw-api.mdx

@@ -363,7 +363,13 @@ This API has the below signature. It sets the `tool` passed in param as the acti
 ```ts
 (
   tool: (
-    | { type: ToolType }
+    | (
+        | { type: Exclude<ToolType, "image"> }
+        | {
+            type: Extract<ToolType, "image">;
+            insertOnCanvasDirectly?: boolean;
+          }
+      )
     | { type: "custom"; customType: string }
   ) & { locked?: boolean },
 ) => {};
@@ -371,7 +377,7 @@ This API has the below signature. It sets the `tool` passed in param as the acti
 
 | Name | Type | Default | Description |
 | --- | --- | --- | --- |
-| `type` | [ToolType](https://github.com/excalidraw/excalidraw/blob/master/packages/excalidraw/types.ts#L91) | `selection` | The tool type which should be set as active tool |
+| `type` | [ToolType](https://github.com/excalidraw/excalidraw/blob/master/packages/excalidraw/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 |
 
 ## setCursor

dev-docs/docs/@excalidraw/excalidraw/api/utils/utils-intro.md

@@ -292,7 +292,7 @@ viewportCoordsToSceneCoords(&#123; clientX: number, clientY: number },<br/>&nbsp
   appState: <a href="https://github.com/excalidraw/excalidraw/blob/master/packages/excalidraw/types.ts#L95">AppState</a><br/>): &#123;x: number, y: number}
 </pre>
 
-### useEditorInterface
+### useDevice
 
 This hook can be used to check the type of device which is being used. It can only be used inside the `children` of `Excalidraw` component.
 
@@ -300,8 +300,8 @@ Open the `main menu` in the below example to view the footer.
 
 ```jsx live noInline
 const MobileFooter = ({}) => {
-  const editorInterface = useEditorInterface();
+  const device = useDevice();
-  if (editorInterface.formFactor === "phone") {
+  if (device.editor.isMobile) {
     return (
       <Footer>
         <button
@@ -336,20 +336,12 @@ render(<App />);
 The `device` has the following `attributes`, some grouped into `viewport` and `editor` objects, per context.
 
 | Name | Type | Description |
-| ---- | ---- | ----------- |
+| --- | --- | --- |
-
+| `viewport.isMobile` | `boolean` | Set to `true` when viewport is in `mobile` breakpoint |
-The `EditorInterface` object has the following properties:
+| `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` |
-| Name | Type | Description |
+| `editor.isMobile` | `boolean` | Set to `true` when editor container is in `mobile` breakpoint |
-| --- | --- | --- | --- | --- | --- |
+| `isTouchScreen` | `boolean` | Set to `true` for `touch` when touch event detected |
-| `formFactor` | `'phone' | 'tablet' | 'desktop'` | Indicates the device type based on screen size |
-| `desktopUIMode` | `'compact' | 'full'` | UI mode for desktop form factor |
-| `userAgent.raw` | `string` | Raw user agent string |
-| `userAgent.isMobileDevice` | `boolean` | True if device is mobile |
-| `userAgent.platform` | `'ios' | 'android' | 'other' | 'unknown'` | Device platform |
-| `isTouchScreen` | `boolean` | True if touch events are detected |
-| `canFitSidebar` | `boolean` | True if sidebar can fit in the viewport |
-| `isLandscape` | `boolean` | True if viewport is in landscape mode |
 
 ### i18n
 

dev-docs/docs/@excalidraw/excalidraw/development.mdx

@@ -28,12 +28,32 @@ To start the example app using the `@excalidraw/excalidraw` package, follow the
 
 ## Releasing
 
+### Create a test release
+
+You can create a test release by posting the below comment in your pull request:
+
+```bash
+@excalibot trigger release
+```
+
+Once the version is released `@excalibot` will post a comment with the release version.
+
 ### Creating a production release
 
 To release the next stable version follow the below steps:
 
 ```bash
-yarn release --tag=latest --version=0.19.0
+yarn prerelease:excalidraw
 ```
 
-You will need to pass the `latest` tag with `version` for which you want to create the release. This will make the changes needed before publishing the packages into NPM, like updating dependencies of all `@excalidraw/*` packages, generating new entries in `CHANGELOG.md` and more.
+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.
+
+The next step is to run the `release` script:
+
+```bash
+yarn release:excalidraw
+```
+
+This will publish the package.
+
+Right now there are two steps to create a production release but once this works fine these scripts will be combined and more automation will be done.

dev-docs/docs/@excalidraw/excalidraw/integration.mdx

@@ -38,8 +38,6 @@ If you want to only import `Excalidraw` component you can do :point_down:
 
 ```jsx showLineNumbers
 import dynamic from "next/dynamic";
-import "@excalidraw/excalidraw/index.css";
-
 const Excalidraw = dynamic(
   async () => (await import("@excalidraw/excalidraw")).Excalidraw,
   {

dev-docs/src/theme/ReactLiveScope/index.js

@@ -33,7 +33,6 @@ const ExcalidrawScope = {
   initialData,
   useI18n: ExcalidrawComp.useI18n,
   convertToExcalidrawElements: ExcalidrawComp.convertToExcalidrawElements,
-  CaptureUpdateAction: ExcalidrawComp.CaptureUpdateAction,
 };
 
 export default ExcalidrawScope;

docker-compose.yml

@@ -1,3 +1,5 @@
+version: "3.8"
+
 services:
   excalidraw:
     build:

examples/with-nextjs/package.json

@@ -3,8 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "build:packages": "yarn --cwd ../../ build:packages",
+    "build:workspace": "yarn workspace @excalidraw/excalidraw run build:esm && yarn copy:assets",
-    "build:workspace": "yarn build:packages && yarn copy:assets",
     "copy:assets": "cp -r ../../packages/excalidraw/dist/prod/fonts ./public",
     "dev": "yarn build:workspace && next dev -p 3005",
     "build": "yarn build:workspace && next build",

examples/with-script-in-browser/components/MobileFooter.tsx

@@ -12,10 +12,10 @@ const MobileFooter = ({
   excalidrawAPI: ExcalidrawImperativeAPI;
   excalidrawLib: typeof TExcalidraw;
 }) => {
-  const { useEditorInterface, Footer } = excalidrawLib;
+  const { useDevice, Footer } = excalidrawLib;
 
-  const editorInterface = useEditorInterface();
+  const device = useDevice();
-  if (editorInterface.formFactor === "phone") {
+  if (device.editor.isMobile) {
     return (
       <Footer>
         <CustomFooter

examples/with-script-in-browser/package.json

@@ -17,6 +17,6 @@
     "build": "vite build",
     "preview": "vite preview --port 5002",
     "build:preview": "yarn build && yarn preview",
-    "build:packages": "yarn --cwd ../../ build:packages"
+    "build:package": "yarn workspace @excalidraw/excalidraw run build:esm"
   }
 }

examples/with-script-in-browser/vercel.json

@@ -1,5 +1,5 @@
 {
   "outputDirectory": "dist",
   "installCommand": "yarn install",
-  "buildCommand": "yarn build:packages && yarn build"
+  "buildCommand": "yarn build:package && yarn build"
 }

excalidraw-app/App.tsx

@@ -4,8 +4,6 @@ import {
   TTDDialogTrigger,
   CaptureUpdateAction,
   reconcileElements,
-  getCommonBounds,
-  useEditorInterface,
 } from "@excalidraw/excalidraw";
 import { trackEvent } from "@excalidraw/excalidraw/analytics";
 import { getDefaultAppState } from "@excalidraw/excalidraw/appState";
@@ -22,6 +20,7 @@ import {
   APP_NAME,
   EVENT,
   THEME,
+  TITLE_TIMEOUT,
   VERSION_TIMEOUT,
   debounce,
   getVersion,
@@ -58,21 +57,9 @@ import {
   useHandleLibrary,
 } from "@excalidraw/excalidraw/data/library";
 
-import { getSelectedElements } from "@excalidraw/element/selection";
-
-import {
-  decodeConstraints,
-  encodeConstraints,
-} from "@excalidraw/excalidraw/scene/scrollConstraints";
-
-import { useApp } from "@excalidraw/excalidraw/components/App";
-
-import { clamp } from "@excalidraw/math";
-
 import type { RemoteExcalidrawElement } from "@excalidraw/excalidraw/data/reconcile";
 import type { RestoredDataState } from "@excalidraw/excalidraw/data/restore";
 import type {
-  ExcalidrawElement,
   FileId,
   NonDeletedExcalidrawElement,
   OrderedExcalidrawElement,
@@ -83,9 +70,8 @@ import type {
   BinaryFiles,
   ExcalidrawInitialDataState,
   UIAppState,
-  ScrollConstraints,
 } from "@excalidraw/excalidraw/types";
-import type { Merge, ResolutionType } from "@excalidraw/common/utility-types";
+import type { ResolutionType } from "@excalidraw/common/utility-types";
 import type { ResolvablePromise } from "@excalidraw/common/utils";
 
 import CustomStats from "./CustomStats";
@@ -134,7 +120,6 @@ import {
   LibraryIndexedDBAdapter,
   LibraryLocalStorageMigrationAdapter,
   LocalData,
-  localStorageQuotaExceededAtom,
 } from "./data/LocalData";
 import { isBrowserStorageStateNewer } from "./data/tabSync";
 import { ShareDialog, shareDialogStateAtom } from "./share/ShareDialog";
@@ -152,281 +137,10 @@ import { ExcalidrawPlusIframeExport } from "./ExcalidrawPlusIframeExport";
 
 import "./index.scss";
 
-import { ExcalidrawPlusPromoBanner } from "./components/ExcalidrawPlusPromoBanner";
-import { AppSidebar } from "./components/AppSidebar";
-
 import type { CollabAPI } from "./collab/Collab";
 
 polyfill();
 
-type DebugScrollConstraints = Merge<
-  ScrollConstraints,
-  { viewportZoomFactor: number; enabled: boolean }
->;
-
-const ConstraintsSettings = ({
-  initialConstraints,
-  excalidrawAPI,
-}: {
-  initialConstraints: DebugScrollConstraints;
-  excalidrawAPI: ExcalidrawImperativeAPI;
-}) => {
-  const [constraints, setConstraints] =
-    useState<DebugScrollConstraints>(initialConstraints);
-
-  const app = useApp();
-  const frames = app.scene.getNonDeletedFramesLikes();
-  const [activeFrameId, setActiveFrameId] = useState<string | null>(null);
-
-  useEffect(() => {
-    const params = new URLSearchParams(window.location.search);
-    params.set("constraints", encodeConstraints(constraints));
-    history.replaceState(null, "", `?${params.toString()}`);
-
-    constraints.enabled
-      ? excalidrawAPI.setScrollConstraints(constraints)
-      : excalidrawAPI.setScrollConstraints(null);
-  }, [constraints, excalidrawAPI]);
-
-  useEffect(() => {
-    const frame = frames.find((frame) => frame.id === activeFrameId);
-    if (frame) {
-      const { x, y, width, height } = frame;
-      setConstraints((s) => ({
-        x: Math.round(x),
-        y: Math.round(y),
-        width: Math.round(width),
-        height: Math.round(height),
-        enabled: s.enabled,
-        viewportZoomFactor: s.viewportZoomFactor,
-        lockZoom: s.lockZoom,
-      }));
-    }
-  }, [activeFrameId, frames]);
-
-  const [selection, setSelection] = useState<ExcalidrawElement[]>([]);
-  useEffect(() => {
-    return excalidrawAPI.onChange((elements, appState) => {
-      setSelection(getSelectedElements(elements, appState));
-    });
-  }, [excalidrawAPI]);
-
-  const parseValue = (
-    value: string,
-    opts?: {
-      min?: number;
-      max?: number;
-    },
-  ) => {
-    const { min = -Infinity, max = Infinity } = opts || {};
-    let parsedValue = parseInt(value);
-    if (isNaN(parsedValue)) {
-      parsedValue = 0;
-    }
-    return clamp(parsedValue, min, max);
-  };
-
-  const inputStyle = {
-    width: "4rem",
-    height: "1rem",
-  };
-
-  return (
-    <div
-      style={{
-        position: "fixed",
-        bottom: 10,
-        left: "calc(50%)",
-        transform: "translateX(-50%)",
-        zIndex: 999999,
-        display: "flex",
-        alignItems: "center",
-        justifyContent: "center",
-        flexDirection: "column",
-        gap: "0.5rem",
-      }}
-    >
-      <div
-        style={{
-          display: "flex",
-          gap: "0.6rem",
-          alignItems: "center",
-        }}
-      >
-        enabled:{" "}
-        <input
-          type="checkbox"
-          defaultChecked={!!constraints.enabled}
-          onChange={(e) =>
-            setConstraints((s) => ({ ...s, enabled: e.target.checked }))
-          }
-        />
-        x:{" "}
-        <input
-          placeholder="x"
-          type="number"
-          step={"10"}
-          value={constraints.x.toString()}
-          onChange={(e) => {
-            setConstraints((s) => ({
-              ...s,
-              x: parseValue(e.target.value),
-            }));
-          }}
-          style={inputStyle}
-        />
-        y:{" "}
-        <input
-          placeholder="y"
-          type="number"
-          step={"10"}
-          value={constraints.y.toString()}
-          onChange={(e) =>
-            setConstraints((s) => ({
-              ...s,
-              y: parseValue(e.target.value),
-            }))
-          }
-          style={inputStyle}
-        />
-        w:{" "}
-        <input
-          placeholder="width"
-          type="number"
-          step={"10"}
-          value={constraints.width.toString()}
-          onChange={(e) =>
-            setConstraints((s) => ({
-              ...s,
-              width: parseValue(e.target.value, {
-                min: 200,
-              }),
-            }))
-          }
-          style={inputStyle}
-        />
-        h:{" "}
-        <input
-          placeholder="height"
-          type="number"
-          step={"10"}
-          value={constraints.height.toString()}
-          onChange={(e) =>
-            setConstraints((s) => ({
-              ...s,
-              height: parseValue(e.target.value, {
-                min: 200,
-              }),
-            }))
-          }
-          style={inputStyle}
-        />
-        zoomFactor:
-        <input
-          placeholder="zoom factor"
-          type="number"
-          min="0.1"
-          max="1"
-          step="0.1"
-          value={constraints.viewportZoomFactor.toString()}
-          onChange={(e) =>
-            setConstraints((s) => ({
-              ...s,
-              viewportZoomFactor: parseFloat(e.target.value.toString()) ?? 0.7,
-            }))
-          }
-          style={inputStyle}
-        />
-        overscrollAllowance:
-        <input
-          placeholder="overscroll allowance"
-          type="number"
-          min="0"
-          max="1"
-          step="0.1"
-          value={constraints.overscrollAllowance?.toString()}
-          onChange={(e) =>
-            setConstraints((s) => ({
-              ...s,
-              overscrollAllowance: parseFloat(e.target.value.toString()) ?? 0.5,
-            }))
-          }
-          style={inputStyle}
-        />
-        lockZoom:{" "}
-        <input
-          type="checkbox"
-          defaultChecked={!!constraints.lockZoom}
-          onChange={(e) =>
-            setConstraints((s) => ({ ...s, lockZoom: e.target.checked }))
-          }
-          value={constraints.lockZoom?.toString()}
-        />
-        {selection.length > 0 && (
-          <button
-            onClick={() => {
-              const bbox = getCommonBounds(selection);
-              setConstraints((s) => ({
-                ...s,
-                x: Math.round(bbox[0]),
-                y: Math.round(bbox[1]),
-                width: Math.round(bbox[2] - bbox[0]),
-                height: Math.round(bbox[3] - bbox[1]),
-              }));
-            }}
-          >
-            use selection
-          </button>
-        )}
-      </div>
-
-      {frames.length > 0 && (
-        <div
-          style={{
-            display: "flex",
-            gap: "0.6rem",
-            flexDirection: "row",
-          }}
-        >
-          <button
-            onClick={() => {
-              const currentIndex = frames.findIndex(
-                (frame) => frame.id === activeFrameId,
-              );
-
-              if (currentIndex === -1) {
-                setActiveFrameId(frames[frames.length - 1].id);
-              } else {
-                const nextIndex =
-                  (currentIndex - 1 + frames.length) % frames.length;
-                setActiveFrameId(frames[nextIndex].id);
-              }
-            }}
-          >
-            Prev
-          </button>
-          <button
-            onClick={() => {
-              const currentIndex = frames.findIndex(
-                (frame) => frame.id === activeFrameId,
-              );
-
-              if (currentIndex === -1) {
-                setActiveFrameId(frames[0].id);
-              } else {
-                const nextIndex = (currentIndex + 1) % frames.length;
-                setActiveFrameId(frames[nextIndex].id);
-              }
-            }}
-          >
-            Next
-          </button>
-        </div>
-      )}
-    </div>
-  );
-};
-
 window.EXCALIDRAW_THROTTLE_RENDER = true;
 
 declare global {
@@ -498,20 +212,10 @@ const initializeScene = async (opts: {
   )
 > => {
   const searchParams = new URLSearchParams(window.location.search);
-  const hashParams = new URLSearchParams(window.location.hash.slice(1));
   const id = searchParams.get("id");
-  const shareableLink = hashParams.get("json")?.split(",");
+  const jsonBackendMatch = window.location.hash.match(
-
+    /^#json=([a-zA-Z0-9_-]+),([a-zA-Z0-9_-]+)$/,
-  if (shareableLink) {
+  );
-    hashParams.delete("json");
-    const hash = `#${decodeURIComponent(hashParams.toString())}`;
-    window.history.replaceState(
-      {},
-      APP_NAME,
-      `${window.location.origin}${hash}`,
-    );
-  }
-
   const externalUrlMatch = window.location.hash.match(/^#url=(.*)$/);
 
   const localDataState = importFromLocalStorage();
@@ -521,7 +225,7 @@ const initializeScene = async (opts: {
   } = await loadScene(null, null, localDataState);
 
   let roomLinkData = getCollaborationLinkData(window.location.href);
-  const isExternalScene = !!(id || shareableLink || roomLinkData);
+  const isExternalScene = !!(id || jsonBackendMatch || roomLinkData);
   if (isExternalScene) {
     if (
       // don't prompt if scene is empty
@@ -531,16 +235,16 @@ const initializeScene = async (opts: {
       // otherwise, prompt whether user wants to override current scene
       (await openConfirmModal(shareableLinkConfirmDialog))
     ) {
-      if (shareableLink) {
+      if (jsonBackendMatch) {
         scene = await loadScene(
-          shareableLink[0],
+          jsonBackendMatch[1],
-          shareableLink[1],
+          jsonBackendMatch[2],
           localDataState,
         );
       }
       scene.scrollToContent = true;
       if (!roomLinkData) {
-        // window.history.replaceState({}, APP_NAME, window.location.origin);
+        window.history.replaceState({}, APP_NAME, window.location.origin);
       }
     } else {
       // https://github.com/excalidraw/excalidraw/issues/1919
@@ -557,7 +261,7 @@ const initializeScene = async (opts: {
       }
 
       roomLinkData = null;
-      // window.history.replaceState({}, APP_NAME, window.location.origin);
+      window.history.replaceState({}, APP_NAME, window.location.origin);
     }
   } else if (externalUrlMatch) {
     window.history.replaceState({}, APP_NAME, window.location.origin);
@@ -618,12 +322,12 @@ const initializeScene = async (opts: {
       key: roomLinkData.roomKey,
     };
   } else if (scene) {
-    return isExternalScene && shareableLink
+    return isExternalScene && jsonBackendMatch
       ? {
           scene,
           isExternalScene,
-          id: shareableLink[0],
+          id: jsonBackendMatch[1],
-          key: shareableLink[1],
+          key: jsonBackendMatch[2],
         }
       : { scene, isExternalScene: false };
   }
@@ -638,8 +342,6 @@ const ExcalidrawWrapper = () => {
 
   const [langCode, setLangCode] = useAppLangCode();
 
-  const editorInterface = useEditorInterface();
-
   // initial state
   // ---------------------------------------------------------------------------
 
@@ -797,6 +499,11 @@ const ExcalidrawWrapper = () => {
       }
     };
 
+    const titleTimeout = setTimeout(
+      () => (document.title = APP_NAME),
+      TITLE_TIMEOUT,
+    );
+
     const syncData = debounce(() => {
       if (isTestEnv()) {
         return;
@@ -887,6 +594,7 @@ const ExcalidrawWrapper = () => {
         visibilityChange,
         false,
       );
+      clearTimeout(titleTimeout);
     };
   }, [isCollabDisabled, collabAPI, excalidrawAPI, setLangCode]);
 
@@ -961,8 +669,8 @@ const ExcalidrawWrapper = () => {
       debugRenderer(
         debugCanvasRef.current,
         appState,
-        elements,
         window.devicePixelRatio,
+        () => forceRefresh((prev) => !prev),
       );
     }
   };
@@ -1026,39 +734,11 @@ const ExcalidrawWrapper = () => {
 
   const isOffline = useAtomValue(isOfflineAtom);
 
-  const localStorageQuotaExceeded = useAtomValue(localStorageQuotaExceededAtom);
-
   const onCollabDialogOpen = useCallback(
     () => setShareDialogState({ isOpen: true, type: "collaborationOnly" }),
     [setShareDialogState],
   );
 
-  const [constraints] = useState<DebugScrollConstraints>(() => {
-    const stored = new URLSearchParams(location.search.slice(1)).get(
-      "constraints",
-    );
-    let storedConstraints = {};
-    if (stored) {
-      try {
-        storedConstraints = decodeConstraints(stored);
-      } catch {
-        console.error("Invalid scroll constraints in URL");
-      }
-    }
-
-    return {
-      x: 0,
-      y: 0,
-      width: document.body.clientWidth,
-      height: document.body.clientHeight,
-      lockZoom: false,
-      viewportZoomFactor: 0.7,
-      overscrollAllowance: 0.5,
-      enabled: !isTestEnv(),
-      ...storedConstraints,
-    };
-  });
-
   // browsers generally prevent infinite self-embedding, there are
   // cases where it still happens, and while we disallow self-embedding
   // by not whitelisting our own origin, this serves as an additional guard
@@ -1172,27 +852,18 @@ const ExcalidrawWrapper = () => {
           if (isMobile || !collabAPI || isCollabDisabled) {
             return null;
           }
-
           return (
-            <div className="excalidraw-ui-top-right">
+            <div className="top-right-ui">
-              {excalidrawAPI?.getEditorInterface().formFactor === "desktop" && (
-                <ExcalidrawPlusPromoBanner
-                  isSignedIn={isExcalidrawPlusSignedUser}
-                />
-              )}
-
               {collabError.message && <CollabError collabError={collabError} />}
               <LiveCollaborationTrigger
                 isCollaborating={isCollaborating}
                 onSelect={() =>
                   setShareDialogState({ isOpen: true, type: "share" })
                 }
-                editorInterface={editorInterface}
               />
             </div>
           );
         }}
-        // scrollConstraints={constraints.enabled ? constraints : undefined}
         onLinkOpen={(element, event) => {
           if (element.link && isElementLink(element.link)) {
             event.preventDefault();
@@ -1200,12 +871,6 @@ const ExcalidrawWrapper = () => {
           }
         }}
       >
-        {/* {excalidrawAPI && !isTestEnv() && (
-          <ConstraintsSettings
-            excalidrawAPI={excalidrawAPI}
-            initialConstraints={constraints}
-          />
-        )} */}
         <AppMainMenu
           onCollabDialogOpen={onCollabDialogOpen}
           isCollaborating={isCollaborating}
@@ -1243,15 +908,10 @@ const ExcalidrawWrapper = () => {
 
         <TTDDialogTrigger />
         {isCollaborating && isOffline && (
-          <div className="alertalert--warning">
+          <div className="collab-offline-warning">
             {t("alerts.collabOfflineWarning")}
           </div>
         )}
-        {localStorageQuotaExceeded && (
-          <div className="alert alert--danger">
-            {t("alerts.localStorageQuotaExceeded")}
-          </div>
-        )}
         {latestShareableLink && (
           <ShareableLinkDialog
             link={latestShareableLink}
@@ -1280,8 +940,6 @@ const ExcalidrawWrapper = () => {
           }}
         />
 
-        <AppSidebar />
-
         {errorMessage && (
           <ErrorDialog onClose={() => setErrorMessage("")}>
             {errorMessage}

excalidraw-app/app_constants.ts

@@ -8,8 +8,7 @@ export const SYNC_BROWSER_TABS_TIMEOUT = 50;
 export const CURSOR_SYNC_TIMEOUT = 33; // ~30fps
 export const DELETED_ELEMENT_TIMEOUT = 24 * 60 * 60 * 1000; // 1 day
 
-// should be aligned with MAX_ALLOWED_FILE_BYTES
+export const FILE_UPLOAD_MAX_BYTES = 3 * 1024 * 1024; // 3 MiB
-export const FILE_UPLOAD_MAX_BYTES = 4 * 1024 * 1024; // 4 MiB
 // 1 year (https://stackoverflow.com/a/25201898/927631)
 export const FILE_CACHE_MAX_AGE_SEC = 31536000;
 

excalidraw-app/collab/Collab.tsx

@@ -530,10 +530,7 @@ class Collab extends PureComponent<CollabProps, CollabState> {
       return null;
     }
 
-    if (existingRoomLinkData) {
+    if (!existingRoomLinkData) {
-      // when joining existing room, don't merge it with current scene data
-      this.excalidrawAPI.resetScene();
-    } else {
       const elements = this.excalidrawAPI.getSceneElements().map((element) => {
         if (isImageElement(element) && element.status === "saved") {
           return newElementWith(element, { status: "pending" });

excalidraw-app/components/AppFooter.tsx

@@ -5,6 +5,7 @@ import { isExcalidrawPlusSignedUser } from "../app_constants";
 
 import { DebugFooter, isVisualDebuggerEnabled } from "./DebugCanvas";
 import { EncryptedIcon } from "./EncryptedIcon";
+import { ExcalidrawPlusAppLink } from "./ExcalidrawPlusAppLink";
 
 export const AppFooter = React.memo(
   ({ onChange }: { onChange: () => void }) => {
@@ -18,7 +19,11 @@ export const AppFooter = React.memo(
           }}
         >
           {isVisualDebuggerEnabled() && <DebugFooter onChange={onChange} />}
-          {!isExcalidrawPlusSignedUser && <EncryptedIcon />}
+          {isExcalidrawPlusSignedUser ? (
+            <ExcalidrawPlusAppLink />
+          ) : (
+            <EncryptedIcon />
+          )}
         </div>
       </Footer>
     );

excalidraw-app/components/AppSidebar.scss

@@ -1,36 +0,0 @@
-.excalidraw {
-  .app-sidebar-promo-container {
-    padding: 0.75rem;
-    display: flex;
-    flex-direction: column;
-    text-align: center;
-    gap: 1rem;
-    flex: 1 1 auto;
-  }
-
-  .app-sidebar-promo-image {
-    margin: 1rem 0;
-
-    height: 16.25rem;
-    background-size: contain;
-    background-position: center;
-    background-repeat: no-repeat;
-
-    background-image: radial-gradient(
-        circle,
-        transparent 60%,
-        var(--sidebar-bg-color) 100%
-      ),
-      var(--image-source);
-
-    display: flex;
-  }
-
-  .app-sidebar-promo-text {
-    padding: 0 2rem;
-  }
-
-  .link-button {
-    margin: 0 auto;
-  }
-}

excalidraw-app/components/AppSidebar.tsx

@@ -1,79 +0,0 @@
-import { DefaultSidebar, Sidebar, THEME } from "@excalidraw/excalidraw";
-import {
-  messageCircleIcon,
-  presentationIcon,
-} from "@excalidraw/excalidraw/components/icons";
-import { LinkButton } from "@excalidraw/excalidraw/components/LinkButton";
-import { useUIAppState } from "@excalidraw/excalidraw/context/ui-appState";
-
-import "./AppSidebar.scss";
-
-export const AppSidebar = () => {
-  const { theme, openSidebar } = useUIAppState();
-
-  return (
-    <DefaultSidebar>
-      <DefaultSidebar.TabTriggers>
-        <Sidebar.TabTrigger
-          tab="comments"
-          style={{ opacity: openSidebar?.tab === "comments" ? 1 : 0.4 }}
-        >
-          {messageCircleIcon}
-        </Sidebar.TabTrigger>
-        <Sidebar.TabTrigger
-          tab="presentation"
-          style={{ opacity: openSidebar?.tab === "presentation" ? 1 : 0.4 }}
-        >
-          {presentationIcon}
-        </Sidebar.TabTrigger>
-      </DefaultSidebar.TabTriggers>
-      <Sidebar.Tab tab="comments">
-        <div className="app-sidebar-promo-container">
-          <div
-            className="app-sidebar-promo-image"
-            style={{
-              ["--image-source" as any]: `url(/oss_promo_comments_${
-                theme === THEME.DARK ? "dark" : "light"
-              }.jpg)`,
-              opacity: 0.7,
-            }}
-          />
-          <div className="app-sidebar-promo-text">
-            Make comments with Excalidraw+
-          </div>
-          <LinkButton
-            href={`${
-              import.meta.env.VITE_APP_PLUS_LP
-            }/plus?utm_source=excalidraw&utm_medium=app&utm_content=comments_promo#excalidraw-redirect`}
-          >
-            Sign up now
-          </LinkButton>
-        </div>
-      </Sidebar.Tab>
-      <Sidebar.Tab tab="presentation" className="px-3">
-        <div className="app-sidebar-promo-container">
-          <div
-            className="app-sidebar-promo-image"
-            style={{
-              ["--image-source" as any]: `url(/oss_promo_presentations_${
-                theme === THEME.DARK ? "dark" : "light"
-              }.svg)`,
-              backgroundSize: "60%",
-              opacity: 0.4,
-            }}
-          />
-          <div className="app-sidebar-promo-text">
-            Create presentations with Excalidraw+
-          </div>
-          <LinkButton
-            href={`${
-              import.meta.env.VITE_APP_PLUS_LP
-            }/plus?utm_source=excalidraw&utm_medium=app&utm_content=presentations_promo#excalidraw-redirect`}
-          >
-            Sign up now
-          </LinkButton>
-        </div>
-      </Sidebar.Tab>
-    </DefaultSidebar>
-  );
-};

excalidraw-app/components/DebugCanvas.tsx

@@ -8,15 +8,8 @@ import {
   getNormalizedCanvasDimensions,
 } from "@excalidraw/excalidraw/renderer/helpers";
 import { type AppState } from "@excalidraw/excalidraw/types";
-import { arrayToMap, throttleRAF } from "@excalidraw/common";
+import { throttleRAF } from "@excalidraw/common";
-import { useCallback } from "react";
+import { useCallback, useImperativeHandle, useRef } from "react";
-
-import {
-  getGlobalFixedPointForBindableElement,
-  isArrowElement,
-  isBindableElement,
-  isFixedPointBinding,
-} from "@excalidraw/element";
 
 import {
   isLineSegment,
@@ -25,18 +18,9 @@ import {
 } from "@excalidraw/math";
 import { isCurve } from "@excalidraw/math/curve";
 
-import React from "react";
+import type { DebugElement } from "@excalidraw/excalidraw/visualdebug";
 
 import type { Curve } from "@excalidraw/math";
-import type { DebugElement } from "@excalidraw/common";
-import type {
-  ElementsMap,
-  ExcalidrawArrowElement,
-  ExcalidrawBindableElement,
-  FixedPointBinding,
-  OrderedExcalidrawElement,
-  PointBinding,
-} from "@excalidraw/element/types";
 
 import { STORAGE_KEYS } from "../app_constants";
 
@@ -89,180 +73,6 @@ const renderOrigin = (context: CanvasRenderingContext2D, zoom: number) => {
   context.save();
 };
 
-const _renderBinding = (
-  context: CanvasRenderingContext2D,
-  binding: FixedPointBinding | PointBinding,
-  elementsMap: ElementsMap,
-  zoom: number,
-  width: number,
-  height: number,
-  color: string,
-) => {
-  if (isFixedPointBinding(binding)) {
-    if (!binding.fixedPoint) {
-      console.warn("Binding must have a fixedPoint");
-      return;
-    }
-
-    const bindable = elementsMap.get(
-      binding.elementId,
-    ) as ExcalidrawBindableElement;
-    const [x, y] = getGlobalFixedPointForBindableElement(
-      binding.fixedPoint,
-      bindable,
-      elementsMap,
-    );
-
-    context.save();
-    context.strokeStyle = color;
-    context.lineWidth = 1;
-    context.beginPath();
-    context.moveTo(x * zoom, y * zoom);
-    context.bezierCurveTo(
-      x * zoom - width,
-      y * zoom - height,
-      x * zoom - width,
-      y * zoom + height,
-      x * zoom,
-      y * zoom,
-    );
-    context.stroke();
-    context.restore();
-  }
-};
-
-const _renderBindableBinding = (
-  binding: FixedPointBinding | PointBinding,
-  context: CanvasRenderingContext2D,
-  elementsMap: ElementsMap,
-  zoom: number,
-  width: number,
-  height: number,
-  color: string,
-) => {
-  if (isFixedPointBinding(binding)) {
-    const bindable = elementsMap.get(
-      binding.elementId,
-    ) as ExcalidrawBindableElement;
-    if (!binding.fixedPoint) {
-      console.warn("Binding must have a fixedPoint");
-      return;
-    }
-
-    const [x, y] = getGlobalFixedPointForBindableElement(
-      binding.fixedPoint,
-      bindable,
-      elementsMap,
-    );
-
-    context.save();
-    context.strokeStyle = color;
-    context.lineWidth = 1;
-    context.beginPath();
-    context.moveTo(x * zoom, y * zoom);
-    context.bezierCurveTo(
-      x * zoom + width,
-      y * zoom + height,
-      x * zoom + width,
-      y * zoom - height,
-      x * zoom,
-      y * zoom,
-    );
-    context.stroke();
-    context.restore();
-  }
-};
-
-const renderBindings = (
-  context: CanvasRenderingContext2D,
-  elements: readonly OrderedExcalidrawElement[],
-  zoom: number,
-) => {
-  const elementsMap = arrayToMap(elements);
-  const dim = 16;
-  elements.forEach((element) => {
-    if (element.isDeleted) {
-      return;
-    }
-
-    if (isArrowElement(element)) {
-      if (element.startBinding) {
-        if (
-          !elementsMap
-            .get(element.startBinding.elementId)
-            ?.boundElements?.find((e) => e.id === element.id)
-        ) {
-          return;
-        }
-
-        _renderBinding(
-          context,
-          element.startBinding as FixedPointBinding,
-          elementsMap,
-          zoom,
-          dim,
-          dim,
-          "red",
-        );
-      }
-
-      if (element.endBinding) {
-        if (
-          !elementsMap
-            .get(element.endBinding.elementId)
-            ?.boundElements?.find((e) => e.id === element.id)
-        ) {
-          return;
-        }
-        _renderBinding(
-          context,
-          element.endBinding,
-          elementsMap,
-          zoom,
-          dim,
-          dim,
-          "red",
-        );
-      }
-    }
-
-    if (isBindableElement(element) && element.boundElements?.length) {
-      element.boundElements.forEach((boundElement) => {
-        if (boundElement.type !== "arrow") {
-          return;
-        }
-
-        const arrow = elementsMap.get(
-          boundElement.id,
-        ) as ExcalidrawArrowElement;
-
-        if (arrow && arrow.startBinding?.elementId === element.id) {
-          _renderBindableBinding(
-            arrow.startBinding,
-            context,
-            elementsMap,
-            zoom,
-            dim,
-            dim,
-            "green",
-          );
-        }
-        if (arrow && arrow.endBinding?.elementId === element.id) {
-          _renderBindableBinding(
-            arrow.endBinding,
-            context,
-            elementsMap,
-            zoom,
-            dim,
-            dim,
-            "green",
-          );
-        }
-      });
-    }
-  });
-};
-
 const render = (
   frame: DebugElement[],
   context: CanvasRenderingContext2D,
@@ -295,14 +105,18 @@ const render = (
 const _debugRenderer = (
   canvas: HTMLCanvasElement,
   appState: AppState,
-  elements: readonly OrderedExcalidrawElement[],
   scale: number,
+  refresh: () => void,
 ) => {
   const [normalizedWidth, normalizedHeight] = getNormalizedCanvasDimensions(
     canvas,
     scale,
   );
 
+  if (appState.height !== canvas.height || appState.width !== canvas.width) {
+    refresh();
+  }
+
   const context = bootstrapCanvas({
     canvas,
     scale,
@@ -319,7 +133,6 @@ const _debugRenderer = (
   );
 
   renderOrigin(context, appState.zoom.value);
-  renderBindings(context, elements, appState.zoom.value);
 
   if (
     window.visualDebug?.currentFrame &&
@@ -371,10 +184,10 @@ export const debugRenderer = throttleRAF(
   (
     canvas: HTMLCanvasElement,
     appState: AppState,
-    elements: readonly OrderedExcalidrawElement[],
     scale: number,
+    refresh: () => void,
   ) => {
-    _debugRenderer(canvas, appState, elements, scale);
+    _debugRenderer(canvas, appState, scale, refresh);
   },
   { trailing: true },
 );
@@ -501,29 +314,35 @@ export const DebugFooter = ({ onChange }: { onChange: () => void }) => {
 interface DebugCanvasProps {
   appState: AppState;
   scale: number;
+  ref?: React.Ref<HTMLCanvasElement>;
 }
 
-const DebugCanvas = React.forwardRef<HTMLCanvasElement, DebugCanvasProps>(
+const DebugCanvas = ({ appState, scale, ref }: DebugCanvasProps) => {
-  ({ appState, scale }, ref) => {
+  const { width, height } = appState;
-    const { width, height } = appState;
 
-    return (
+  const canvasRef = useRef<HTMLCanvasElement>(null);
-      <canvas
+  useImperativeHandle<HTMLCanvasElement | null, HTMLCanvasElement | null>(
-        style={{
+    ref,
-          width,
+    () => canvasRef.current,
-          height,
+    [canvasRef],
-          position: "absolute",
+  );
-          zIndex: 2,
+
-          pointerEvents: "none",
+  return (
-        }}
+    <canvas
-        width={width * scale}
+      style={{
-        height={height * scale}
+        width,
-        ref={ref}
+        height,
-      >
+        position: "absolute",
-        Debug Canvas
+        zIndex: 2,
-      </canvas>
+        pointerEvents: "none",
-    );
+      }}
-  },
+      width={width * scale}
-);
+      height={height * scale}
+      ref={canvasRef}
+    >
+      Debug Canvas
+    </canvas>
+  );
+};
 
 export default DebugCanvas;

excalidraw-app/components/ExcalidrawPlusAppLink.tsx

@@ -0,0 +1,19 @@
+import { isExcalidrawPlusSignedUser } from "../app_constants";
+
+export const ExcalidrawPlusAppLink = () => {
+  if (!isExcalidrawPlusSignedUser) {
+    return null;
+  }
+  return (
+    <a
+      href={`${
+        import.meta.env.VITE_APP_PLUS_APP
+      }?utm_source=excalidraw&utm_medium=app&utm_content=signedInUserRedirectButton#excalidraw-redirect`}
+      target="_blank"
+      rel="noopener"
+      className="plus-button"
+    >
+      Go to Excalidraw+
+    </a>
+  );
+};

excalidraw-app/components/ExcalidrawPlusPromoBanner.tsx

@@ -1,22 +0,0 @@
-export const ExcalidrawPlusPromoBanner = ({
-  isSignedIn,
-}: {
-  isSignedIn: boolean;
-}) => {
-  return (
-    <a
-      href={
-        isSignedIn
-          ? import.meta.env.VITE_APP_PLUS_APP
-          : `${
-              import.meta.env.VITE_APP_PLUS_LP
-            }/plus?utm_source=excalidraw&utm_medium=app&utm_content=guestBanner#excalidraw-redirect`
-      }
-      target="_blank"
-      rel="noopener"
-      className="plus-banner"
-    >
-      Excalidraw+
-    </a>
-  );
-};

excalidraw-app/data/LocalData.ts

@@ -27,8 +27,6 @@ import {
   get,
 } from "idb-keyval";
 
-import { appJotaiStore, atom } from "excalidraw-app/app-jotai";
-
 import type { LibraryPersistedData } from "@excalidraw/excalidraw/data/library";
 import type { ImportedDataState } from "@excalidraw/excalidraw/data/types";
 import type { ExcalidrawElement, FileId } from "@excalidraw/element/types";
@@ -47,8 +45,6 @@ import { updateBrowserStateVersion } from "./tabSync";
 
 const filesStore = createStore("files-db", "files-store");
 
-export const localStorageQuotaExceededAtom = atom(false);
-
 class LocalFileManager extends FileManager {
   clearObsoleteFiles = async (opts: { currentFileIds: FileId[] }) => {
     await entries(filesStore).then((entries) => {
@@ -73,9 +69,6 @@ const saveDataStateToLocalStorage = (
   elements: readonly ExcalidrawElement[],
   appState: AppState,
 ) => {
-  const localStorageQuotaExceeded = appJotaiStore.get(
-    localStorageQuotaExceededAtom,
-  );
   try {
     const _appState = clearAppStateForLocalStorage(appState);
 
@@ -95,22 +88,12 @@ const saveDataStateToLocalStorage = (
       JSON.stringify(_appState),
     );
     updateBrowserStateVersion(STORAGE_KEYS.VERSION_DATA_STATE);
-    if (localStorageQuotaExceeded) {
-      appJotaiStore.set(localStorageQuotaExceededAtom, false);
-    }
   } catch (error: any) {
     // Unable to access window.localStorage
     console.error(error);
-    if (isQuotaExceededError(error) && !localStorageQuotaExceeded) {
-      appJotaiStore.set(localStorageQuotaExceededAtom, true);
-    }
   }
 };
 
-const isQuotaExceededError = (error: any) => {
-  return error instanceof DOMException && error.name === "QuotaExceededError";
-};
-
 type SavingLockTypes = "collaboration";
 
 export class LocalData {

excalidraw-app/data/firebase.ts

@@ -259,9 +259,7 @@ export const loadFromFirebase = async (
   }
   const storedScene = docSnap.data() as FirebaseStoredScene;
   const elements = getSyncableElements(
-    restoreElements(await decryptElements(storedScene, roomKey), null, {
+    restoreElements(await decryptElements(storedScene, roomKey), null),
-      deleteInvisibleElements: true,
-    }),
   );
 
   if (socket) {

excalidraw-app/data/index.ts

@@ -258,16 +258,11 @@ export const loadScene = async (
       await importFromBackend(id, privateKey),
       localDataState?.appState,
       localDataState?.elements,
-      {
+      { repairBindings: true, refreshDimensions: false },
-        repairBindings: true,
-        refreshDimensions: false,
-        deleteInvisibleElements: true,
-      },
     );
   } else {
     data = restore(localDataState || null, null, null, {
       repairBindings: true,
-      deleteInvisibleElements: true,
     });
   }
 

excalidraw-app/index.html

@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <title>Excalidraw Whiteboard</title>
+    <title>Excalidraw | Hand-drawn look & feel • Collaborative • Secure</title>
     <meta
       name="viewport"
       content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, viewport-fit=cover, shrink-to-fit=no"
@@ -14,7 +14,7 @@
     <!-- Primary Meta Tags -->
     <meta
       name="title"
-      content="Free, collaborative whiteboard • Hand-drawn look & feel | Excalidraw"
+      content="Excalidraw — Collaborative whiteboarding made easy"
     />
     <meta
       name="description"

excalidraw-app/index.scss

@@ -1,5 +1,3 @@
-@import "../packages/excalidraw/css/variables.module.scss";
-
 .excalidraw {
   --color-primary-contrast-offset: #625ee0; // to offset Chubb illusion
 
@@ -7,6 +5,12 @@
     --color-primary-contrast-offset: #726dff; // to offset Chubb illusion
   }
 
+  .top-right-ui {
+    display: flex;
+    justify-content: center;
+    align-items: flex-start;
+  }
+
   .footer-center {
     justify-content: flex-end;
     margin-top: auto;
@@ -54,7 +58,7 @@
     }
   }
 
-  .alert {
+  .collab-offline-warning {
     pointer-events: none;
     position: absolute;
     top: 6.5rem;
@@ -65,18 +69,10 @@
     text-align: center;
     line-height: 1.5;
     border-radius: var(--border-radius-md);
+    background-color: var(--color-warning);
+    color: var(--color-text-warning);
     z-index: 6;
     white-space: pre;
-
-    &--warning {
-      background-color: var(--color-warning);
-      color: var(--color-text-warning);
-    }
-
-    &--danger {
-      background-color: var(--color-danger-dark);
-      color: var(--color-danger-text);
-    }
   }
 }
 
@@ -86,31 +82,22 @@
   }
 }
 
-.plus-banner {
+.plus-button {
   display: flex;
   justify-content: center;
   cursor: pointer;
   align-items: center;
   border: 1px solid var(--color-primary);
-  padding: 0.5rem 0.875rem;
+  padding: 0.5rem 0.75rem;
   border-radius: var(--border-radius-lg);
   background-color: var(--island-bg-color);
+  color: var(--color-primary) !important;
   text-decoration: none !important;
 
-  font-family: var(--ui-font);
+  font-size: 0.75rem;
-  font-size: 0.8333rem;
   box-sizing: border-box;
   height: var(--lg-button-size);
 
-  border: none;
-  box-shadow: 0 0 0 1px var(--color-surface-lowest);
-  background-color: var(--color-surface-low);
-  color: var(--button-color, var(--color-on-surface)) !important;
-
-  &:active {
-    box-shadow: 0 0 0 1px var(--color-brand-active);
-  }
-
   &:hover {
     background-color: var(--color-primary);
     color: white !important;
@@ -122,7 +109,7 @@
 }
 
 .theme--dark {
-  .plus-banner {
+  .plus-button {
     &:hover {
       color: black !important;
     }

excalidraw-app/package.json

@@ -23,7 +23,7 @@
     ]
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": "18.0.0 - 22.x.x"
   },
   "dependencies": {
     "@excalidraw/random-username": "1.0.0",

excalidraw-app/tests/MobileMenu.test.tsx

@@ -17,15 +17,30 @@ describe("Test MobileMenu", () => {
 
   beforeEach(async () => {
     await render(<ExcalidrawApp />);
-    h.app.refreshEditorInterface();
+    // @ts-ignore
+    h.app.refreshViewportBreakpoints();
+    // @ts-ignore
+    h.app.refreshEditorBreakpoints();
   });
 
   afterAll(() => {
     restoreOriginalGetBoundingClientRect();
   });
 
-  it("should set editor interface correctly", () => {
+  it("should set device correctly", () => {
-    expect(h.app.editorInterface.formFactor).toBe("phone");
+    expect(h.app.device).toMatchInlineSnapshot(`
+      {
+        "editor": {
+          "canFitSidebar": false,
+          "isMobile": true,
+        },
+        "isTouchScreen": false,
+        "viewport": {
+          "isLandscape": false,
+          "isMobile": true,
+        },
+      }
+    `);
   });
 
   it("should initialize with welcome screen and hide once user interacts", async () => {

excalidraw-app/tests/collab.test.tsx

@@ -205,7 +205,6 @@ describe("collaboration", () => {
     // with explicit undo (as addition) we expect our item to be restored from the snapshot!
     await waitFor(() => {
       expect(API.getUndoStack().length).toBe(1);
-      expect(API.getRedoStack().length).toBe(1);
       expect(API.getSnapshot()).toEqual([
         expect.objectContaining(rect1Props),
         expect.objectContaining({ ...rect2Props, isDeleted: false }),
@@ -248,5 +247,79 @@ describe("collaboration", () => {
         expect.objectContaining({ ...rect2Props, isDeleted: true }),
       ]);
     });
+
+    act(() => h.app.actionManager.executeAction(undoAction));
+
+    // simulate local update
+    API.updateScene({
+      elements: syncInvalidIndices([
+        h.elements[0],
+        newElementWith(h.elements[1], { x: 100 }),
+      ]),
+      captureUpdate: CaptureUpdateAction.IMMEDIATELY,
+    });
+
+    await waitFor(() => {
+      expect(API.getUndoStack().length).toBe(2);
+      expect(API.getRedoStack().length).toBe(0);
+      expect(API.getSnapshot()).toEqual([
+        expect.objectContaining(rect1Props),
+        expect.objectContaining({ ...rect2Props, isDeleted: false, x: 100 }),
+      ]);
+      expect(h.elements).toEqual([
+        expect.objectContaining(rect1Props),
+        expect.objectContaining({ ...rect2Props, isDeleted: false, x: 100 }),
+      ]);
+    });
+
+    act(() => h.app.actionManager.executeAction(undoAction));
+
+    // we expect to iterate the stack to the first visible change
+    await waitFor(() => {
+      expect(API.getUndoStack().length).toBe(1);
+      expect(API.getRedoStack().length).toBe(1);
+      expect(API.getSnapshot()).toEqual([
+        expect.objectContaining(rect1Props),
+        expect.objectContaining({ ...rect2Props, isDeleted: false, x: 0 }),
+      ]);
+      expect(h.elements).toEqual([
+        expect.objectContaining(rect1Props),
+        expect.objectContaining({ ...rect2Props, isDeleted: false, x: 0 }),
+      ]);
+    });
+
+    // simulate force deleting the element remotely
+    API.updateScene({
+      elements: syncInvalidIndices([rect1]),
+      captureUpdate: CaptureUpdateAction.NEVER,
+    });
+
+    // snapshot was correctly updated and marked the element as deleted
+    await waitFor(() => {
+      expect(API.getUndoStack().length).toBe(1);
+      expect(API.getRedoStack().length).toBe(1);
+      expect(API.getSnapshot()).toEqual([
+        expect.objectContaining(rect1Props),
+        expect.objectContaining({ ...rect2Props, isDeleted: true, x: 0 }),
+      ]);
+      expect(h.elements).toEqual([expect.objectContaining(rect1Props)]);
+    });
+
+    act(() => h.app.actionManager.executeAction(redoAction));
+
+    // with explicit redo (as update) we again restored the element from the snapshot!
+    await waitFor(() => {
+      expect(API.getUndoStack().length).toBe(2);
+      expect(API.getRedoStack().length).toBe(0);
+      expect(API.getSnapshot()).toEqual([
+        expect.objectContaining({ id: "A", isDeleted: false }),
+        expect.objectContaining({ id: "B", isDeleted: true, x: 100 }),
+      ]);
+      expect(h.history.isRedoStackEmpty).toBeTruthy();
+      expect(h.elements).toEqual([
+        expect.objectContaining({ id: "A", isDeleted: false }),
+        expect.objectContaining({ id: "B", isDeleted: true, x: 100 }),
+      ]);
+    });
   });
 });

package.json

@@ -44,7 +44,7 @@
     "vitest-canvas-mock": "0.3.3"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": "18.0.0 - 22.x.x"
   },
   "homepage": ".",
   "prettier": "@excalidraw/prettier-config",
@@ -52,17 +52,13 @@
     "build-node": "node ./scripts/build-node.js",
     "build:app:docker": "yarn --cwd ./excalidraw-app build:app:docker",
     "build:app": "yarn --cwd ./excalidraw-app build:app",
-    "build:common": "yarn --cwd ./packages/common build:esm",
+    "build:package": "yarn --cwd ./packages/excalidraw build:esm",
-    "build:element": "yarn --cwd ./packages/element build:esm",
-    "build:excalidraw": "yarn --cwd ./packages/excalidraw build:esm",
-    "build:math": "yarn --cwd ./packages/math build:esm",
-    "build:packages": "yarn build:common && yarn build:math && yarn build:element && yarn build:excalidraw",
     "build:version": "yarn --cwd ./excalidraw-app build:version",
     "build": "yarn --cwd ./excalidraw-app build",
     "build:preview": "yarn --cwd ./excalidraw-app build:preview",
     "start": "yarn --cwd ./excalidraw-app start",
     "start:production": "yarn --cwd ./excalidraw-app start:production",
-    "start:example": "yarn build:packages && yarn --cwd ./examples/with-script-in-browser start",
+    "start:example": "yarn build:package && yarn --cwd ./examples/with-script-in-browser start",
     "test:all": "yarn test:typecheck && yarn test:code && yarn test:other && yarn test:app --watch=false",
     "test:app": "vitest",
     "test:code": "eslint --max-warnings=0 --ext .js,.ts,.tsx .",
@@ -80,10 +76,9 @@
     "locales-coverage:description": "node scripts/locales-coverage-description.js",
     "prepare": "husky install",
     "prettier": "prettier \"**/*.{css,scss,json,md,html,yml}\" --ignore-path=.eslintignore",
-    "release": "node scripts/release.js",
+    "autorelease": "node scripts/autorelease.js",
-    "release:test": "node scripts/release.js --tag=test",
+    "prerelease:excalidraw": "node scripts/prerelease.js",
-    "release:next": "node scripts/release.js --tag=next",
+    "release:excalidraw": "node scripts/release.js",
-    "release:latest": "node scripts/release.js --tag=latest",
     "rm:build": "rimraf --glob excalidraw-app/build excalidraw-app/dist excalidraw-app/dev-dist packages/*/dist packages/*/build examples/*/build examples/*/dist",
     "rm:node_modules": "rimraf --glob node_modules excalidraw-app/node_modules packages/*/node_modules",
     "clean-install": "yarn rm:node_modules && yarn install"

packages/common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@excalidraw/common",
-  "version": "0.18.0",
+  "version": "0.1.0",
   "type": "module",
   "types": "./dist/types/common/src/index.d.ts",
   "main": "./dist/prod/index.js",
@@ -13,10 +13,7 @@
       "default": "./dist/prod/index.js"
     },
     "./*": {
-      "types": "./dist/types/common/src/*.d.ts",
+      "types": "./dist/types/common/src/*.d.ts"
-      "development": "./dist/dev/index.js",
-      "production": "./dist/prod/index.js",
-      "default": "./dist/prod/index.js"
     }
   },
   "files": [

packages/common/src/binary-heap.ts

@@ -5,18 +5,17 @@ export class BinaryHeap<T> {
 
   sinkDown(idx: number) {
     const node = this.content[idx];
-    const nodeScore = this.scoreFunction(node);
     while (idx > 0) {
       const parentN = ((idx + 1) >> 1) - 1;
       const parent = this.content[parentN];
-      if (nodeScore < this.scoreFunction(parent)) {
+      if (this.scoreFunction(node) < this.scoreFunction(parent)) {
+        this.content[parentN] = node;
         this.content[idx] = parent;
         idx = parentN; // TODO: Optimize
       } else {
         break;
       }
     }
-    this.content[idx] = node;
   }
 
   bubbleUp(idx: number) {
@@ -25,39 +24,35 @@ export class BinaryHeap<T> {
     const score = this.scoreFunction(node);
 
     while (true) {
-      const child1N = ((idx + 1) << 1) - 1;
+      const child2N = (idx + 1) << 1;
-      const child2N = child1N + 1;
+      const child1N = child2N - 1;
-      let smallestIdx = idx;
+      let swap = null;
-      let smallestScore = score;
+      let child1Score = 0;
 
-      // Check left child
       if (child1N < length) {
-        const child1Score = this.scoreFunction(this.content[child1N]);
+        const child1 = this.content[child1N];
-        if (child1Score < smallestScore) {
+        child1Score = this.scoreFunction(child1);
-          smallestIdx = child1N;
+        if (child1Score < score) {
-          smallestScore = child1Score;
+          swap = child1N;
         }
       }
 
-      // Check right child
       if (child2N < length) {
-        const child2Score = this.scoreFunction(this.content[child2N]);
+        const child2 = this.content[child2N];
-        if (child2Score < smallestScore) {
+        const child2Score = this.scoreFunction(child2);
-          smallestIdx = child2N;
+        if (child2Score < (swap === null ? score : child1Score)) {
+          swap = child2N;
         }
       }
 
-      if (smallestIdx === idx) {
+      if (swap !== null) {
+        this.content[idx] = this.content[swap];
+        this.content[swap] = node;
+        idx = swap; // TODO: Optimize
+      } else {
         break;
       }
-
-      // Move the smaller child up, continue finding position for node
-      this.content[idx] = this.content[smallestIdx];
-      idx = smallestIdx;
     }
-
-    // Place node in its final position
-    this.content[idx] = node;
   }
 
   push(node: T) {

packages/common/src/constants.ts

@@ -6,6 +6,25 @@ import type { AppProps, AppState } from "@excalidraw/excalidraw/types";
 
 import { COLOR_PALETTE } from "./colors";
 
+export const isDarwin = /Mac|iPod|iPhone|iPad/.test(navigator.platform);
+export const isWindows = /^Win/.test(navigator.platform);
+export const isAndroid = /\b(android)\b/i.test(navigator.userAgent);
+export const isFirefox =
+  typeof window !== "undefined" &&
+  "netscape" in window &&
+  navigator.userAgent.indexOf("rv:") > 1 &&
+  navigator.userAgent.indexOf("Gecko") > 1;
+export const isChrome = navigator.userAgent.indexOf("Chrome") !== -1;
+export const isSafari =
+  !isChrome && navigator.userAgent.indexOf("Safari") !== -1;
+export const isIOS =
+  /iPad|iPhone/.test(navigator.platform) ||
+  // iPadOS 13+
+  (navigator.userAgent.includes("Mac") && "ontouchend" in document);
+// keeping function so it can be mocked in test
+export const isBrave = () =>
+  (navigator as any).brave?.isBrave?.name === "isBrave";
+
 export const supportsResizeObserver =
   typeof window !== "undefined" && "ResizeObserver" in window;
 
@@ -17,7 +36,6 @@ export const APP_NAME = "Excalidraw";
 // (happens a lot with fast clicks with the text tool)
 export const TEXT_AUTOWRAP_THRESHOLD = 36; // px
 export const DRAGGING_THRESHOLD = 10; // px
-export const MINIMUM_ARROW_SIZE = 20; // px
 export const LINE_CONFIRM_THRESHOLD = 8; // px
 export const ELEMENT_SHIFT_TRANSLATE_AMOUNT = 5;
 export const ELEMENT_TRANSLATE_AMOUNT = 1;
@@ -99,12 +117,10 @@ export const ENV = {
 };
 
 export const CLASSES = {
-  SIDEBAR: "sidebar",
   SHAPE_ACTIONS_MENU: "App-menu__left",
   ZOOM_ACTIONS: "zoom-actions",
   SEARCH_MENU_INPUT_WRAPPER: "layer-ui__search-inputWrapper",
   CONVERT_ELEMENT_TYPE_POPUP: "ConvertElementTypePopup",
-  SHAPE_ACTIONS_THEME_SCOPE: "shape-actions-theme-scope",
 };
 
 export const CJK_HAND_DRAWN_FALLBACK_FONT = "Xiaolai";
@@ -131,49 +147,19 @@ export const FONT_FAMILY = {
   Assistant: 10,
 };
 
-// Segoe UI Emoji fails to properly fallback for some glyphs: ∞, ∫, ≠
-// so we need to have generic font fallback before it
-export const SANS_SERIF_GENERIC_FONT = "sans-serif";
-export const MONOSPACE_GENERIC_FONT = "monospace";
-
-export const FONT_FAMILY_GENERIC_FALLBACKS = {
-  [SANS_SERIF_GENERIC_FONT]: 998,
-  [MONOSPACE_GENERIC_FONT]: 999,
-};
-
 export const FONT_FAMILY_FALLBACKS = {
   [CJK_HAND_DRAWN_FALLBACK_FONT]: 100,
-  ...FONT_FAMILY_GENERIC_FALLBACKS,
   [WINDOWS_EMOJI_FALLBACK_FONT]: 1000,
 };
 
-export function getGenericFontFamilyFallback(
-  fontFamily: number,
-): keyof typeof FONT_FAMILY_GENERIC_FALLBACKS {
-  switch (fontFamily) {
-    case FONT_FAMILY.Cascadia:
-    case FONT_FAMILY["Comic Shanns"]:
-      return MONOSPACE_GENERIC_FONT;
-
-    default:
-      return SANS_SERIF_GENERIC_FONT;
-  }
-}
-
 export const getFontFamilyFallbacks = (
   fontFamily: number,
 ): Array<keyof typeof FONT_FAMILY_FALLBACKS> => {
-  const genericFallbackFont = getGenericFontFamilyFallback(fontFamily);
-
   switch (fontFamily) {
     case FONT_FAMILY.Excalifont:
-      return [
+      return [CJK_HAND_DRAWN_FALLBACK_FONT, WINDOWS_EMOJI_FALLBACK_FONT];
-        CJK_HAND_DRAWN_FALLBACK_FONT,
-        genericFallbackFont,
-        WINDOWS_EMOJI_FALLBACK_FONT,
-      ];
     default:
-      return [genericFallbackFont, WINDOWS_EMOJI_FALLBACK_FONT];
+      return [WINDOWS_EMOJI_FALLBACK_FONT];
   }
 };
 
@@ -235,20 +221,13 @@ export const IMAGE_MIME_TYPES = {
   jfif: "image/jfif",
 } as const;
 
-export const STRING_MIME_TYPES = {
+export const MIME_TYPES = {
   text: "text/plain",
   html: "text/html",
   json: "application/json",
   // excalidraw data
   excalidraw: "application/vnd.excalidraw+json",
-  // LEGACY: fully-qualified library JSON data
   excalidrawlib: "application/vnd.excalidrawlib+json",
-  // list of excalidraw library item ids
-  excalidrawlibIds: "application/vnd.excalidrawlib.ids+json",
-} as const;
-
-export const MIME_TYPES = {
-  ...STRING_MIME_TYPES,
   // image-encoded excalidraw data
   "excalidraw.svg": "image/svg+xml",
   "excalidraw.png": "image/png",
@@ -323,6 +302,16 @@ export const DEFAULT_UI_OPTIONS: AppProps["UIOptions"] = {
   },
 };
 
+// breakpoints
+// -----------------------------------------------------------------------------
+// md screen
+export const MQ_MAX_WIDTH_PORTRAIT = 730;
+export const MQ_MAX_WIDTH_LANDSCAPE = 1000;
+export const MQ_MAX_HEIGHT_LANDSCAPE = 500;
+// sidebar
+export const MQ_RIGHT_SIDEBAR_MIN_WIDTH = 1229;
+// -----------------------------------------------------------------------------
+
 export const MAX_DECIMALS_FOR_SVG_EXPORT = 2;
 
 export const EXPORT_SCALES = [1, 2, 3];
@@ -488,17 +477,3 @@ export enum UserIdleState {
   AWAY = "away",
   IDLE = "idle",
 }
-
-/**
- * distance at which we merge points instead of adding a new merge-point
- * when converting a line to a polygon (merge currently means overlaping
- * the start and end points)
- */
-export const LINE_POLYGON_POINT_MERGE_DISTANCE = 20;
-
-export const DOUBLE_TAP_POSITION_THRESHOLD = 35;
-
-// glass background for mobile action buttons
-export const MOBILE_ACTION_BUTTON_BG = {
-  background: "var(--mobile-action-button-bg)",
-} as const;

packages/common/src/editorInterface.ts

@@ -1,223 +0,0 @@
-export type StylesPanelMode = "compact" | "full" | "mobile";
-
-export type EditorInterface = Readonly<{
-  formFactor: "phone" | "tablet" | "desktop";
-  desktopUIMode: "compact" | "full";
-  userAgent: Readonly<{
-    isMobileDevice: boolean;
-    platform: "ios" | "android" | "other" | "unknown";
-  }>;
-  isTouchScreen: boolean;
-  canFitSidebar: boolean;
-  isLandscape: boolean;
-}>;
-
-// storage key
-const DESKTOP_UI_MODE_STORAGE_KEY = "excalidraw.desktopUIMode";
-
-// breakpoints
-// mobile: up to 699px
-export const MQ_MAX_MOBILE = 599;
-
-export const MQ_MAX_WIDTH_LANDSCAPE = 1000;
-export const MQ_MAX_HEIGHT_LANDSCAPE = 500;
-
-// tablets
-export const MQ_MIN_TABLET = MQ_MAX_MOBILE + 1; // lower bound (excludes phones)
-export const MQ_MAX_TABLET = 1400; // upper bound (excludes laptops/desktops)
-
-// desktop/laptop
-export const MQ_MIN_WIDTH_DESKTOP = 1440;
-
-// sidebar
-export const MQ_RIGHT_SIDEBAR_MIN_WIDTH = 1229;
-
-// -----------------------------------------------------------------------------
-
-// user agent detections
-export const isDarwin = /Mac|iPod|iPhone|iPad/.test(navigator.platform);
-export const isWindows = /^Win/.test(navigator.platform);
-export const isAndroid = /\b(android)\b/i.test(navigator.userAgent);
-export const isFirefox =
-  typeof window !== "undefined" &&
-  "netscape" in window &&
-  navigator.userAgent.indexOf("rv:") > 1 &&
-  navigator.userAgent.indexOf("Gecko") > 1;
-export const isChrome = navigator.userAgent.indexOf("Chrome") !== -1;
-export const isSafari =
-  !isChrome && navigator.userAgent.indexOf("Safari") !== -1;
-export const isIOS =
-  /iPad|iPhone/i.test(navigator.platform) ||
-  // iPadOS 13+
-  (navigator.userAgent.includes("Mac") && "ontouchend" in document);
-// keeping function so it can be mocked in test
-export const isBrave = () =>
-  (navigator as any).brave?.isBrave?.name === "isBrave";
-
-// export const isMobile =
-//   isIOS ||
-//   /android|webos|ipod|blackberry|iemobile|opera mini/i.test(
-//     navigator.userAgent,
-//   ) ||
-//   /android|ios|ipod|blackberry|windows phone/i.test(navigator.platform);
-
-// utilities
-export const isMobileBreakpoint = (width: number, height: number) => {
-  return (
-    width <= MQ_MAX_MOBILE ||
-    (height < MQ_MAX_HEIGHT_LANDSCAPE && width < MQ_MAX_WIDTH_LANDSCAPE)
-  );
-};
-
-export const isTabletBreakpoint = (
-  editorWidth: number,
-  editorHeight: number,
-) => {
-  const minSide = Math.min(editorWidth, editorHeight);
-  const maxSide = Math.max(editorWidth, editorHeight);
-
-  return minSide >= MQ_MIN_TABLET && maxSide <= MQ_MAX_TABLET;
-};
-
-const isMobileOrTablet = (): boolean => {
-  const ua = navigator.userAgent || "";
-  const platform = navigator.platform || "";
-  const uaData = (navigator as any).userAgentData as
-    | { mobile?: boolean; platform?: string }
-    | undefined;
-
-  // --- 1) chromium: prefer ua client hints -------------------------------
-  if (uaData) {
-    const plat = (uaData.platform || "").toLowerCase();
-    const isDesktopOS =
-      plat === "windows" ||
-      plat === "macos" ||
-      plat === "linux" ||
-      plat === "chrome os";
-    if (uaData.mobile === true) {
-      return true;
-    }
-    if (uaData.mobile === false && plat === "android") {
-      const looksTouchTablet =
-        matchMedia?.("(hover: none)").matches &&
-        matchMedia?.("(pointer: coarse)").matches;
-      return looksTouchTablet;
-    }
-    if (isDesktopOS) {
-      return false;
-    }
-  }
-
-  // --- 2) ios (includes ipad) --------------------------------------------
-  if (isIOS) {
-    return true;
-  }
-
-  // --- 3) android legacy ua fallback -------------------------------------
-  if (isAndroid) {
-    const isAndroidPhone = /Mobile/i.test(ua);
-    const isAndroidTablet = !isAndroidPhone;
-    if (isAndroidPhone || isAndroidTablet) {
-      const looksTouchTablet =
-        matchMedia?.("(hover: none)").matches &&
-        matchMedia?.("(pointer: coarse)").matches;
-      return looksTouchTablet;
-    }
-  }
-
-  // --- 4) last resort desktop exclusion ----------------------------------
-  const looksDesktopPlatform =
-    /Win|Linux|CrOS|Mac/.test(platform) ||
-    /Windows NT|X11|CrOS|Macintosh/.test(ua);
-  if (looksDesktopPlatform) {
-    return false;
-  }
-  return false;
-};
-
-export const getFormFactor = (
-  editorWidth: number,
-  editorHeight: number,
-): EditorInterface["formFactor"] => {
-  if (isMobileBreakpoint(editorWidth, editorHeight)) {
-    return "phone";
-  }
-
-  if (isTabletBreakpoint(editorWidth, editorHeight)) {
-    return "tablet";
-  }
-
-  return "desktop";
-};
-
-export const deriveStylesPanelMode = (
-  editorInterface: EditorInterface,
-): StylesPanelMode => {
-  if (editorInterface.formFactor === "phone") {
-    return "mobile";
-  }
-
-  if (editorInterface.formFactor === "tablet") {
-    return "compact";
-  }
-
-  return editorInterface.desktopUIMode;
-};
-
-export const createUserAgentDescriptor = (
-  userAgentString: string,
-): EditorInterface["userAgent"] => {
-  const normalizedUA = userAgentString ?? "";
-  let platform: EditorInterface["userAgent"]["platform"] = "unknown";
-
-  if (isIOS) {
-    platform = "ios";
-  } else if (isAndroid) {
-    platform = "android";
-  } else if (normalizedUA) {
-    platform = "other";
-  }
-
-  return {
-    isMobileDevice: isMobileOrTablet(),
-    platform,
-  } as const;
-};
-
-export const loadDesktopUIModePreference = () => {
-  if (typeof window === "undefined") {
-    return null;
-  }
-
-  try {
-    const stored = window.localStorage.getItem(DESKTOP_UI_MODE_STORAGE_KEY);
-    if (stored === "compact" || stored === "full") {
-      return stored as EditorInterface["desktopUIMode"];
-    }
-  } catch (error) {
-    // ignore storage access issues (e.g., Safari private mode)
-  }
-
-  return null;
-};
-
-const persistDesktopUIMode = (mode: EditorInterface["desktopUIMode"]) => {
-  if (typeof window === "undefined") {
-    return;
-  }
-  try {
-    window.localStorage.setItem(DESKTOP_UI_MODE_STORAGE_KEY, mode);
-  } catch (error) {
-    // ignore storage access issues (e.g., Safari private mode)
-  }
-};
-
-export const setDesktopUIMode = (mode: EditorInterface["desktopUIMode"]) => {
-  if (mode !== "compact" && mode !== "full") {
-    return;
-  }
-
-  persistDesktopUIMode(mode);
-
-  return mode;
-};

packages/common/src/index.ts

@@ -10,5 +10,3 @@ export * from "./random";
 export * from "./url";
 export * from "./utils";
 export * from "./emitter";
-export * from "./visualdebug";
-export * from "./editorInterface";

packages/common/src/keys.ts

@@ -1,4 +1,4 @@
-import { isDarwin } from "./editorInterface";
+import { isDarwin } from "./constants";
 
 import type { ValueOf } from "./utility-types";
 

packages/common/src/utils.ts

@@ -1,9 +1,10 @@
-import { average } from "@excalidraw/math";
+import { average, pointFrom, type GlobalPoint } from "@excalidraw/math";
 
 import type {
   ExcalidrawBindableElement,
   FontFamilyValues,
   FontString,
+  ExcalidrawElement,
 } from "@excalidraw/element/types";
 
 import type {
@@ -20,6 +21,7 @@ import {
   ENV,
   FONT_FAMILY,
   getFontFamilyFallbacks,
+  isDarwin,
   WINDOWS_EMOJI_FALLBACK_FONT,
 } from "./constants";
 
@@ -90,8 +92,7 @@ export const isWritableElement = (
   (target instanceof HTMLInputElement &&
     (target.type === "text" ||
       target.type === "number" ||
-      target.type === "password" ||
+      target.type === "password"));
-      target.type === "search"));
 
 export const getFontFamilyString = ({
   fontFamily,
@@ -100,6 +101,7 @@ export const getFontFamilyString = ({
 }) => {
   for (const [fontFamilyString, id] of Object.entries(FONT_FAMILY)) {
     if (id === fontFamily) {
+      // TODO: we should fallback first to generic family names first
       return `${fontFamilyString}${getFontFamilyFallbacks(id)
         .map((x) => `, ${x}`)
         .join("")}`;
@@ -119,11 +121,6 @@ export const getFontString = ({
   return `${fontSize}px ${getFontFamilyString({ fontFamily })}` as FontString;
 };
 
-/** executes callback in the frame that's after the current one */
-export const nextAnimationFrame = async (cb: () => any) => {
-  requestAnimationFrame(() => requestAnimationFrame(cb));
-};
-
 export const debounce = <T extends any[]>(
   fn: (...args: T) => void,
   timeout: number,
@@ -423,6 +420,19 @@ export const allowFullScreen = () =>
 
 export const exitFullScreen = () => document.exitFullscreen();
 
+export const getShortcutKey = (shortcut: string): string => {
+  shortcut = shortcut
+    .replace(/\bAlt\b/i, "Alt")
+    .replace(/\bShift\b/i, "Shift")
+    .replace(/\b(Enter|Return)\b/i, "Enter");
+  if (isDarwin) {
+    return shortcut
+      .replace(/\bCtrlOrCmd\b/gi, "Cmd")
+      .replace(/\bAlt\b/i, "Option");
+  }
+  return shortcut.replace(/\bCtrlOrCmd\b/gi, "Ctrl");
+};
+
 export const viewportCoordsToSceneCoords = (
   { clientX, clientY }: { clientX: number; clientY: number },
   {
@@ -702,8 +712,8 @@ export const arrayToObject = <T>(
   array: readonly T[],
   groupBy?: (value: T) => string | number,
 ) =>
-  array.reduce((acc, value, idx) => {
+  array.reduce((acc, value) => {
-    acc[groupBy ? groupBy(value) : idx] = value;
+    acc[groupBy ? groupBy(value) : String(value)] = value;
     return acc;
   }, {} as { [key: string]: T });
 
@@ -1228,6 +1238,20 @@ export const escapeDoubleQuotes = (str: string) => {
 export const castArray = <T>(value: T | T[]): T[] =>
   Array.isArray(value) ? value : [value];
 
+export const elementCenterPoint = (
+  element: ExcalidrawElement,
+  xOffset: number = 0,
+  yOffset: number = 0,
+) => {
+  const { x, y, width, height } = element;
+
+  const centerXPoint = x + width / 2 + xOffset;
+
+  const centerYPoint = y + height / 2 + yOffset;
+
+  return pointFrom<GlobalPoint>(centerXPoint, centerYPoint);
+};
+
 /** hack for Array.isArray type guard not working with readonly value[] */
 export const isReadonlyArray = (value?: any): value is readonly any[] => {
   return Array.isArray(value);

packages/element/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@excalidraw/element",
-  "version": "0.18.0",
+  "version": "0.1.0",
   "type": "module",
   "types": "./dist/types/element/src/index.d.ts",
   "main": "./dist/prod/index.js",
@@ -13,10 +13,7 @@
       "default": "./dist/prod/index.js"
     },
     "./*": {
-      "types": "./dist/types/element/src/*.d.ts",
+      "types": "./dist/types/element/src/*.d.ts"
-      "development": "./dist/dev/index.js",
-      "production": "./dist/prod/index.js",
-      "default": "./dist/prod/index.js"
     }
   },
   "files": [
@@ -55,9 +52,5 @@
   "scripts": {
     "gen:types": "rimraf types && tsc",
     "build:esm": "rimraf dist && node ../../scripts/buildBase.js && yarn gen:types"
-  },
-  "dependencies": {
-    "@excalidraw/common": "0.18.0",
-    "@excalidraw/math": "0.18.0"
   }
 }

packages/element/src/Scene.ts

@@ -164,14 +164,9 @@ export class Scene {
     return this.frames;
   }
 
-  constructor(
+  constructor(elements: ElementsMapOrArray | null = null) {
-    elements: ElementsMapOrArray | null = null,
-    options?: {
-      skipValidation?: true;
-    },
-  ) {
     if (elements) {
-      this.replaceAllElements(elements, options);
+      this.replaceAllElements(elements);
     }
   }
 
@@ -268,19 +263,12 @@ export class Scene {
     return didChange;
   }
 
-  replaceAllElements(
+  replaceAllElements(nextElements: ElementsMapOrArray) {
-    nextElements: ElementsMapOrArray,
-    options?: {
-      skipValidation?: true;
-    },
-  ) {
     // we do trust the insertion order on the map, though maybe we shouldn't and should prefer order defined by fractional indices
     const _nextElements = toArray(nextElements);
     const nextFrameLikes: ExcalidrawFrameLikeElement[] = [];
 
-    if (!options?.skipValidation) {
+    validateIndicesThrottled(_nextElements);
-      validateIndicesThrottled(_nextElements);
-    }
 
     this.elements = syncInvalidIndices(_nextElements);
     this.elementsMap.clear();

packages/element/src/Shape.ts

@@ -1,65 +1,26 @@
 import { simplify } from "points-on-curve";
 
-import {
+import { pointFrom, pointDistance, type LocalPoint } from "@excalidraw/math";
-  type GeometricShape,
+import { ROUGHNESS, isTransparent, assertNever } from "@excalidraw/common";
-  getClosedCurveShape,
-  getCurveShape,
-  getEllipseShape,
-  getFreedrawShape,
-  getPolygonShape,
-} from "@excalidraw/utils/shape";
-
-import {
-  pointFrom,
-  pointDistance,
-  type LocalPoint,
-  pointRotateRads,
-} from "@excalidraw/math";
-import {
-  ROUGHNESS,
-  isTransparent,
-  assertNever,
-  COLOR_PALETTE,
-  LINE_POLYGON_POINT_MERGE_DISTANCE,
-} from "@excalidraw/common";
-
-import { RoughGenerator } from "roughjs/bin/generator";
-
-import type { GlobalPoint } from "@excalidraw/math";
 
 import type { Mutable } from "@excalidraw/common/utility-types";
 
-import type {
+import type { EmbedsValidationStatus } from "@excalidraw/excalidraw/types";
-  AppState,
+import type { ElementShapes } from "@excalidraw/excalidraw/scene/types";
-  EmbedsValidationStatus,
-} from "@excalidraw/excalidraw/types";
-import type {
-  ElementShape,
-  ElementShapes,
-} from "@excalidraw/excalidraw/scene/types";
-
-import { elementWithCanvasCache } from "./renderElement";
 
 import {
-  canBecomePolygon,
   isElbowArrow,
   isEmbeddableElement,
   isIframeElement,
   isIframeLikeElement,
   isLinearElement,
 } from "./typeChecks";
-import { getCornerRadius, isPathALoop } from "./utils";
+import { getCornerRadius, isPathALoop } from "./shapes";
 import { headingForPointIsHorizontal } from "./heading";
 
 import { canChangeRoundness } from "./comparisons";
 import { generateFreeDrawShape } from "./renderElement";
-import {
+import { getArrowheadPoints, getDiamondPoints } from "./bounds";
-  getArrowheadPoints,
-  getCenterForBounds,
-  getDiamondPoints,
-  getElementAbsoluteCoords,
-} from "./bounds";
-import { shouldTestInside } from "./collision";
 
 import type {
   ExcalidrawElement,
@@ -67,89 +28,12 @@ import type {
   ExcalidrawSelectionElement,
   ExcalidrawLinearElement,
   Arrowhead,
-  ExcalidrawFreeDrawElement,
-  ElementsMap,
-  ExcalidrawLineElement,
 } from "./types";
 
 import type { Drawable, Options } from "roughjs/bin/core";
+import type { RoughGenerator } from "roughjs/bin/generator";
 import type { Point as RoughPoint } from "roughjs/bin/geometry";
 
-export class ShapeCache {
-  private static rg = new RoughGenerator();
-  private static cache = new WeakMap<ExcalidrawElement, ElementShape>();
-
-  /**
-   * Retrieves shape from cache if available. Use this only if shape
-   * is optional and you have a fallback in case it's not cached.
-   */
-  public static get = <T extends ExcalidrawElement>(element: T) => {
-    return ShapeCache.cache.get(
-      element,
-    ) as T["type"] extends keyof ElementShapes
-      ? ElementShapes[T["type"]] | undefined
-      : ElementShape | undefined;
-  };
-
-  public static set = <T extends ExcalidrawElement>(
-    element: T,
-    shape: T["type"] extends keyof ElementShapes
-      ? ElementShapes[T["type"]]
-      : Drawable,
-  ) => ShapeCache.cache.set(element, shape);
-
-  public static delete = (element: ExcalidrawElement) =>
-    ShapeCache.cache.delete(element);
-
-  public static destroy = () => {
-    ShapeCache.cache = new WeakMap();
-  };
-
-  /**
-   * Generates & caches shape for element if not already cached, otherwise
-   * returns cached shape.
-   */
-  public static generateElementShape = <
-    T extends Exclude<ExcalidrawElement, ExcalidrawSelectionElement>,
-  >(
-    element: T,
-    renderConfig: {
-      isExporting: boolean;
-      canvasBackgroundColor: AppState["viewBackgroundColor"];
-      embedsValidationStatus: EmbedsValidationStatus;
-    } | null,
-  ) => {
-    // when exporting, always regenerated to guarantee the latest shape
-    const cachedShape = renderConfig?.isExporting
-      ? undefined
-      : ShapeCache.get(element);
-
-    // `null` indicates no rc shape applicable for this element type,
-    // but it's considered a valid cache value (= do not regenerate)
-    if (cachedShape !== undefined) {
-      return cachedShape;
-    }
-
-    elementWithCanvasCache.delete(element);
-
-    const shape = generateElementShape(
-      element,
-      ShapeCache.rg,
-      renderConfig || {
-        isExporting: false,
-        canvasBackgroundColor: COLOR_PALETTE.white,
-        embedsValidationStatus: null,
-      },
-    ) as T["type"] extends keyof ElementShapes
-      ? ElementShapes[T["type"]]
-      : Drawable | null;
-
-    ShapeCache.cache.set(element, shape);
-
-    return shape;
-  };
-}
-
 const getDashArrayDashed = (strokeWidth: number) => [8, 8 + strokeWidth];
 
 const getDashArrayDotted = (strokeWidth: number) => [1.5, 6 + strokeWidth];
@@ -419,182 +303,6 @@ const getArrowheadShapes = (
   }
 };
 
-export const generateLinearCollisionShape = (
-  element: ExcalidrawLinearElement | ExcalidrawFreeDrawElement,
-) => {
-  const generator = new RoughGenerator();
-  const options: Options = {
-    seed: element.seed,
-    disableMultiStroke: true,
-    disableMultiStrokeFill: true,
-    roughness: 0,
-    preserveVertices: true,
-  };
-  const center = getCenterForBounds(
-    // Need a non-rotated center point
-    element.points.reduce(
-      (acc, point) => {
-        return [
-          Math.min(element.x + point[0], acc[0]),
-          Math.min(element.y + point[1], acc[1]),
-          Math.max(element.x + point[0], acc[2]),
-          Math.max(element.y + point[1], acc[3]),
-        ];
-      },
-      [Infinity, Infinity, -Infinity, -Infinity],
-    ),
-  );
-
-  switch (element.type) {
-    case "line":
-    case "arrow": {
-      // points array can be empty in the beginning, so it is important to add
-      // initial position to it
-      const points = element.points.length
-        ? element.points
-        : [pointFrom<LocalPoint>(0, 0)];
-
-      if (isElbowArrow(element)) {
-        return generator.path(generateElbowArrowShape(points, 16), options)
-          .sets[0].ops;
-      } else if (!element.roundness) {
-        return points.map((point, idx) => {
-          const p = pointRotateRads(
-            pointFrom<GlobalPoint>(element.x + point[0], element.y + point[1]),
-            center,
-            element.angle,
-          );
-
-          return {
-            op: idx === 0 ? "move" : "lineTo",
-            data: pointFrom<LocalPoint>(p[0] - element.x, p[1] - element.y),
-          };
-        });
-      }
-
-      return generator
-        .curve(points as unknown as RoughPoint[], options)
-        .sets[0].ops.slice(0, element.points.length)
-        .map((op, i) => {
-          if (i === 0) {
-            const p = pointRotateRads<GlobalPoint>(
-              pointFrom<GlobalPoint>(
-                element.x + op.data[0],
-                element.y + op.data[1],
-              ),
-              center,
-              element.angle,
-            );
-
-            return {
-              op: "move",
-              data: pointFrom<LocalPoint>(p[0] - element.x, p[1] - element.y),
-            };
-          }
-
-          return {
-            op: "bcurveTo",
-            data: [
-              pointRotateRads(
-                pointFrom<GlobalPoint>(
-                  element.x + op.data[0],
-                  element.y + op.data[1],
-                ),
-                center,
-                element.angle,
-              ),
-              pointRotateRads(
-                pointFrom<GlobalPoint>(
-                  element.x + op.data[2],
-                  element.y + op.data[3],
-                ),
-                center,
-                element.angle,
-              ),
-              pointRotateRads(
-                pointFrom<GlobalPoint>(
-                  element.x + op.data[4],
-                  element.y + op.data[5],
-                ),
-                center,
-                element.angle,
-              ),
-            ]
-              .map((p) =>
-                pointFrom<LocalPoint>(p[0] - element.x, p[1] - element.y),
-              )
-              .flat(),
-          };
-        });
-    }
-    case "freedraw": {
-      if (element.points.length < 2) {
-        return [];
-      }
-
-      const simplifiedPoints = simplify(
-        element.points as Mutable<LocalPoint[]>,
-        0.75,
-      );
-
-      return generator
-        .curve(simplifiedPoints as [number, number][], options)
-        .sets[0].ops.slice(0, element.points.length)
-        .map((op, i) => {
-          if (i === 0) {
-            const p = pointRotateRads<GlobalPoint>(
-              pointFrom<GlobalPoint>(
-                element.x + op.data[0],
-                element.y + op.data[1],
-              ),
-              center,
-              element.angle,
-            );
-
-            return {
-              op: "move",
-              data: pointFrom<LocalPoint>(p[0] - element.x, p[1] - element.y),
-            };
-          }
-
-          return {
-            op: "bcurveTo",
-            data: [
-              pointRotateRads(
-                pointFrom<GlobalPoint>(
-                  element.x + op.data[0],
-                  element.y + op.data[1],
-                ),
-                center,
-                element.angle,
-              ),
-              pointRotateRads(
-                pointFrom<GlobalPoint>(
-                  element.x + op.data[2],
-                  element.y + op.data[3],
-                ),
-                center,
-                element.angle,
-              ),
-              pointRotateRads(
-                pointFrom<GlobalPoint>(
-                  element.x + op.data[4],
-                  element.y + op.data[5],
-                ),
-                center,
-                element.angle,
-              ),
-            ]
-              .map((p) =>
-                pointFrom<LocalPoint>(p[0] - element.x, p[1] - element.y),
-              )
-              .flat(),
-          };
-        });
-    }
-  }
-};
-
 /**
  * Generates the roughjs shape for given element.
  *
@@ -602,7 +310,7 @@ export const generateLinearCollisionShape = (
  *
  * @private
  */
-const generateElementShape = (
+export const _generateElementShape = (
   element: Exclude<NonDeletedExcalidrawElement, ExcalidrawSelectionElement>,
   generator: RoughGenerator,
   {
@@ -903,103 +611,3 @@ const generateElbowArrowShape = (
 
   return d.join(" ");
 };
-
-/**
- * get the pure geometric shape of an excalidraw elementw
- * which is then used for hit detection
- */
-export const getElementShape = <Point extends GlobalPoint | LocalPoint>(
-  element: ExcalidrawElement,
-  elementsMap: ElementsMap,
-): GeometricShape<Point> => {
-  switch (element.type) {
-    case "rectangle":
-    case "diamond":
-    case "frame":
-    case "magicframe":
-    case "embeddable":
-    case "image":
-    case "iframe":
-    case "text":
-    case "selection":
-      return getPolygonShape(element);
-    case "arrow":
-    case "line": {
-      const roughShape =
-        ShapeCache.get(element)?.[0] ??
-        ShapeCache.generateElementShape(element, null)[0];
-      const [, , , , cx, cy] = getElementAbsoluteCoords(element, elementsMap);
-
-      return shouldTestInside(element)
-        ? getClosedCurveShape<Point>(
-            element,
-            roughShape,
-            pointFrom<Point>(element.x, element.y),
-            element.angle,
-            pointFrom(cx, cy),
-          )
-        : getCurveShape<Point>(
-            roughShape,
-            pointFrom<Point>(element.x, element.y),
-            element.angle,
-            pointFrom(cx, cy),
-          );
-    }
-
-    case "ellipse":
-      return getEllipseShape(element);
-
-    case "freedraw": {
-      const [, , , , cx, cy] = getElementAbsoluteCoords(element, elementsMap);
-      return getFreedrawShape(
-        element,
-        pointFrom(cx, cy),
-        shouldTestInside(element),
-      );
-    }
-  }
-};
-
-export const toggleLinePolygonState = (
-  element: ExcalidrawLineElement,
-  nextPolygonState: boolean,
-): {
-  polygon: ExcalidrawLineElement["polygon"];
-  points: ExcalidrawLineElement["points"];
-} | null => {
-  const updatedPoints = [...element.points];
-
-  if (nextPolygonState) {
-    if (!canBecomePolygon(element.points)) {
-      return null;
-    }
-
-    const firstPoint = updatedPoints[0];
-    const lastPoint = updatedPoints[updatedPoints.length - 1];
-
-    const distance = Math.hypot(
-      firstPoint[0] - lastPoint[0],
-      firstPoint[1] - lastPoint[1],
-    );
-
-    if (
-      distance > LINE_POLYGON_POINT_MERGE_DISTANCE ||
-      updatedPoints.length < 4
-    ) {
-      updatedPoints.push(pointFrom(firstPoint[0], firstPoint[1]));
-    } else {
-      updatedPoints[updatedPoints.length - 1] = pointFrom(
-        firstPoint[0],
-        firstPoint[1],
-      );
-    }
-  }
-
-  // TODO: satisfies ElementUpdate<ExcalidrawLineElement>
-  const ret = {
-    polygon: nextPolygonState,
-    points: updatedPoints,
-  };
-
-  return ret;
-};

packages/element/src/ShapeCache.ts

@@ -0,0 +1,95 @@
+import { RoughGenerator } from "roughjs/bin/generator";
+
+import { COLOR_PALETTE } from "@excalidraw/common";
+
+import type {
+  AppState,
+  EmbedsValidationStatus,
+} from "@excalidraw/excalidraw/types";
+import type {
+  ElementShape,
+  ElementShapes,
+} from "@excalidraw/excalidraw/scene/types";
+
+import { _generateElementShape } from "./Shape";
+
+import { elementWithCanvasCache } from "./renderElement";
+
+import type { ExcalidrawElement, ExcalidrawSelectionElement } from "./types";
+
+import type { Drawable } from "roughjs/bin/core";
+
+export class ShapeCache {
+  private static rg = new RoughGenerator();
+  private static cache = new WeakMap<ExcalidrawElement, ElementShape>();
+
+  /**
+   * Retrieves shape from cache if available. Use this only if shape
+   * is optional and you have a fallback in case it's not cached.
+   */
+  public static get = <T extends ExcalidrawElement>(element: T) => {
+    return ShapeCache.cache.get(
+      element,
+    ) as T["type"] extends keyof ElementShapes
+      ? ElementShapes[T["type"]] | undefined
+      : ElementShape | undefined;
+  };
+
+  public static set = <T extends ExcalidrawElement>(
+    element: T,
+    shape: T["type"] extends keyof ElementShapes
+      ? ElementShapes[T["type"]]
+      : Drawable,
+  ) => ShapeCache.cache.set(element, shape);
+
+  public static delete = (element: ExcalidrawElement) =>
+    ShapeCache.cache.delete(element);
+
+  public static destroy = () => {
+    ShapeCache.cache = new WeakMap();
+  };
+
+  /**
+   * Generates & caches shape for element if not already cached, otherwise
+   * returns cached shape.
+   */
+  public static generateElementShape = <
+    T extends Exclude<ExcalidrawElement, ExcalidrawSelectionElement>,
+  >(
+    element: T,
+    renderConfig: {
+      isExporting: boolean;
+      canvasBackgroundColor: AppState["viewBackgroundColor"];
+      embedsValidationStatus: EmbedsValidationStatus;
+    } | null,
+  ) => {
+    // when exporting, always regenerated to guarantee the latest shape
+    const cachedShape = renderConfig?.isExporting
+      ? undefined
+      : ShapeCache.get(element);
+
+    // `null` indicates no rc shape applicable for this element type,
+    // but it's considered a valid cache value (= do not regenerate)
+    if (cachedShape !== undefined) {
+      return cachedShape;
+    }
+
+    elementWithCanvasCache.delete(element);
+
+    const shape = _generateElementShape(
+      element,
+      ShapeCache.rg,
+      renderConfig || {
+        isExporting: false,
+        canvasBackgroundColor: COLOR_PALETTE.white,
+        embedsValidationStatus: null,
+      },
+    ) as T["type"] extends keyof ElementShapes
+      ? ElementShapes[T["type"]]
+      : Drawable | null;
+
+    ShapeCache.cache.set(element, shape);
+
+    return shape;
+  };
+}

packages/element/src/align.ts

@@ -1,8 +1,6 @@
-import type { AppState } from "@excalidraw/excalidraw/types";
-
 import { updateBoundElements } from "./binding";
 import { getCommonBoundingBox } from "./bounds";
-import { getSelectedElementsByGroup } from "./groups";
+import { getMaximumGroups } from "./groups";
 
 import type { Scene } from "./Scene";
 
@@ -18,12 +16,11 @@ export const alignElements = (
   selectedElements: ExcalidrawElement[],
   alignment: Alignment,
   scene: Scene,
-  appState: Readonly<AppState>,
 ): ExcalidrawElement[] => {
-  const groups: ExcalidrawElement[][] = getSelectedElementsByGroup(
+  const elementsMap = scene.getNonDeletedElementsMap();
+  const groups: ExcalidrawElement[][] = getMaximumGroups(
     selectedElements,
-    scene.getNonDeletedElementsMap(),
+    elementsMap,
-    appState,
   );
   const selectionBoundingBox = getCommonBoundingBox(selectedElements);
 

packages/element/src/binding.ts

@@ -6,6 +6,7 @@ import {
   invariant,
   isDevEnv,
   isTestEnv,
+  elementCenterPoint,
 } from "@excalidraw/common";
 
 import {
@@ -26,6 +27,8 @@ import {
   PRECISION,
 } from "@excalidraw/math";
 
+import { isPointOnShape } from "@excalidraw/utils/collision";
+
 import type { LocalPoint, Radians } from "@excalidraw/math";
 
 import type { AppState } from "@excalidraw/excalidraw/types";
@@ -33,12 +36,12 @@ import type { AppState } from "@excalidraw/excalidraw/types";
 import type { MapEntry, Mutable } from "@excalidraw/common/utility-types";
 
 import {
-  doBoundsIntersect,
   getCenterForBounds,
   getElementBounds,
+  doBoundsIntersect,
 } from "./bounds";
 import { intersectElementWithLineSegment } from "./collision";
-import { distanceToElement } from "./distance";
+import { distanceToBindableElement } from "./distance";
 import {
   headingForPointFromElement,
   headingIsHorizontal,
@@ -60,7 +63,7 @@ import {
   isTextElement,
 } from "./typeChecks";
 
-import { aabbForElement, elementCenterPoint } from "./bounds";
+import { aabbForElement, getElementShape, pointInsideBounds } from "./shapes";
 import { updateElbowArrowPoints } from "./elbowArrow";
 
 import type { Scene } from "./Scene";
@@ -106,6 +109,7 @@ export const isBindingEnabled = (appState: AppState): boolean => {
 
 export const FIXED_BINDING_DISTANCE = 5;
 export const BINDING_HIGHLIGHT_THICKNESS = 10;
+export const BINDING_HIGHLIGHT_OFFSET = 4;
 
 const getNonDeletedElements = (
   scene: Scene,
@@ -127,7 +131,6 @@ export const bindOrUnbindLinearElement = (
   endBindingElement: ExcalidrawBindableElement | null | "keep",
   scene: Scene,
 ): void => {
-  const elementsMap = scene.getNonDeletedElementsMap();
   const boundToElementIds: Set<ExcalidrawBindableElement["id"]> = new Set();
   const unboundFromElementIds: Set<ExcalidrawBindableElement["id"]> = new Set();
   bindOrUnbindLinearElementEdge(
@@ -138,7 +141,6 @@ export const bindOrUnbindLinearElement = (
     boundToElementIds,
     unboundFromElementIds,
     scene,
-    elementsMap,
   );
   bindOrUnbindLinearElementEdge(
     linearElement,
@@ -148,7 +150,6 @@ export const bindOrUnbindLinearElement = (
     boundToElementIds,
     unboundFromElementIds,
     scene,
-    elementsMap,
   );
 
   const onlyUnbound = Array.from(unboundFromElementIds).filter(
@@ -175,7 +176,6 @@ const bindOrUnbindLinearElementEdge = (
   // Is mutated
   unboundFromElementIds: Set<ExcalidrawBindableElement["id"]>,
   scene: Scene,
-  elementsMap: ElementsMap,
 ): void => {
   // "keep" is for method chaining convenience, a "no-op", so just bail out
   if (bindableElement === "keep") {
@@ -216,29 +216,43 @@ const bindOrUnbindLinearElementEdge = (
   }
 };
 
+const getOriginalBindingIfStillCloseOfLinearElementEdge = (
+  linearElement: NonDeleted<ExcalidrawLinearElement>,
+  edge: "start" | "end",
+  elementsMap: NonDeletedSceneElementsMap,
+  zoom?: AppState["zoom"],
+): NonDeleted<ExcalidrawElement> | null => {
+  const coors = getLinearElementEdgeCoors(linearElement, edge, elementsMap);
+  const elementId =
+    edge === "start"
+      ? linearElement.startBinding?.elementId
+      : linearElement.endBinding?.elementId;
+  if (elementId) {
+    const element = elementsMap.get(elementId);
+    if (
+      isBindableElement(element) &&
+      bindingBorderTest(element, coors, elementsMap, zoom)
+    ) {
+      return element;
+    }
+  }
+
+  return null;
+};
+
 const getOriginalBindingsIfStillCloseToArrowEnds = (
   linearElement: NonDeleted<ExcalidrawLinearElement>,
   elementsMap: NonDeletedSceneElementsMap,
   zoom?: AppState["zoom"],
 ): (NonDeleted<ExcalidrawElement> | null)[] =>
-  (["start", "end"] as const).map((edge) => {
+  ["start", "end"].map((edge) =>
-    const coors = getLinearElementEdgeCoors(linearElement, edge, elementsMap);
+    getOriginalBindingIfStillCloseOfLinearElementEdge(
-    const elementId =
+      linearElement,
-      edge === "start"
+      edge as "start" | "end",
-        ? linearElement.startBinding?.elementId
+      elementsMap,
-        : linearElement.endBinding?.elementId;
+      zoom,
-    if (elementId) {
+    ),
-      const element = elementsMap.get(elementId);
+  );
-      if (
-        isBindableElement(element) &&
-        bindingBorderTest(element, coors, elementsMap, zoom)
-      ) {
-        return element;
-      }
-    }
-
-    return null;
-  });
 
 const getBindingStrategyForDraggingArrowEndpoints = (
   selectedElement: NonDeleted<ExcalidrawLinearElement>,
@@ -254,7 +268,7 @@ const getBindingStrategyForDraggingArrowEndpoints = (
   const endDragged = draggingPoints.findIndex((i) => i === endIdx) > -1;
   const start = startDragged
     ? isBindingEnabled
-      ? getEligibleElementForBindingElement(
+      ? getElligibleElementForBindingElement(
           selectedElement,
           "start",
           elementsMap,
@@ -265,7 +279,7 @@ const getBindingStrategyForDraggingArrowEndpoints = (
     : "keep";
   const end = endDragged
     ? isBindingEnabled
-      ? getEligibleElementForBindingElement(
+      ? getElligibleElementForBindingElement(
           selectedElement,
           "end",
           elementsMap,
@@ -297,7 +311,7 @@ const getBindingStrategyForDraggingArrowOrJoints = (
   );
   const start = startIsClose
     ? isBindingEnabled
-      ? getEligibleElementForBindingElement(
+      ? getElligibleElementForBindingElement(
           selectedElement,
           "start",
           elementsMap,
@@ -308,7 +322,7 @@ const getBindingStrategyForDraggingArrowOrJoints = (
     : null;
   const end = endIsClose
     ? isBindingEnabled
-      ? getEligibleElementForBindingElement(
+      ? getElligibleElementForBindingElement(
           selectedElement,
           "end",
           elementsMap,
@@ -384,48 +398,6 @@ export const getSuggestedBindingsForArrows = (
   );
 };
 
-export const maybeSuggestBindingsForLinearElementAtCoords = (
-  linearElement: NonDeleted<ExcalidrawLinearElement>,
-  /** scene coords */
-  pointerCoords: {
-    x: number;
-    y: number;
-  }[],
-  scene: Scene,
-  zoom: AppState["zoom"],
-  // During line creation the start binding hasn't been written yet
-  // into `linearElement`
-  oppositeBindingBoundElement?: ExcalidrawBindableElement | null,
-): ExcalidrawBindableElement[] =>
-  Array.from(
-    pointerCoords.reduce(
-      (acc: Set<NonDeleted<ExcalidrawBindableElement>>, coords) => {
-        const hoveredBindableElement = getHoveredElementForBinding(
-          coords,
-          scene.getNonDeletedElements(),
-          scene.getNonDeletedElementsMap(),
-          zoom,
-          isElbowArrow(linearElement),
-          isElbowArrow(linearElement),
-        );
-
-        if (
-          hoveredBindableElement != null &&
-          !isLinearElementSimpleAndAlreadyBound(
-            linearElement,
-            oppositeBindingBoundElement?.id,
-            hoveredBindableElement,
-          )
-        ) {
-          acc.add(hoveredBindableElement);
-        }
-
-        return acc;
-      },
-      new Set() as Set<NonDeleted<ExcalidrawBindableElement>>,
-    ),
-  );
-
 export const maybeBindLinearElement = (
   linearElement: NonDeleted<ExcalidrawLinearElement>,
   appState: AppState,
@@ -469,13 +441,22 @@ export const maybeBindLinearElement = (
 const normalizePointBinding = (
   binding: { focus: number; gap: number },
   hoveredElement: ExcalidrawBindableElement,
-) => ({
+) => {
-  ...binding,
+  let gap = binding.gap;
-  gap: Math.min(
+  const maxGap = maxBindingGap(
-    binding.gap,
+    hoveredElement,
-    maxBindingGap(hoveredElement, hoveredElement.width, hoveredElement.height),
+    hoveredElement.width,
-  ),
+    hoveredElement.height,
-});
+  );
+
+  if (gap > maxGap) {
+    gap = BINDING_HIGHLIGHT_THICKNESS + BINDING_HIGHLIGHT_OFFSET;
+  }
+  return {
+    ...binding,
+    gap,
+  };
+};
 
 export const bindLinearElement = (
   linearElement: NonDeleted<ExcalidrawLinearElement>,
@@ -507,7 +488,6 @@ export const bindLinearElement = (
         linearElement,
         hoveredElement,
         startOrEnd,
-        scene.getNonDeletedElementsMap(),
       ),
     };
   }
@@ -555,7 +535,7 @@ export const isLinearElementSimpleAndAlreadyBound = (
 
 const isLinearElementSimple = (
   linearElement: NonDeleted<ExcalidrawLinearElement>,
-): boolean => linearElement.points.length < 3 && !isElbowArrow(linearElement);
+): boolean => linearElement.points.length < 3;
 
 const unbindLinearElement = (
   linearElement: NonDeleted<ExcalidrawLinearElement>,
@@ -723,13 +703,8 @@ const calculateFocusAndGap = (
   );
 
   return {
-    focus: determineFocusDistance(
+    focus: determineFocusDistance(hoveredElement, adjacentPoint, edgePoint),
-      hoveredElement,
+    gap: Math.max(1, distanceToBindableElement(hoveredElement, edgePoint)),
-      elementsMap,
-      adjacentPoint,
-      edgePoint,
-    ),
-    gap: Math.max(1, distanceToElement(hoveredElement, elementsMap, edgePoint)),
   };
 };
 
@@ -899,7 +874,6 @@ export const getHeadingForElbowArrowSnap = (
   bindableElement: ExcalidrawBindableElement | undefined | null,
   aabb: Bounds | undefined | null,
   origPoint: GlobalPoint,
-  elementsMap: ElementsMap,
   zoom?: AppState["zoom"],
 ): Heading => {
   const otherPointHeading = vectorToHeading(vectorFromPoint(otherPoint, p));
@@ -908,16 +882,11 @@ export const getHeadingForElbowArrowSnap = (
     return otherPointHeading;
   }
 
-  const distance = getDistanceForBinding(
+  const distance = getDistanceForBinding(origPoint, bindableElement, zoom);
-    origPoint,
-    bindableElement,
-    elementsMap,
-    zoom,
-  );
 
   if (!distance) {
     return vectorToHeading(
-      vectorFromPoint(p, elementCenterPoint(bindableElement, elementsMap)),
+      vectorFromPoint(p, elementCenterPoint(bindableElement)),
     );
   }
 
@@ -927,10 +896,9 @@ export const getHeadingForElbowArrowSnap = (
 const getDistanceForBinding = (
   point: Readonly<GlobalPoint>,
   bindableElement: ExcalidrawBindableElement,
-  elementsMap: ElementsMap,
   zoom?: AppState["zoom"],
 ) => {
-  const distance = distanceToElement(bindableElement, elementsMap, point);
+  const distance = distanceToBindableElement(bindableElement, point);
   const bindDistance = maxBindingGap(
     bindableElement,
     bindableElement.width,
@@ -945,13 +913,12 @@ export const bindPointToSnapToElementOutline = (
   arrow: ExcalidrawElbowArrowElement,
   bindableElement: ExcalidrawBindableElement,
   startOrEnd: "start" | "end",
-  elementsMap: ElementsMap,
 ): GlobalPoint => {
   if (isDevEnv() || isTestEnv()) {
     invariant(arrow.points.length > 1, "Arrow should have at least 2 points");
   }
 
-  const aabb = aabbForElement(bindableElement, elementsMap);
+  const aabb = aabbForElement(bindableElement);
   const localP =
     arrow.points[startOrEnd === "start" ? 0 : arrow.points.length - 1];
   const globalP = pointFrom<GlobalPoint>(
@@ -959,7 +926,7 @@ export const bindPointToSnapToElementOutline = (
     arrow.y + localP[1],
   );
   const edgePoint = isRectanguloidElement(bindableElement)
-    ? avoidRectangularCorner(bindableElement, elementsMap, globalP)
+    ? avoidRectangularCorner(bindableElement, globalP)
     : globalP;
   const elbowed = isElbowArrow(arrow);
   const center = getCenterForBounds(aabb);
@@ -978,54 +945,26 @@ export const bindPointToSnapToElementOutline = (
     const isHorizontal = headingIsHorizontal(
       headingForPointFromElement(bindableElement, aabb, globalP),
     );
-    const snapPoint = snapToMid(bindableElement, elementsMap, edgePoint);
     const otherPoint = pointFrom<GlobalPoint>(
-      isHorizontal ? center[0] : snapPoint[0],
+      isHorizontal ? center[0] : edgePoint[0],
-      !isHorizontal ? center[1] : snapPoint[1],
+      !isHorizontal ? center[1] : edgePoint[1],
-    );
-    const intersector = lineSegment(
-      otherPoint,
-      pointFromVector(
-        vectorScale(
-          vectorNormalize(vectorFromPoint(snapPoint, otherPoint)),
-          Math.max(bindableElement.width, bindableElement.height) * 2,
-        ),
-        otherPoint,
-      ),
     );
     intersection = intersectElementWithLineSegment(
       bindableElement,
-      elementsMap,
+      lineSegment(
-      intersector,
+        otherPoint,
-      FIXED_BINDING_DISTANCE,
-    ).sort(pointDistanceSq)[0];
-
-    if (!intersection) {
-      const anotherPoint = pointFrom<GlobalPoint>(
-        !isHorizontal ? center[0] : snapPoint[0],
-        isHorizontal ? center[1] : snapPoint[1],
-      );
-      const anotherIntersector = lineSegment(
-        anotherPoint,
         pointFromVector(
           vectorScale(
-            vectorNormalize(vectorFromPoint(snapPoint, anotherPoint)),
+            vectorNormalize(vectorFromPoint(edgePoint, otherPoint)),
             Math.max(bindableElement.width, bindableElement.height) * 2,
           ),
-          anotherPoint,
+          otherPoint,
         ),
-      );
+      ),
-      intersection = intersectElementWithLineSegment(
+    )[0];
-        bindableElement,
-        elementsMap,
-        anotherIntersector,
-        FIXED_BINDING_DISTANCE,
-      ).sort(pointDistanceSq)[0];
-    }
   } else {
     intersection = intersectElementWithLineSegment(
       bindableElement,
-      elementsMap,
       lineSegment(
         adjacentPoint,
         pointFromVector(
@@ -1052,15 +991,31 @@ export const bindPointToSnapToElementOutline = (
     return edgePoint;
   }
 
-  return elbowed ? intersection : edgePoint;
+  if (elbowed) {
+    const scalar =
+      pointDistanceSq(edgePoint, center) -
+        pointDistanceSq(intersection, center) >
+      0
+        ? FIXED_BINDING_DISTANCE
+        : -FIXED_BINDING_DISTANCE;
+
+    return pointFromVector(
+      vectorScale(
+        vectorNormalize(vectorFromPoint(edgePoint, intersection)),
+        scalar,
+      ),
+      intersection,
+    );
+  }
+
+  return edgePoint;
 };
 
 export const avoidRectangularCorner = (
   element: ExcalidrawBindableElement,
-  elementsMap: ElementsMap,
   p: GlobalPoint,
 ): GlobalPoint => {
-  const center = elementCenterPoint(element, elementsMap);
+  const center = elementCenterPoint(element);
   const nonRotatedPoint = pointRotateRads(p, center, -element.angle as Radians);
 
   if (nonRotatedPoint[0] < element.x && nonRotatedPoint[1] < element.y) {
@@ -1153,34 +1108,35 @@ export const avoidRectangularCorner = (
 
 export const snapToMid = (
   element: ExcalidrawBindableElement,
-  elementsMap: ElementsMap,
   p: GlobalPoint,
   tolerance: number = 0.05,
 ): GlobalPoint => {
   const { x, y, width, height, angle } = element;
-  const center = elementCenterPoint(element, elementsMap, -0.1, -0.1);
+
+  const center = elementCenterPoint(element, -0.1, -0.1);
+
   const nonRotated = pointRotateRads(p, center, -angle as Radians);
 
   // snap-to-center point is adaptive to element size, but we don't want to go
   // above and below certain px distance
-  const verticalThreshold = clamp(tolerance * height, 5, 80);
+  const verticalThrehsold = clamp(tolerance * height, 5, 80);
-  const horizontalThreshold = clamp(tolerance * width, 5, 80);
+  const horizontalThrehsold = clamp(tolerance * width, 5, 80);
 
   if (
     nonRotated[0] <= x + width / 2 &&
-    nonRotated[1] > center[1] - verticalThreshold &&
+    nonRotated[1] > center[1] - verticalThrehsold &&
-    nonRotated[1] < center[1] + verticalThreshold
+    nonRotated[1] < center[1] + verticalThrehsold
   ) {
     // LEFT
-    return pointRotateRads<GlobalPoint>(
+    return pointRotateRads(
       pointFrom(x - FIXED_BINDING_DISTANCE, center[1]),
       center,
       angle,
     );
   } else if (
     nonRotated[1] <= y + height / 2 &&
-    nonRotated[0] > center[0] - horizontalThreshold &&
+    nonRotated[0] > center[0] - horizontalThrehsold &&
-    nonRotated[0] < center[0] + horizontalThreshold
+    nonRotated[0] < center[0] + horizontalThrehsold
   ) {
     // TOP
     return pointRotateRads(
@@ -1190,8 +1146,8 @@ export const snapToMid = (
     );
   } else if (
     nonRotated[0] >= x + width / 2 &&
-    nonRotated[1] > center[1] - verticalThreshold &&
+    nonRotated[1] > center[1] - verticalThrehsold &&
-    nonRotated[1] < center[1] + verticalThreshold
+    nonRotated[1] < center[1] + verticalThrehsold
   ) {
     // RIGHT
     return pointRotateRads(
@@ -1201,8 +1157,8 @@ export const snapToMid = (
     );
   } else if (
     nonRotated[1] >= y + height / 2 &&
-    nonRotated[0] > center[0] - horizontalThreshold &&
+    nonRotated[0] > center[0] - horizontalThrehsold &&
-    nonRotated[0] < center[0] + horizontalThreshold
+    nonRotated[0] < center[0] + horizontalThrehsold
   ) {
     // DOWN
     return pointRotateRads(
@@ -1211,7 +1167,7 @@ export const snapToMid = (
       angle,
     );
   } else if (element.type === "diamond") {
-    const distance = FIXED_BINDING_DISTANCE;
+    const distance = FIXED_BINDING_DISTANCE - 1;
     const topLeft = pointFrom<GlobalPoint>(
       x + width / 4 - distance,
       y + height / 4 - distance,
@@ -1228,28 +1184,27 @@ export const snapToMid = (
       x + (3 * width) / 4 + distance,
       y + (3 * height) / 4 + distance,
     );
-
     if (
       pointDistance(topLeft, nonRotated) <
-      Math.max(horizontalThreshold, verticalThreshold)
+      Math.max(horizontalThrehsold, verticalThrehsold)
     ) {
       return pointRotateRads(topLeft, center, angle);
     }
     if (
       pointDistance(topRight, nonRotated) <
-      Math.max(horizontalThreshold, verticalThreshold)
+      Math.max(horizontalThrehsold, verticalThrehsold)
     ) {
       return pointRotateRads(topRight, center, angle);
     }
     if (
       pointDistance(bottomLeft, nonRotated) <
-      Math.max(horizontalThreshold, verticalThreshold)
+      Math.max(horizontalThrehsold, verticalThrehsold)
     ) {
       return pointRotateRads(bottomLeft, center, angle);
     }
     if (
       pointDistance(bottomRight, nonRotated) <
-      Math.max(horizontalThreshold, verticalThreshold)
+      Math.max(horizontalThrehsold, verticalThrehsold)
     ) {
       return pointRotateRads(bottomRight, center, angle);
     }
@@ -1284,9 +1239,8 @@ const updateBoundPoint = (
         linearElement,
         bindableElement,
         startOrEnd === "startBinding" ? "start" : "end",
-        elementsMap,
       ).fixedPoint;
-    const globalMidPoint = elementCenterPoint(bindableElement, elementsMap);
+    const globalMidPoint = elementCenterPoint(bindableElement);
     const global = pointFrom<GlobalPoint>(
       bindableElement.x + fixedPoint[0] * bindableElement.width,
       bindableElement.y + fixedPoint[1] * bindableElement.height,
@@ -1312,7 +1266,6 @@ const updateBoundPoint = (
   );
   const focusPointAbsolute = determineFocusPoint(
     bindableElement,
-    elementsMap,
     binding.focus,
     adjacentPoint,
   );
@@ -1331,7 +1284,7 @@ const updateBoundPoint = (
         elementsMap,
       );
 
-    const center = elementCenterPoint(bindableElement, elementsMap);
+    const center = elementCenterPoint(bindableElement);
     const interceptorLength =
       pointDistance(adjacentPoint, edgePointAbsolute) +
       pointDistance(adjacentPoint, center) +
@@ -1339,7 +1292,6 @@ const updateBoundPoint = (
     const intersections = [
       ...intersectElementWithLineSegment(
         bindableElement,
-        elementsMap,
         lineSegment<GlobalPoint>(
           adjacentPoint,
           pointFromVector(
@@ -1390,7 +1342,6 @@ export const calculateFixedPointForElbowArrowBinding = (
   linearElement: NonDeleted<ExcalidrawElbowArrowElement>,
   hoveredElement: ExcalidrawBindableElement,
   startOrEnd: "start" | "end",
-  elementsMap: ElementsMap,
 ): { fixedPoint: FixedPoint } => {
   const bounds = [
     hoveredElement.x,
@@ -1402,7 +1353,6 @@ export const calculateFixedPointForElbowArrowBinding = (
     linearElement,
     hoveredElement,
     startOrEnd,
-    elementsMap,
   );
   const globalMidPoint = pointFrom(
     bounds[0] + (bounds[2] - bounds[0]) / 2,
@@ -1446,7 +1396,7 @@ const maybeCalculateNewGapWhenScaling = (
   return { ...currentBinding, gap: newGap };
 };
 
-const getEligibleElementForBindingElement = (
+const getElligibleElementForBindingElement = (
   linearElement: NonDeleted<ExcalidrawLinearElement>,
   startOrEnd: "start" | "end",
   elementsMap: NonDeletedSceneElementsMap,
@@ -1598,38 +1548,14 @@ export const bindingBorderTest = (
   zoom?: AppState["zoom"],
   fullShape?: boolean,
 ): boolean => {
-  const p = pointFrom<GlobalPoint>(x, y);
   const threshold = maxBindingGap(element, element.width, element.height, zoom);
-  const shouldTestInside =
-    // disable fullshape snapping for frame elements so we
-    // can bind to frame children
-    (fullShape || !isBindingFallthroughEnabled(element)) &&
-    !isFrameLikeElement(element);
 
-  // PERF: Run a cheap test to see if the binding element
+  const shape = getElementShape(element, elementsMap);
-  // is even close to the element
+  return (
-  const bounds = [
+    isPointOnShape(pointFrom(x, y), shape, threshold) ||
-    x - threshold,
+    (fullShape === true &&
-    y - threshold,
+      pointInsideBounds(pointFrom(x, y), aabbForElement(element)))
-    x + threshold,
-    y + threshold,
-  ] as Bounds;
-  const elementBounds = getElementBounds(element, elementsMap);
-  if (!doBoundsIntersect(bounds, elementBounds)) {
-    return false;
-  }
-
-  // Do the intersection test against the element since it's close enough
-  const intersections = intersectElementWithLineSegment(
-    element,
-    elementsMap,
-    lineSegment(elementCenterPoint(element, elementsMap), p),
   );
-  const distance = distanceToElement(element, elementsMap, p);
-
-  return shouldTestInside
-    ? intersections.length === 0 || distance <= threshold
-    : intersections.length > 0 && distance <= threshold;
 };
 
 export const maxBindingGap = (
@@ -1649,7 +1575,7 @@ export const maxBindingGap = (
     // bigger bindable boundary for bigger elements
     Math.min(0.25 * smallerDimension, 32),
     // keep in sync with the zoomed highlight
-    BINDING_HIGHLIGHT_THICKNESS / zoomValue + FIXED_BINDING_DISTANCE,
+    BINDING_HIGHLIGHT_THICKNESS / zoomValue + BINDING_HIGHLIGHT_OFFSET,
   );
 };
 
@@ -1660,13 +1586,12 @@ export const maxBindingGap = (
 // of the element.
 const determineFocusDistance = (
   element: ExcalidrawBindableElement,
-  elementsMap: ElementsMap,
   // Point on the line, in absolute coordinates
   a: GlobalPoint,
   // Another point on the line, in absolute coordinates (closer to element)
   b: GlobalPoint,
 ): number => {
-  const center = elementCenterPoint(element, elementsMap);
+  const center = elementCenterPoint(element);
 
   if (pointsEqual(a, b)) {
     return 0;
@@ -1791,13 +1716,12 @@ const determineFocusDistance = (
 
 const determineFocusPoint = (
   element: ExcalidrawBindableElement,
-  elementsMap: ElementsMap,
   // The oriented, relative distance from the center of `element` of the
   // returned focusPoint
   focus: number,
   adjacentPoint: GlobalPoint,
 ): GlobalPoint => {
-  const center = elementCenterPoint(element, elementsMap);
+  const center = elementCenterPoint(element);
 
   if (focus === 0) {
     return center;
@@ -2220,7 +2144,6 @@ export class BindableElement {
 export const getGlobalFixedPointForBindableElement = (
   fixedPointRatio: [number, number],
   element: ExcalidrawBindableElement,
-  elementsMap: ElementsMap,
 ): GlobalPoint => {
   const [fixedX, fixedY] = normalizeFixedPoint(fixedPointRatio);
 
@@ -2229,7 +2152,7 @@ export const getGlobalFixedPointForBindableElement = (
       element.x + element.width * fixedX,
       element.y + element.height * fixedY,
     ),
-    elementCenterPoint(element, elementsMap),
+    elementCenterPoint(element),
     element.angle,
   );
 };
@@ -2253,7 +2176,6 @@ export const getGlobalFixedPoints = (
       ? getGlobalFixedPointForBindableElement(
           arrow.startBinding.fixedPoint,
           startElement as ExcalidrawBindableElement,
-          elementsMap,
         )
       : pointFrom<GlobalPoint>(
           arrow.x + arrow.points[0][0],
@@ -2264,7 +2186,6 @@ export const getGlobalFixedPoints = (
       ? getGlobalFixedPointForBindableElement(
           arrow.endBinding.fixedPoint,
           endElement as ExcalidrawBindableElement,
-          elementsMap,
         )
       : pointFrom<GlobalPoint>(
           arrow.x + arrow.points[arrow.points.length - 1][0],

packages/element/src/bounds.ts

@@ -33,8 +33,8 @@ import type { AppState } from "@excalidraw/excalidraw/types";
 
 import type { Mutable } from "@excalidraw/common/utility-types";
 
-import { generateRoughOptions } from "./shape";
+import { generateRoughOptions } from "./Shape";
-import { ShapeCache } from "./shape";
+import { ShapeCache } from "./ShapeCache";
 import { LinearElementEditor } from "./linearElementEditor";
 import { getBoundTextElement, getContainerElement } from "./textElement";
 import {
@@ -42,11 +42,10 @@ import {
   isBoundToContainer,
   isFreeDrawElement,
   isLinearElement,
-  isLineElement,
   isTextElement,
 } from "./typeChecks";
 
-import { getElementShape } from "./shape";
+import { getElementShape } from "./shapes";
 
 import {
   deconstructDiamondElement,
@@ -103,23 +102,9 @@ export class ElementBounds {
       version: ExcalidrawElement["version"];
     }
   >();
-  private static nonRotatedBoundsCache = new WeakMap<
-    ExcalidrawElement,
-    {
-      bounds: Bounds;
-      version: ExcalidrawElement["version"];
-    }
-  >();
 
-  static getBounds(
+  static getBounds(element: ExcalidrawElement, elementsMap: ElementsMap) {
-    element: ExcalidrawElement,
+    const cachedBounds = ElementBounds.boundsCache.get(element);
-    elementsMap: ElementsMap,
-    nonRotated: boolean = false,
-  ) {
-    const cachedBounds =
-      nonRotated && element.angle !== 0
-        ? ElementBounds.nonRotatedBoundsCache.get(element)
-        : ElementBounds.boundsCache.get(element);
 
     if (
       cachedBounds?.version &&
@@ -130,23 +115,6 @@ export class ElementBounds {
     ) {
       return cachedBounds.bounds;
     }
-
-    if (nonRotated && element.angle !== 0) {
-      const nonRotatedBounds = ElementBounds.calculateBounds(
-        {
-          ...element,
-          angle: 0 as Radians,
-        },
-        elementsMap,
-      );
-      ElementBounds.nonRotatedBoundsCache.set(element, {
-        version: element.version,
-        bounds: nonRotatedBounds,
-      });
-
-      return nonRotatedBounds;
-    }
-
     const bounds = ElementBounds.calculateBounds(element, elementsMap);
 
     ElementBounds.boundsCache.set(element, {
@@ -322,42 +290,19 @@ export const getElementLineSegments = (
 
   if (shape.type === "polycurve") {
     const curves = shape.data;
-    const pointsOnCurves = curves.map((curve) =>
+    const points = curves
-      pointsOnBezierCurves(curve, 10),
+      .map((curve) => pointsOnBezierCurves(curve, 10))
-    );
+      .flat();
-
+    let i = 0;
     const segments: LineSegment<GlobalPoint>[] = [];
-
+    while (i < points.length - 1) {
-    if (
+      segments.push(
-      (isLineElement(element) && !element.polygon) ||
+        lineSegment(
-      isArrowElement(element)
+          pointFrom(points[i][0], points[i][1]),
-    ) {
+          pointFrom(points[i + 1][0], points[i + 1][1]),
-      for (const points of pointsOnCurves) {
+        ),
-        let i = 0;
+      );
-
+      i++;
-        while (i < points.length - 1) {
-          segments.push(
-            lineSegment(
-              pointFrom(points[i][0], points[i][1]),
-              pointFrom(points[i + 1][0], points[i + 1][1]),
-            ),
-          );
-          i++;
-        }
-      }
-    } else {
-      const points = pointsOnCurves.flat();
-      let i = 0;
-
-      while (i < points.length - 1) {
-        segments.push(
-          lineSegment(
-            pointFrom(points[i][0], points[i][1]),
-            pointFrom(points[i + 1][0], points[i + 1][1]),
-          ),
-        );
-        i++;
-      }
     }
 
     return segments;
@@ -608,7 +553,7 @@ const solveQuadratic = (
   return [s1, s2];
 };
 
-export const getCubicBezierCurveBound = (
+const getCubicBezierCurveBound = (
   p0: GlobalPoint,
   p1: GlobalPoint,
   p2: GlobalPoint,
@@ -994,9 +939,8 @@ const getLinearElementRotatedBounds = (
 export const getElementBounds = (
   element: ExcalidrawElement,
   elementsMap: ElementsMap,
-  nonRotated: boolean = false,
 ): Bounds => {
-  return ElementBounds.getBounds(element, elementsMap, nonRotated);
+  return ElementBounds.getBounds(element, elementsMap);
 };
 
 export const getCommonBounds = (
@@ -1150,9 +1094,7 @@ export interface BoundingBox {
 }
 
 export const getCommonBoundingBox = (
-  elements:
+  elements: ExcalidrawElement[] | readonly NonDeleted<ExcalidrawElement>[],
-    | readonly ExcalidrawElement[]
-    | readonly NonDeleted<ExcalidrawElement>[],
 ): BoundingBox => {
   const [minX, minY, maxX, maxY] = getCommonBounds(elements);
   return {
@@ -1191,71 +1133,6 @@ export const getCenterForBounds = (bounds: Bounds): GlobalPoint =>
     bounds[1] + (bounds[3] - bounds[1]) / 2,
   );
 
-/**
- * Get the axis-aligned bounding box for a given element
- */
-export const aabbForElement = (
-  element: Readonly<ExcalidrawElement>,
-  elementsMap: ElementsMap,
-  offset?: [number, number, number, number],
-) => {
-  const bbox = {
-    minX: element.x,
-    minY: element.y,
-    maxX: element.x + element.width,
-    maxY: element.y + element.height,
-    midX: element.x + element.width / 2,
-    midY: element.y + element.height / 2,
-  };
-
-  const center = elementCenterPoint(element, elementsMap);
-  const [topLeftX, topLeftY] = pointRotateRads(
-    pointFrom(bbox.minX, bbox.minY),
-    center,
-    element.angle,
-  );
-  const [topRightX, topRightY] = pointRotateRads(
-    pointFrom(bbox.maxX, bbox.minY),
-    center,
-    element.angle,
-  );
-  const [bottomRightX, bottomRightY] = pointRotateRads(
-    pointFrom(bbox.maxX, bbox.maxY),
-    center,
-    element.angle,
-  );
-  const [bottomLeftX, bottomLeftY] = pointRotateRads(
-    pointFrom(bbox.minX, bbox.maxY),
-    center,
-    element.angle,
-  );
-
-  const bounds = [
-    Math.min(topLeftX, topRightX, bottomRightX, bottomLeftX),
-    Math.min(topLeftY, topRightY, bottomRightY, bottomLeftY),
-    Math.max(topLeftX, topRightX, bottomRightX, bottomLeftX),
-    Math.max(topLeftY, topRightY, bottomRightY, bottomLeftY),
-  ] as Bounds;
-
-  if (offset) {
-    const [topOffset, rightOffset, downOffset, leftOffset] = offset;
-    return [
-      bounds[0] - leftOffset,
-      bounds[1] - topOffset,
-      bounds[2] + rightOffset,
-      bounds[3] + downOffset,
-    ] as Bounds;
-  }
-
-  return bounds;
-};
-
-export const pointInsideBounds = <P extends GlobalPoint | LocalPoint>(
-  p: P,
-  bounds: Bounds,
-): boolean =>
-  p[0] > bounds[0] && p[0] < bounds[2] && p[1] > bounds[1] && p[1] < bounds[3];
-
 export const doBoundsIntersect = (
   bounds1: Bounds | null,
   bounds2: Bounds | null,
@@ -1269,14 +1146,3 @@ export const doBoundsIntersect = (
 
   return minX1 < maxX2 && maxX1 > minX2 && minY1 < maxY2 && maxY1 > minY2;
 };
-
-export const elementCenterPoint = (
-  element: ExcalidrawElement,
-  elementsMap: ElementsMap,
-  xOffset: number = 0,
-  yOffset: number = 0,
-) => {
-  const [x, y] = getCenterForBounds(getElementBounds(element, elementsMap));
-
-  return pointFrom<GlobalPoint>(x + xOffset, y + yOffset);
-};

packages/element/src/collision.ts

@@ -1,68 +1,52 @@
-import { isTransparent } from "@excalidraw/common";
+import { isTransparent, elementCenterPoint } from "@excalidraw/common";
 import {
   curveIntersectLineSegment,
   isPointWithinBounds,
+  line,
   lineSegment,
   lineSegmentIntersectionPoints,
   pointFrom,
-  pointFromVector,
   pointRotateRads,
   pointsEqual,
-  vectorFromPoint,
-  vectorNormalize,
-  vectorScale,
 } from "@excalidraw/math";
 
 import {
   ellipse,
-  ellipseSegmentInterceptPoints,
+  ellipseLineIntersectionPoints,
 } from "@excalidraw/math/ellipse";
 
+import { isPointInShape, isPointOnShape } from "@excalidraw/utils/collision";
+import { type GeometricShape, getPolygonShape } from "@excalidraw/utils/shape";
+
 import type {
-  Curve,
   GlobalPoint,
   LineSegment,
+  LocalPoint,
+  Polygon,
   Radians,
 } from "@excalidraw/math";
 
 import type { FrameNameBounds } from "@excalidraw/excalidraw/types";
 
-import { isPathALoop } from "./utils";
+import { getBoundTextShape, isPathALoop } from "./shapes";
-import {
+import { getElementBounds } from "./bounds";
-  type Bounds,
-  doBoundsIntersect,
-  elementCenterPoint,
-  getCenterForBounds,
-  getCubicBezierCurveBound,
-  getElementBounds,
-} from "./bounds";
 import {
   hasBoundTextElement,
-  isFreeDrawElement,
   isIframeLikeElement,
   isImageElement,
-  isLinearElement,
   isTextElement,
 } from "./typeChecks";
 import {
   deconstructDiamondElement,
-  deconstructLinearOrFreeDrawElement,
   deconstructRectanguloidElement,
 } from "./utils";
 
-import { getBoundTextElement } from "./textElement";
-
-import { LinearElementEditor } from "./linearElementEditor";
-
-import { distanceToElement } from "./distance";
-
 import type {
   ElementsMap,
   ExcalidrawDiamondElement,
   ExcalidrawElement,
   ExcalidrawEllipseElement,
-  ExcalidrawFreeDrawElement,
+  ExcalidrawRectangleElement,
-  ExcalidrawLinearElement,
   ExcalidrawRectanguloidElement,
 } from "./types";
 
@@ -88,64 +72,45 @@ export const shouldTestInside = (element: ExcalidrawElement) => {
   return isDraggableFromInside || isImageElement(element);
 };
 
-export type HitTestArgs = {
+export type HitTestArgs<Point extends GlobalPoint | LocalPoint> = {
-  point: GlobalPoint;
+  x: number;
+  y: number;
   element: ExcalidrawElement;
-  threshold: number;
+  shape: GeometricShape<Point>;
-  elementsMap: ElementsMap;
+  threshold?: number;
   frameNameBound?: FrameNameBounds | null;
 };
 
-export const hitElementItself = ({
+export const hitElementItself = <Point extends GlobalPoint | LocalPoint>({
-  point,
+  x,
+  y,
   element,
-  threshold,
+  shape,
-  elementsMap,
+  threshold = 10,
   frameNameBound = null,
-}: HitTestArgs) => {
+}: HitTestArgs<Point>) => {
-  // Hit test against a frame's name
+  let hit = shouldTestInside(element)
-  const hitFrameName = frameNameBound
-    ? isPointWithinBounds(
-        pointFrom(frameNameBound.x - threshold, frameNameBound.y - threshold),
-        point,
-        pointFrom(
-          frameNameBound.x + frameNameBound.width + threshold,
-          frameNameBound.y + frameNameBound.height + threshold,
-        ),
-      )
-    : false;
-
-  // Hit test against the extended, rotated bounding box of the element first
-  const bounds = getElementBounds(element, elementsMap, true);
-  const hitBounds = isPointWithinBounds(
-    pointFrom(bounds[0] - threshold, bounds[1] - threshold),
-    pointRotateRads(
-      point,
-      getCenterForBounds(bounds),
-      -element.angle as Radians,
-    ),
-    pointFrom(bounds[2] + threshold, bounds[3] + threshold),
-  );
-
-  // PERF: Bail out early if the point is not even in the
-  // rotated bounding box or not hitting the frame name (saves 99%)
-  if (!hitBounds && !hitFrameName) {
-    return false;
-  }
-
-  // Do the precise (and relatively costly) hit test
-  const hitElement = shouldTestInside(element)
     ? // Since `inShape` tests STRICTLY againt the insides of a shape
       // we would need `onShape` as well to include the "borders"
-      isPointInElement(point, element, elementsMap) ||
+      isPointInShape(pointFrom(x, y), shape) ||
-      isPointOnElementOutline(point, element, elementsMap, threshold)
+      isPointOnShape(pointFrom(x, y), shape, threshold)
-    : isPointOnElementOutline(point, element, elementsMap, threshold);
+    : isPointOnShape(pointFrom(x, y), shape, threshold);
 
-  return hitElement || hitFrameName;
+  // hit test against a frame's name
+  if (!hit && frameNameBound) {
+    hit = isPointInShape(pointFrom(x, y), {
+      type: "polygon",
+      data: getPolygonShape(frameNameBound as ExcalidrawRectangleElement)
+        .data as Polygon<Point>,
+    });
+  }
+
+  return hit;
 };
 
 export const hitElementBoundingBox = (
-  point: GlobalPoint,
+  x: number,
+  y: number,
   element: ExcalidrawElement,
   elementsMap: ElementsMap,
   tolerance = 0,
@@ -155,42 +120,37 @@ export const hitElementBoundingBox = (
   y1 -= tolerance;
   x2 += tolerance;
   y2 += tolerance;
-  return isPointWithinBounds(pointFrom(x1, y1), point, pointFrom(x2, y2));
+  return isPointWithinBounds(
+    pointFrom(x1, y1),
+    pointFrom(x, y),
+    pointFrom(x2, y2),
+  );
 };
 
-export const hitElementBoundingBoxOnly = (
+export const hitElementBoundingBoxOnly = <
-  hitArgs: HitTestArgs,
+  Point extends GlobalPoint | LocalPoint,
+>(
+  hitArgs: HitTestArgs<Point>,
   elementsMap: ElementsMap,
-) =>
+) => {
-  !hitElementItself(hitArgs) &&
+  return (
-  // bound text is considered part of the element (even if it's outside the bounding box)
+    !hitElementItself(hitArgs) &&
-  !hitElementBoundText(hitArgs.point, hitArgs.element, elementsMap) &&
+    // bound text is considered part of the element (even if it's outside the bounding box)
-  hitElementBoundingBox(hitArgs.point, hitArgs.element, elementsMap);
+    !hitElementBoundText(
+      hitArgs.x,
+      hitArgs.y,
+      getBoundTextShape(hitArgs.element, elementsMap),
+    ) &&
+    hitElementBoundingBox(hitArgs.x, hitArgs.y, hitArgs.element, elementsMap)
+  );
+};
 
-export const hitElementBoundText = (
+export const hitElementBoundText = <Point extends GlobalPoint | LocalPoint>(
-  point: GlobalPoint,
+  x: number,
-  element: ExcalidrawElement,
+  y: number,
-  elementsMap: ElementsMap,
+  textShape: GeometricShape<Point> | null,
 ): boolean => {
-  const boundTextElementCandidate = getBoundTextElement(element, elementsMap);
+  return !!textShape && isPointInShape(pointFrom(x, y), textShape);
-
-  if (!boundTextElementCandidate) {
-    return false;
-  }
-  const boundTextElement = isLinearElement(element)
-    ? {
-        ...boundTextElementCandidate,
-        // arrow's bound text accurate position is not stored in the element's property
-        // but rather calculated and returned from the following static method
-        ...LinearElementEditor.getBoundTextElementPosition(
-          element,
-          boundTextElementCandidate,
-          elementsMap,
-        ),
-      }
-    : boundTextElementCandidate;
-
-  return isPointInElement(point, boundTextElement, elementsMap);
 };
 
 /**
@@ -203,26 +163,9 @@ export const hitElementBoundText = (
  */
 export const intersectElementWithLineSegment = (
   element: ExcalidrawElement,
-  elementsMap: ElementsMap,
   line: LineSegment<GlobalPoint>,
   offset: number = 0,
-  onlyFirst = false,
 ): GlobalPoint[] => {
-  // First check if the line intersects the element's axis-aligned bounding box
-  // as it is much faster than checking intersection against the element's shape
-  const intersectorBounds = [
-    Math.min(line[0][0] - offset, line[1][0] - offset),
-    Math.min(line[0][1] - offset, line[1][1] - offset),
-    Math.max(line[0][0] + offset, line[1][0] + offset),
-    Math.max(line[0][1] + offset, line[1][1] + offset),
-  ] as Bounds;
-  const elementBounds = getElementBounds(element, elementsMap);
-
-  if (!doBoundsIntersect(intersectorBounds, elementBounds)) {
-    return [];
-  }
-
-  // Do the actual intersection test against the element's shape
   switch (element.type) {
     case "rectangle":
     case "image":
@@ -230,196 +173,67 @@ export const intersectElementWithLineSegment = (
     case "iframe":
     case "embeddable":
     case "frame":
-    case "selection":
     case "magicframe":
-      return intersectRectanguloidWithLineSegment(
+      return intersectRectanguloidWithLineSegment(element, line, offset);
-        element,
-        elementsMap,
-        line,
-        offset,
-        onlyFirst,
-      );
     case "diamond":
-      return intersectDiamondWithLineSegment(
+      return intersectDiamondWithLineSegment(element, line, offset);
-        element,
-        elementsMap,
-        line,
-        offset,
-        onlyFirst,
-      );
     case "ellipse":
-      return intersectEllipseWithLineSegment(
+      return intersectEllipseWithLineSegment(element, line, offset);
-        element,
+    default:
-        elementsMap,
+      throw new Error(`Unimplemented element type '${element.type}'`);
-        line,
-        offset,
-      );
-    case "line":
-    case "freedraw":
-    case "arrow":
-      return intersectLinearOrFreeDrawWithLineSegment(element, line, onlyFirst);
   }
 };
 
-const curveIntersections = (
-  curves: Curve<GlobalPoint>[],
-  segment: LineSegment<GlobalPoint>,
-  intersections: GlobalPoint[],
-  center: GlobalPoint,
-  angle: Radians,
-  onlyFirst = false,
-) => {
-  for (const c of curves) {
-    // Optimize by doing a cheap bounding box check first
-    const b1 = getCubicBezierCurveBound(c[0], c[1], c[2], c[3]);
-    const b2 = [
-      Math.min(segment[0][0], segment[1][0]),
-      Math.min(segment[0][1], segment[1][1]),
-      Math.max(segment[0][0], segment[1][0]),
-      Math.max(segment[0][1], segment[1][1]),
-    ] as Bounds;
-
-    if (!doBoundsIntersect(b1, b2)) {
-      continue;
-    }
-
-    const hits = curveIntersectLineSegment(c, segment);
-
-    if (hits.length > 0) {
-      for (const j of hits) {
-        intersections.push(pointRotateRads(j, center, angle));
-      }
-
-      if (onlyFirst) {
-        return intersections;
-      }
-    }
-  }
-
-  return intersections;
-};
-
-const lineIntersections = (
-  lines: LineSegment<GlobalPoint>[],
-  segment: LineSegment<GlobalPoint>,
-  intersections: GlobalPoint[],
-  center: GlobalPoint,
-  angle: Radians,
-  onlyFirst = false,
-) => {
-  for (const l of lines) {
-    const intersection = lineSegmentIntersectionPoints(l, segment);
-    if (intersection) {
-      intersections.push(pointRotateRads(intersection, center, angle));
-
-      if (onlyFirst) {
-        return intersections;
-      }
-    }
-  }
-
-  return intersections;
-};
-
-const intersectLinearOrFreeDrawWithLineSegment = (
-  element: ExcalidrawLinearElement | ExcalidrawFreeDrawElement,
-  segment: LineSegment<GlobalPoint>,
-  onlyFirst = false,
-): GlobalPoint[] => {
-  // NOTE: This is the only one which return the decomposed elements
-  // rotated! This is due to taking advantage of roughjs definitions.
-  const [lines, curves] = deconstructLinearOrFreeDrawElement(element);
-  const intersections: GlobalPoint[] = [];
-
-  for (const l of lines) {
-    const intersection = lineSegmentIntersectionPoints(l, segment);
-    if (intersection) {
-      intersections.push(intersection);
-
-      if (onlyFirst) {
-        return intersections;
-      }
-    }
-  }
-
-  for (const c of curves) {
-    // Optimize by doing a cheap bounding box check first
-    const b1 = getCubicBezierCurveBound(c[0], c[1], c[2], c[3]);
-    const b2 = [
-      Math.min(segment[0][0], segment[1][0]),
-      Math.min(segment[0][1], segment[1][1]),
-      Math.max(segment[0][0], segment[1][0]),
-      Math.max(segment[0][1], segment[1][1]),
-    ] as Bounds;
-
-    if (!doBoundsIntersect(b1, b2)) {
-      continue;
-    }
-
-    const hits = curveIntersectLineSegment(c, segment);
-
-    if (hits.length > 0) {
-      intersections.push(...hits);
-
-      if (onlyFirst) {
-        return intersections;
-      }
-    }
-  }
-
-  return intersections;
-};
-
 const intersectRectanguloidWithLineSegment = (
   element: ExcalidrawRectanguloidElement,
-  elementsMap: ElementsMap,
+  l: LineSegment<GlobalPoint>,
-  segment: LineSegment<GlobalPoint>,
   offset: number = 0,
-  onlyFirst = false,
 ): GlobalPoint[] => {
-  const center = elementCenterPoint(element, elementsMap);
+  const center = elementCenterPoint(element);
   // To emulate a rotated rectangle we rotate the point in the inverse angle
   // instead. It's all the same distance-wise.
   const rotatedA = pointRotateRads<GlobalPoint>(
-    segment[0],
+    l[0],
     center,
     -element.angle as Radians,
   );
   const rotatedB = pointRotateRads<GlobalPoint>(
-    segment[1],
+    l[1],
     center,
     -element.angle as Radians,
   );
-  const rotatedIntersector = lineSegment(rotatedA, rotatedB);
 
   // Get the element's building components we can test against
   const [sides, corners] = deconstructRectanguloidElement(element, offset);
 
-  const intersections: GlobalPoint[] = [];
+  return (
-
+    // Test intersection against the sides, keep only the valid
-  lineIntersections(
+    // intersection points and rotate them back to scene space
-    sides,
+    sides
-    rotatedIntersector,
+      .map((s) =>
-    intersections,
+        lineSegmentIntersectionPoints(
-    center,
+          lineSegment<GlobalPoint>(rotatedA, rotatedB),
-    element.angle,
+          s,
-    onlyFirst,
+        ),
+      )
+      .filter((x) => x != null)
+      .map((j) => pointRotateRads<GlobalPoint>(j!, center, element.angle))
+      // Test intersection against the corners which are cubic bezier curves,
+      // keep only the valid intersection points and rotate them back to scene
+      // space
+      .concat(
+        corners
+          .flatMap((t) =>
+            curveIntersectLineSegment(t, lineSegment(rotatedA, rotatedB)),
+          )
+          .filter((i) => i != null)
+          .map((j) => pointRotateRads(j, center, element.angle)),
+      )
+      // Remove duplicates
+      .filter(
+        (p, idx, points) => points.findIndex((d) => pointsEqual(p, d)) === idx,
+      )
   );
-
-  if (onlyFirst && intersections.length > 0) {
-    return intersections;
-  }
-
-  curveIntersections(
-    corners,
-    rotatedIntersector,
-    intersections,
-    center,
-    element.angle,
-    onlyFirst,
-  );
-
-  return intersections;
 };
 
 /**
@@ -431,45 +245,43 @@ const intersectRectanguloidWithLineSegment = (
  */
 const intersectDiamondWithLineSegment = (
   element: ExcalidrawDiamondElement,
-  elementsMap: ElementsMap,
   l: LineSegment<GlobalPoint>,
   offset: number = 0,
-  onlyFirst = false,
 ): GlobalPoint[] => {
-  const center = elementCenterPoint(element, elementsMap);
+  const center = elementCenterPoint(element);
 
   // Rotate the point to the inverse direction to simulate the rotated diamond
   // points. It's all the same distance-wise.
   const rotatedA = pointRotateRads(l[0], center, -element.angle as Radians);
   const rotatedB = pointRotateRads(l[1], center, -element.angle as Radians);
-  const rotatedIntersector = lineSegment(rotatedA, rotatedB);
 
-  const [sides, corners] = deconstructDiamondElement(element, offset);
+  const [sides, curves] = deconstructDiamondElement(element, offset);
-  const intersections: GlobalPoint[] = [];
 
-  lineIntersections(
+  return (
-    sides,
+    sides
-    rotatedIntersector,
+      .map((s) =>
-    intersections,
+        lineSegmentIntersectionPoints(
-    center,
+          lineSegment<GlobalPoint>(rotatedA, rotatedB),
-    element.angle,
+          s,
-    onlyFirst,
+        ),
+      )
+      .filter((p): p is GlobalPoint => p != null)
+      // Rotate back intersection points
+      .map((p) => pointRotateRads<GlobalPoint>(p!, center, element.angle))
+      .concat(
+        curves
+          .flatMap((p) =>
+            curveIntersectLineSegment(p, lineSegment(rotatedA, rotatedB)),
+          )
+          .filter((p) => p != null)
+          // Rotate back intersection points
+          .map((p) => pointRotateRads(p, center, element.angle)),
+      )
+      // Remove duplicates
+      .filter(
+        (p, idx, points) => points.findIndex((d) => pointsEqual(p, d)) === idx,
+      )
   );
-
-  if (onlyFirst && intersections.length > 0) {
-    return intersections;
-  }
-
-  curveIntersections(
-    corners,
-    rotatedIntersector,
-    intersections,
-    center,
-    element.angle,
-    onlyFirst,
-  );
-
-  return intersections;
 };
 
 /**
@@ -481,76 +293,16 @@ const intersectDiamondWithLineSegment = (
  */
 const intersectEllipseWithLineSegment = (
   element: ExcalidrawEllipseElement,
-  elementsMap: ElementsMap,
   l: LineSegment<GlobalPoint>,
   offset: number = 0,
 ): GlobalPoint[] => {
-  const center = elementCenterPoint(element, elementsMap);
+  const center = elementCenterPoint(element);
 
   const rotatedA = pointRotateRads(l[0], center, -element.angle as Radians);
   const rotatedB = pointRotateRads(l[1], center, -element.angle as Radians);
 
-  return ellipseSegmentInterceptPoints(
+  return ellipseLineIntersectionPoints(
     ellipse(center, element.width / 2 + offset, element.height / 2 + offset),
-    lineSegment(rotatedA, rotatedB),
+    line(rotatedA, rotatedB),
   ).map((p) => pointRotateRads(p, center, element.angle));
 };
-
-/**
- * Check if the given point is considered on the given shape's border
- *
- * @param point
- * @param element
- * @param tolerance
- * @returns
- */
-const isPointOnElementOutline = (
-  point: GlobalPoint,
-  element: ExcalidrawElement,
-  elementsMap: ElementsMap,
-  tolerance = 1,
-) => distanceToElement(element, elementsMap, point) <= tolerance;
-
-/**
- * Check if the given point is considered inside the element's border
- *
- * @param point
- * @param element
- * @returns
- */
-export const isPointInElement = (
-  point: GlobalPoint,
-  element: ExcalidrawElement,
-  elementsMap: ElementsMap,
-) => {
-  if (
-    (isLinearElement(element) || isFreeDrawElement(element)) &&
-    !isPathALoop(element.points)
-  ) {
-    // There isn't any "inside" for a non-looping path
-    return false;
-  }
-
-  const [x1, y1, x2, y2] = getElementBounds(element, elementsMap);
-
-  if (!isPointWithinBounds(pointFrom(x1, y1), point, pointFrom(x2, y2))) {
-    return false;
-  }
-
-  const center = pointFrom<GlobalPoint>((x1 + x2) / 2, (y1 + y2) / 2);
-  const otherPoint = pointFromVector(
-    vectorScale(
-      vectorNormalize(vectorFromPoint(point, center, 0.1)),
-      Math.max(element.width, element.height) * 2,
-    ),
-    center,
-  );
-  const intersector = lineSegment(point, otherPoint);
-  const intersections = intersectElementWithLineSegment(
-    element,
-    elementsMap,
-    intersector,
-  ).filter((p, pos, arr) => arr.findIndex((q) => pointsEqual(q, p)) === pos);
-
-  return intersections.length % 2 === 1;
-};

packages/element/src/comparisons.ts

@@ -10,13 +10,7 @@ export const hasBackground = (type: ElementOrToolType) =>
   type === "freedraw";
 
 export const hasStrokeColor = (type: ElementOrToolType) =>
-  type === "rectangle" ||
+  type !== "image" && type !== "frame" && type !== "magicframe";
-  type === "ellipse" ||
-  type === "diamond" ||
-  type === "freedraw" ||
-  type === "arrow" ||
-  type === "line" ||
-  type === "text";
 
 export const hasStrokeWidth = (type: ElementOrToolType) =>
   type === "rectangle" ||

packages/element/src/cropElement.ts

@@ -14,8 +14,9 @@ import {
 } from "@excalidraw/math";
 import { type Point } from "points-on-curve";
 
+import { elementCenterPoint } from "@excalidraw/common";
+
 import {
-  elementCenterPoint,
   getElementAbsoluteCoords,
   getResizedElementAbsoluteCoords,
 } from "./bounds";
@@ -33,7 +34,6 @@ export const MINIMAL_CROP_SIZE = 10;
 
 export const cropElement = (
   element: ExcalidrawImageElement,
-  elementsMap: ElementsMap,
   transformHandle: TransformHandleType,
   naturalWidth: number,
   naturalHeight: number,
@@ -63,7 +63,7 @@ export const cropElement = (
 
   const rotatedPointer = pointRotateRads(
     pointFrom(pointerX, pointerY),
-    elementCenterPoint(element, elementsMap),
+    elementCenterPoint(element),
     -element.angle as Radians,
   );
 

packages/element/src/distance.ts

@@ -6,33 +6,27 @@ import {
 
 import { ellipse, ellipseDistanceFromPoint } from "@excalidraw/math/ellipse";
 
+import { elementCenterPoint } from "@excalidraw/common";
+
 import type { GlobalPoint, Radians } from "@excalidraw/math";
 
 import {
   deconstructDiamondElement,
-  deconstructLinearOrFreeDrawElement,
   deconstructRectanguloidElement,
 } from "./utils";
 
-import { elementCenterPoint } from "./bounds";
-
 import type {
-  ElementsMap,
+  ExcalidrawBindableElement,
   ExcalidrawDiamondElement,
-  ExcalidrawElement,
   ExcalidrawEllipseElement,
-  ExcalidrawFreeDrawElement,
-  ExcalidrawLinearElement,
   ExcalidrawRectanguloidElement,
 } from "./types";
 
-export const distanceToElement = (
+export const distanceToBindableElement = (
-  element: ExcalidrawElement,
+  element: ExcalidrawBindableElement,
-  elementsMap: ElementsMap,
   p: GlobalPoint,
 ): number => {
   switch (element.type) {
-    case "selection":
     case "rectangle":
     case "image":
     case "text":
@@ -40,15 +34,11 @@ export const distanceToElement = (
     case "embeddable":
     case "frame":
     case "magicframe":
-      return distanceToRectanguloidElement(element, elementsMap, p);
+      return distanceToRectanguloidElement(element, p);
     case "diamond":
-      return distanceToDiamondElement(element, elementsMap, p);
+      return distanceToDiamondElement(element, p);
     case "ellipse":
-      return distanceToEllipseElement(element, elementsMap, p);
+      return distanceToEllipseElement(element, p);
-    case "line":
-    case "arrow":
-    case "freedraw":
-      return distanceToLinearOrFreeDraElement(element, p);
   }
 };
 
@@ -62,10 +52,9 @@ export const distanceToElement = (
  */
 const distanceToRectanguloidElement = (
   element: ExcalidrawRectanguloidElement,
-  elementsMap: ElementsMap,
   p: GlobalPoint,
 ) => {
-  const center = elementCenterPoint(element, elementsMap);
+  const center = elementCenterPoint(element);
   // To emulate a rotated rectangle we rotate the point in the inverse angle
   // instead. It's all the same distance-wise.
   const rotatedPoint = pointRotateRads(p, center, -element.angle as Radians);
@@ -91,10 +80,9 @@ const distanceToRectanguloidElement = (
  */
 const distanceToDiamondElement = (
   element: ExcalidrawDiamondElement,
-  elementsMap: ElementsMap,
   p: GlobalPoint,
 ): number => {
-  const center = elementCenterPoint(element, elementsMap);
+  const center = elementCenterPoint(element);
 
   // Rotate the point to the inverse direction to simulate the rotated diamond
   // points. It's all the same distance-wise.
@@ -120,24 +108,12 @@ const distanceToDiamondElement = (
  */
 const distanceToEllipseElement = (
   element: ExcalidrawEllipseElement,
-  elementsMap: ElementsMap,
   p: GlobalPoint,
 ): number => {
-  const center = elementCenterPoint(element, elementsMap);
+  const center = elementCenterPoint(element);
   return ellipseDistanceFromPoint(
     // Instead of rotating the ellipse, rotate the point to the inverse angle
     pointRotateRads(p, center, -element.angle as Radians),
     ellipse(center, element.width / 2, element.height / 2),
   );
 };
-
-const distanceToLinearOrFreeDraElement = (
-  element: ExcalidrawLinearElement | ExcalidrawFreeDrawElement,
-  p: GlobalPoint,
-) => {
-  const [lines, curves] = deconstructLinearOrFreeDrawElement(element);
-  return Math.min(
-    ...lines.map((s) => distanceToLineSegment(p, s)),
-    ...curves.map((a) => curvePointDistance(a, p)),
-  );
-};

packages/element/src/distribute.ts

@@ -1,9 +1,7 @@
-import type { AppState } from "@excalidraw/excalidraw/types";
-
 import { getCommonBoundingBox } from "./bounds";
 import { newElementWith } from "./mutateElement";
 
-import { getSelectedElementsByGroup } from "./groups";
+import { getMaximumGroups } from "./groups";
 
 import type { ElementsMap, ExcalidrawElement } from "./types";
 
@@ -16,7 +14,6 @@ export const distributeElements = (
   selectedElements: ExcalidrawElement[],
   elementsMap: ElementsMap,
   distribution: Distribution,
-  appState: Readonly<AppState>,
 ): ExcalidrawElement[] => {
   const [start, mid, end, extent] =
     distribution.axis === "x"
@@ -24,11 +21,7 @@ export const distributeElements = (
       : (["minY", "midY", "maxY", "height"] as const);
 
   const bounds = getCommonBoundingBox(selectedElements);
-  const groups = getSelectedElementsByGroup(
+  const groups = getMaximumGroups(selectedElements, elementsMap)
-    selectedElements,
-    elementsMap,
-    appState,
-  )
     .map((group) => [group, getCommonBoundingBox(group)] as const)
     .sort((a, b) => a[1][mid] - b[1][mid]);
 

packages/element/src/elbowArrow.ts

@@ -20,7 +20,6 @@ import {
   tupleToCoors,
   getSizeFromPoints,
   isDevEnv,
-  arrayToMap,
 } from "@excalidraw/common";
 
 import type { AppState } from "@excalidraw/excalidraw/types";
@@ -30,9 +29,10 @@ import {
   FIXED_BINDING_DISTANCE,
   getHeadingForElbowArrowSnap,
   getGlobalFixedPointForBindableElement,
+  snapToMid,
   getHoveredElementForBinding,
 } from "./binding";
-import { distanceToElement } from "./distance";
+import { distanceToBindableElement } from "./distance";
 import {
   compareHeading,
   flipHeading,
@@ -52,7 +52,7 @@ import {
   type NonDeletedSceneElementsMap,
 } from "./types";
 
-import { aabbForElement, pointInsideBounds } from "./bounds";
+import { aabbForElement, pointInsideBounds } from "./shapes";
 
 import type { Bounds } from "./bounds";
 import type { Heading } from "./heading";
@@ -359,12 +359,6 @@ const handleSegmentRelease = (
     null,
   );
 
-  if (!restoredPoints || restoredPoints.length < 2) {
-    throw new Error(
-      "Property 'points' is required in the update returned by normalizeArrowElementUpdate()",
-    );
-  }
-
   const nextPoints: GlobalPoint[] = [];
 
   // First part of the arrow are the old points
@@ -712,7 +706,7 @@ const handleEndpointDrag = (
   endGlobalPoint: GlobalPoint,
   hoveredStartElement: ExcalidrawBindableElement | null,
   hoveredEndElement: ExcalidrawBindableElement | null,
-): ElementUpdate<ExcalidrawElbowArrowElement> => {
+) => {
   let startIsSpecial = arrow.startIsSpecial ?? null;
   let endIsSpecial = arrow.endIsSpecial ?? null;
   const globalUpdatedPoints = updatedPoints.map((p, i) =>
@@ -747,15 +741,8 @@ const handleEndpointDrag = (
 
   // Calculate the moving second point connection and add the start point
   {
-    const secondPoint = globalUpdatedPoints.at(startIsSpecial ? 2 : 1);
+    const secondPoint = globalUpdatedPoints[startIsSpecial ? 2 : 1];
-    const thirdPoint = globalUpdatedPoints.at(startIsSpecial ? 3 : 2);
+    const thirdPoint = globalUpdatedPoints[startIsSpecial ? 3 : 2];
-
-    if (!secondPoint || !thirdPoint) {
-      throw new Error(
-        `Second and third points must exist when handling endpoint drag (${startIsSpecial})`,
-      );
-    }
-
     const startIsHorizontal = headingIsHorizontal(startHeading);
     const secondIsHorizontal = headingIsHorizontal(
       vectorToHeading(vectorFromPoint(secondPoint, thirdPoint)),
@@ -814,19 +801,10 @@ const handleEndpointDrag = (
 
   // Calculate the moving second to last point connection
   {
-    const secondToLastPoint = globalUpdatedPoints.at(
+    const secondToLastPoint =
-      globalUpdatedPoints.length - (endIsSpecial ? 3 : 2),
+      globalUpdatedPoints[globalUpdatedPoints.length - (endIsSpecial ? 3 : 2)];
-    );
+    const thirdToLastPoint =
-    const thirdToLastPoint = globalUpdatedPoints.at(
+      globalUpdatedPoints[globalUpdatedPoints.length - (endIsSpecial ? 4 : 3)];
-      globalUpdatedPoints.length - (endIsSpecial ? 4 : 3),
-    );
-
-    if (!secondToLastPoint || !thirdToLastPoint) {
-      throw new Error(
-        `Second and third to last points must exist when handling endpoint drag (${endIsSpecial})`,
-      );
-    }
-
     const endIsHorizontal = headingIsHorizontal(endHeading);
     const secondIsHorizontal = headingForPointIsHorizontal(
       thirdToLastPoint,
@@ -920,6 +898,50 @@ export const updateElbowArrowPoints = (
     return { points: updates.points ?? arrow.points };
   }
 
+  // NOTE (mtolmacs): This is a temporary check to ensure that the incoming elbow
+  // arrow size is valid. This check will be removed once the issue is identified
+  if (
+    arrow.x < -MAX_POS ||
+    arrow.x > MAX_POS ||
+    arrow.y < -MAX_POS ||
+    arrow.y > MAX_POS ||
+    arrow.x + (updates?.points?.[updates?.points?.length - 1]?.[0] ?? 0) <
+      -MAX_POS ||
+    arrow.x + (updates?.points?.[updates?.points?.length - 1]?.[0] ?? 0) >
+      MAX_POS ||
+    arrow.y + (updates?.points?.[updates?.points?.length - 1]?.[1] ?? 0) <
+      -MAX_POS ||
+    arrow.y + (updates?.points?.[updates?.points?.length - 1]?.[1] ?? 0) >
+      MAX_POS ||
+    arrow.x + (arrow?.points?.[arrow?.points?.length - 1]?.[0] ?? 0) <
+      -MAX_POS ||
+    arrow.x + (arrow?.points?.[arrow?.points?.length - 1]?.[0] ?? 0) >
+      MAX_POS ||
+    arrow.y + (arrow?.points?.[arrow?.points?.length - 1]?.[1] ?? 0) <
+      -MAX_POS ||
+    arrow.y + (arrow?.points?.[arrow?.points?.length - 1]?.[1] ?? 0) > MAX_POS
+  ) {
+    console.error(
+      "Elbow arrow (or update) is outside reasonable bounds (> 1e6)",
+      {
+        arrow,
+        updates,
+      },
+    );
+  }
+  // @ts-ignore See above note
+  arrow.x = clamp(arrow.x, -MAX_POS, MAX_POS);
+  // @ts-ignore See above note
+  arrow.y = clamp(arrow.y, -MAX_POS, MAX_POS);
+  if (updates.points) {
+    updates.points = updates.points.map(([x, y]) =>
+      pointFrom<LocalPoint>(
+        clamp(x, -MAX_POS, MAX_POS),
+        clamp(y, -MAX_POS, MAX_POS),
+      ),
+    );
+  }
+
   if (!import.meta.env.PROD) {
     invariant(
       !updates.points || updates.points.length >= 2,
@@ -1251,7 +1273,6 @@ const getElbowArrowData = (
     arrow.startBinding?.fixedPoint,
     origStartGlobalPoint,
     hoveredStartElement,
-    elementsMap,
     options?.isDragging,
   );
   const endGlobalPoint = getGlobalPoint(
@@ -1265,7 +1286,6 @@ const getElbowArrowData = (
     arrow.endBinding?.fixedPoint,
     origEndGlobalPoint,
     hoveredEndElement,
-    elementsMap,
     options?.isDragging,
   );
   const startHeading = getBindPointHeading(
@@ -1273,14 +1293,12 @@ const getElbowArrowData = (
     endGlobalPoint,
     hoveredStartElement,
     origStartGlobalPoint,
-    elementsMap,
   );
   const endHeading = getBindPointHeading(
     endGlobalPoint,
     startGlobalPoint,
     hoveredEndElement,
     origEndGlobalPoint,
-    elementsMap,
   );
   const startPointBounds = [
     startGlobalPoint[0] - 2,
@@ -1297,7 +1315,6 @@ const getElbowArrowData = (
   const startElementBounds = hoveredStartElement
     ? aabbForElement(
         hoveredStartElement,
-        elementsMap,
         offsetFromHeading(
           startHeading,
           arrow.startArrowhead
@@ -1310,7 +1327,6 @@ const getElbowArrowData = (
   const endElementBounds = hoveredEndElement
     ? aabbForElement(
         hoveredEndElement,
-        elementsMap,
         offsetFromHeading(
           endHeading,
           arrow.endArrowhead
@@ -1326,7 +1342,6 @@ const getElbowArrowData = (
       hoveredEndElement
         ? aabbForElement(
             hoveredEndElement,
-            elementsMap,
             offsetFromHeading(endHeading, BASE_PADDING, BASE_PADDING),
           )
         : endPointBounds,
@@ -1336,7 +1351,6 @@ const getElbowArrowData = (
       hoveredStartElement
         ? aabbForElement(
             hoveredStartElement,
-            elementsMap,
             offsetFromHeading(startHeading, BASE_PADDING, BASE_PADDING),
           )
         : startPointBounds,
@@ -1383,8 +1397,8 @@ const getElbowArrowData = (
           BASE_PADDING,
         ),
     boundsOverlap,
-    hoveredStartElement && aabbForElement(hoveredStartElement, elementsMap),
+    hoveredStartElement && aabbForElement(hoveredStartElement),
-    hoveredEndElement && aabbForElement(hoveredEndElement, elementsMap),
+    hoveredEndElement && aabbForElement(hoveredEndElement),
   );
   const startDonglePosition = getDonglePosition(
     dynamicAABBs[0],
@@ -2093,7 +2107,16 @@ const normalizeArrowElementUpdate = (
   nextFixedSegments: readonly FixedSegment[] | null,
   startIsSpecial?: ExcalidrawElbowArrowElement["startIsSpecial"],
   endIsSpecial?: ExcalidrawElbowArrowElement["startIsSpecial"],
-): ElementUpdate<ExcalidrawElbowArrowElement> => {
+): {
+  points: LocalPoint[];
+  x: number;
+  y: number;
+  width: number;
+  height: number;
+  fixedSegments: readonly FixedSegment[] | null;
+  startIsSpecial?: ExcalidrawElbowArrowElement["startIsSpecial"];
+  endIsSpecial?: ExcalidrawElbowArrowElement["startIsSpecial"];
+} => {
   const offsetX = global[0][0];
   const offsetY = global[0][1];
   let points = global.map((p) =>
@@ -2206,28 +2229,35 @@ const getGlobalPoint = (
   fixedPointRatio: [number, number] | undefined | null,
   initialPoint: GlobalPoint,
   element?: ExcalidrawBindableElement | null,
-  elementsMap?: ElementsMap,
   isDragging?: boolean,
 ): GlobalPoint => {
   if (isDragging) {
-    if (element && elementsMap) {
+    if (element) {
-      return bindPointToSnapToElementOutline(
+      const snapPoint = bindPointToSnapToElementOutline(
         arrow,
         element,
         startOrEnd,
-        elementsMap,
       );
+
+      return snapToMid(element, snapPoint);
     }
 
     return initialPoint;
   }
 
   if (element) {
-    return getGlobalFixedPointForBindableElement(
+    const fixedGlobalPoint = getGlobalFixedPointForBindableElement(
       fixedPointRatio || [0, 0],
       element,
-      elementsMap ?? arrayToMap([element]),
     );
+
+    // NOTE: Resize scales the binding position point too, so we need to update it
+    return Math.abs(
+      distanceToBindableElement(element, fixedGlobalPoint) -
+        FIXED_BINDING_DISTANCE,
+    ) > 0.01
+      ? bindPointToSnapToElementOutline(arrow, element, startOrEnd)
+      : fixedGlobalPoint;
   }
 
   return initialPoint;
@@ -2238,7 +2268,6 @@ const getBindPointHeading = (
   otherPoint: GlobalPoint,
   hoveredElement: ExcalidrawBindableElement | null | undefined,
   origPoint: GlobalPoint,
-  elementsMap: ElementsMap,
 ): Heading =>
   getHeadingForElbowArrowSnap(
     p,
@@ -2247,8 +2276,7 @@ const getBindPointHeading = (
     hoveredElement &&
       aabbForElement(
         hoveredElement,
-        elementsMap,
+        Array(4).fill(distanceToBindableElement(hoveredElement, p)) as [
-        Array(4).fill(distanceToElement(hoveredElement, elementsMap, p)) as [
           number,
           number,
           number,
@@ -2256,7 +2284,6 @@ const getBindPointHeading = (
         ],
       ),
     origPoint,
-    elementsMap,
   );
 
 const getHoveredElement = (

packages/element/src/embeddable.ts

@@ -23,7 +23,7 @@ type IframeDataWithSandbox = MarkRequired<IframeData, "sandbox">;
 const embeddedLinkCache = new Map<string, IframeDataWithSandbox>();
 
 const RE_YOUTUBE =
-  /^(?:http(?:s)?:\/\/)?(?:www\.)?youtu(?:be\.com|\.be)\/(embed\/|watch\?v=|shorts\/|playlist\?list=|embed\/videoseries\?list=)?([a-zA-Z0-9_-]+)/;
+  /^(?: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]+)(?:\?.*)?$/;
@@ -56,35 +56,6 @@ const RE_REDDIT =
 const RE_REDDIT_EMBED =
   /^<blockquote[\s\S]*?\shref=["'](https?:\/\/(?:www\.)?reddit\.com\/[^"']*)/i;
 
-const parseYouTubeTimestamp = (url: string): number => {
-  let timeParam: string | null | undefined;
-
-  try {
-    const urlObj = new URL(url.startsWith("http") ? url : `https://${url}`);
-    timeParam =
-      urlObj.searchParams.get("t") || urlObj.searchParams.get("start");
-  } catch (error) {
-    const timeMatch = url.match(/[?&#](?:t|start)=([^&#\s]+)/);
-    timeParam = timeMatch?.[1];
-  }
-
-  if (!timeParam) {
-    return 0;
-  }
-
-  if (/^\d+$/.test(timeParam)) {
-    return parseInt(timeParam, 10);
-  }
-
-  const timeMatch = timeParam.match(/^(?:(\d+)h)?(?:(\d+)m)?(?:(\d+)s)?$/);
-  if (!timeMatch) {
-    return 0;
-  }
-
-  const [, hours = "0", minutes = "0", seconds = "0"] = timeMatch;
-  return parseInt(hours) * 3600 + parseInt(minutes) * 60 + parseInt(seconds);
-};
-
 const ALLOWED_DOMAINS = new Set([
   "youtube.com",
   "youtu.be",
@@ -142,8 +113,7 @@ export const getEmbedLink = (
   let aspectRatio = { w: 560, h: 840 };
   const ytLink = link.match(RE_YOUTUBE);
   if (ytLink?.[2]) {
-    const startTime = parseYouTubeTimestamp(originalLink);
+    const time = ytLink[3] ? `&start=${ytLink[3]}` : ``;
-    const time = startTime > 0 ? `&start=${startTime}` : ``;
     const isPortrait = link.includes("shorts");
     type = "video";
     switch (ytLink[1]) {

packages/element/src/flowchart.ts

@@ -21,7 +21,7 @@ import {
 import { LinearElementEditor } from "./linearElementEditor";
 import { mutateElement } from "./mutateElement";
 import { newArrowElement, newElement } from "./newElement";
-import { aabbForElement } from "./bounds";
+import { aabbForElement } from "./shapes";
 import { elementsAreInFrameBounds, elementOverlapsWithFrame } from "./frame";
 import {
   isBindableElement,
@@ -95,11 +95,10 @@ const getNodeRelatives = (
           type === "predecessors" ? el.points[el.points.length - 1] : [0, 0]
         ) as Readonly<LocalPoint>;
 
-        const heading = headingForPointFromElement(
+        const heading = headingForPointFromElement(node, aabbForElement(node), [
-          node,
+          edgePoint[0] + el.x,
-          aabbForElement(node, elementsMap),
+          edgePoint[1] + el.y,
-          [edgePoint[0] + el.x, edgePoint[1] + el.y] as Readonly<GlobalPoint>,
+        ] as Readonly<GlobalPoint>);
-        );
 
         acc.push({
           relative,

packages/element/src/fractionalIndex.ts

@@ -2,7 +2,7 @@ import { generateNKeysBetween } from "fractional-indexing";
 
 import { arrayToMap } from "@excalidraw/common";
 
-import { mutateElement, newElementWith } from "./mutateElement";
+import { mutateElement } from "./mutateElement";
 import { getBoundTextElement } from "./textElement";
 import { hasBoundTextElement } from "./typeChecks";
 
@@ -11,7 +11,6 @@ import type {
   ExcalidrawElement,
   FractionalIndex,
   OrderedExcalidrawElement,
-  SceneElementsMap,
 } from "./types";
 
 export class InvalidFractionalIndexError extends Error {
@@ -162,15 +161,9 @@ export const syncMovedIndices = (
 
     // try generatating indices, throws on invalid movedElements
     const elementsUpdates = generateIndices(elements, indicesGroups);
-    const elementsCandidates = elements.map((x) => {
+    const elementsCandidates = elements.map((x) =>
-      const elementUpdates = elementsUpdates.get(x);
+      elementsUpdates.has(x) ? { ...x, ...elementsUpdates.get(x) } : x,
-
+    );
-      if (elementUpdates) {
-        return { ...x, index: elementUpdates.index };
-      }
-
-      return x;
-    });
 
     // ensure next indices are valid before mutation, throws on invalid ones
     validateFractionalIndices(
@@ -184,8 +177,8 @@ export const syncMovedIndices = (
     );
 
     // split mutation so we don't end up in an incosistent state
-    for (const [element, { index }] of elementsUpdates) {
+    for (const [element, update] of elementsUpdates) {
-      mutateElement(element, elementsMap, { index });
+      mutateElement(element, elementsMap, update);
     }
   } catch (e) {
     // fallback to default sync
@@ -196,7 +189,7 @@ export const syncMovedIndices = (
 };
 
 /**
- * Synchronizes all invalid fractional indices within the array order by mutating elements in the passed array.
+ * Synchronizes all invalid fractional indices with the array order by mutating passed elements.
  *
  * WARN: in edge cases it could modify the elements which were not moved, as it's impossible to guess the actually moved elements from the elements array itself.
  */
@@ -207,32 +200,13 @@ export const syncInvalidIndices = (
   const indicesGroups = getInvalidIndicesGroups(elements);
   const elementsUpdates = generateIndices(elements, indicesGroups);
 
-  for (const [element, { index }] of elementsUpdates) {
+  for (const [element, update] of elementsUpdates) {
-    mutateElement(element, elementsMap, { index });
+    mutateElement(element, elementsMap, update);
   }
 
   return elements as OrderedExcalidrawElement[];
 };
 
-/**
- * Synchronizes all invalid fractional indices within the array order by creating new instances of elements with corrected indices.
- *
- * WARN: in edge cases it could modify the elements which were not moved, as it's impossible to guess the actually moved elements from the elements array itself.
- */
-export const syncInvalidIndicesImmutable = (
-  elements: readonly ExcalidrawElement[],
-): SceneElementsMap | undefined => {
-  const syncedElements = arrayToMap(elements);
-  const indicesGroups = getInvalidIndicesGroups(elements);
-  const elementsUpdates = generateIndices(elements, indicesGroups);
-
-  for (const [element, { index }] of elementsUpdates) {
-    syncedElements.set(element.id, newElementWith(element, { index }));
-  }
-
-  return syncedElements as SceneElementsMap;
-};
-
 /**
  * Get contiguous groups of indices of passed moved elements.
  *

packages/element/src/groups.ts

@@ -7,8 +7,6 @@ import type { Mutable } from "@excalidraw/common/utility-types";
 
 import { getBoundTextElement } from "./textElement";
 
-import { isBoundToContainer } from "./typeChecks";
-
 import { makeNextSelectedElementIds, getSelectedElements } from "./selection";
 
 import type {
@@ -404,78 +402,3 @@ export const getNewGroupIdsForDuplication = (
 
   return copy;
 };
-
-// given a list of selected elements, return the element grouped by their immediate group selected state
-// in the case if only one group is selected and all elements selected are within the group, it will respect group hierarchy in accordance to their nested grouping order
-export const getSelectedElementsByGroup = (
-  selectedElements: ExcalidrawElement[],
-  elementsMap: ElementsMap,
-  appState: Readonly<AppState>,
-): ExcalidrawElement[][] => {
-  const selectedGroupIds = getSelectedGroupIds(appState);
-  const unboundElements = selectedElements.filter(
-    (element) => !isBoundToContainer(element),
-  );
-  const groups: Map<string, ExcalidrawElement[]> = new Map();
-  const elements: Map<string, ExcalidrawElement[]> = new Map();
-
-  // helper function to add an element to the elements map
-  const addToElementsMap = (element: ExcalidrawElement) => {
-    // elements
-    const currentElementMembers = elements.get(element.id) || [];
-    const boundTextElement = getBoundTextElement(element, elementsMap);
-
-    if (boundTextElement) {
-      currentElementMembers.push(boundTextElement);
-    }
-    elements.set(element.id, [...currentElementMembers, element]);
-  };
-
-  // helper function to add an element to the groups map
-  const addToGroupsMap = (element: ExcalidrawElement, groupId: string) => {
-    // groups
-    const currentGroupMembers = groups.get(groupId) || [];
-    const boundTextElement = getBoundTextElement(element, elementsMap);
-
-    if (boundTextElement) {
-      currentGroupMembers.push(boundTextElement);
-    }
-    groups.set(groupId, [...currentGroupMembers, element]);
-  };
-
-  // helper function to handle the case where a single group is selected
-  // and all elements selected are within the group, it will respect group hierarchy in accordance to
-  // their nested grouping order
-  const handleSingleSelectedGroupCase = (
-    element: ExcalidrawElement,
-    selectedGroupId: GroupId,
-  ) => {
-    const indexOfSelectedGroupId = element.groupIds.indexOf(selectedGroupId, 0);
-    const nestedGroupCount = element.groupIds.slice(
-      0,
-      indexOfSelectedGroupId,
-    ).length;
-    return nestedGroupCount > 0
-      ? addToGroupsMap(element, element.groupIds[indexOfSelectedGroupId - 1])
-      : addToElementsMap(element);
-  };
-
-  const isAllInSameGroup = selectedElements.every((element) =>
-    isSelectedViaGroup(appState, element),
-  );
-
-  unboundElements.forEach((element) => {
-    const selectedGroupId = getSelectedGroupIdForElement(
-      element,
-      appState.selectedGroupIds,
-    );
-    if (!selectedGroupId) {
-      addToElementsMap(element);
-    } else if (selectedGroupIds.length === 1 && isAllInSameGroup) {
-      handleSingleSelectedGroupCase(element, selectedGroupId);
-    } else {
-      addToGroupsMap(element, selectedGroupId);
-    }
-  });
-  return Array.from(groups.values()).concat(Array.from(elements.values()));
-};

packages/element/src/index.ts

@@ -29,9 +29,6 @@ export const hashElementsVersion = (elements: ElementsMapOrArray): number => {
 
 // string hash function (using djb2). Not cryptographically secure, use only
 // for versioning and such.
-// note: hashes individual code units (not code points),
-// but for hashing purposes this is fine as it iterates through every code unit
-// (as such, no need to encode to byte string first)
 export const hashString = (s: string): number => {
   let hash: number = 5381;
   for (let i = 0; i < s.length; i++) {
@@ -100,13 +97,14 @@ export * from "./image";
 export * from "./linearElementEditor";
 export * from "./mutateElement";
 export * from "./newElement";
-export * from "./positionElementsOnGrid";
 export * from "./renderElement";
 export * from "./resizeElements";
 export * from "./resizeTest";
 export * from "./Scene";
 export * from "./selection";
-export * from "./shape";
+export * from "./Shape";
+export * from "./ShapeCache";
+export * from "./shapes";
 export * from "./showSelectedShapeActions";
 export * from "./sizeHelpers";
 export * from "./sortElements";

packages/element/src/linearElementEditor.ts

@@ -7,8 +7,6 @@ import {
   type LocalPoint,
   pointDistance,
   vectorFromPoint,
-  curveLength,
-  curvePointAtLength,
 } from "@excalidraw/math";
 
 import { getCurvePathOps } from "@excalidraw/utils/shape";
@@ -20,14 +18,9 @@ import {
   getGridPoint,
   invariant,
   tupleToCoors,
-  viewportCoordsToSceneCoords,
 } from "@excalidraw/common";
 
-import {
+import type { Store } from "@excalidraw/element";
-  deconstructLinearOrFreeDrawElement,
-  isPathALoop,
-  type Store,
-} from "@excalidraw/element";
 
 import type { Radians } from "@excalidraw/math";
 
@@ -46,7 +39,6 @@ import {
   bindOrUnbindLinearElement,
   getHoveredElementForBinding,
   isBindingEnabled,
-  maybeSuggestBindingsForLinearElementAtCoords,
 } from "./binding";
 import {
   getElementAbsoluteCoords,
@@ -63,12 +55,18 @@ import {
   isFixedPointBinding,
 } from "./typeChecks";
 
-import { ShapeCache, toggleLinePolygonState } from "./shape";
+import { ShapeCache } from "./ShapeCache";
+
+import {
+  isPathALoop,
+  getBezierCurveLength,
+  getControlPointsForBezierCurve,
+  mapIntervalToBezierT,
+  getBezierXY,
+} from "./shapes";
 
 import { getLockedLinearCursorAlignSize } from "./sizeHelpers";
 
-import { isLineElement } from "./typeChecks";
-
 import type { Scene } from "./Scene";
 
 import type { Bounds } from "./bounds";
@@ -87,35 +85,6 @@ import type {
   PointsPositionUpdates,
 } from "./types";
 
-/**
- * Normalizes line points so that the start point is at [0,0]. This is
- * expected in various parts of the codebase.
- *
- * Also returns the offsets - [0,0] if no normalization needed.
- *
- * @private
- */
-const getNormalizedPoints = ({
-  points,
-}: {
-  points: ExcalidrawLinearElement["points"];
-}): {
-  points: LocalPoint[];
-  offsetX: number;
-  offsetY: number;
-} => {
-  const offsetX = points[0][0];
-  const offsetY = points[0][1];
-
-  return {
-    points: points.map((p) => {
-      return pointFrom(p[0] - offsetX, p[1] - offsetY);
-    }),
-    offsetX,
-    offsetY,
-  };
-};
-
 export class LinearElementEditor {
   public readonly elementId: ExcalidrawElement["id"] & {
     _brand: "excalidrawLinearElementId";
@@ -148,24 +117,17 @@ export class LinearElementEditor {
   public readonly hoverPointIndex: number;
   public readonly segmentMidPointHoveredCoords: GlobalPoint | null;
   public readonly elbowed: boolean;
-  public readonly customLineAngle: number | null;
-  public readonly isEditing: boolean;
 
   constructor(
     element: NonDeleted<ExcalidrawLinearElement>,
     elementsMap: ElementsMap,
-    isEditing: boolean = false,
   ) {
     this.elementId = element.id as string & {
       _brand: "excalidrawLinearElementId";
     };
     if (!pointsEqual(element.points[0], pointFrom(0, 0))) {
       console.error("Linear element is not normalized", Error().stack);
-      mutateElement(
+      LinearElementEditor.normalizePoints(element, elementsMap);
-        element,
-        elementsMap,
-        LinearElementEditor.getNormalizeElementPointsAndCoords(element),
-      );
     }
     this.selectedPointsIndices = null;
     this.lastUncommittedPoint = null;
@@ -188,8 +150,6 @@ export class LinearElementEditor {
     this.hoverPointIndex = -1;
     this.segmentMidPointHoveredCoords = null;
     this.elbowed = isElbowArrow(element) && element.elbowed;
-    this.customLineAngle = null;
-    this.isEditing = isEditing;
   }
 
   // ---------------------------------------------------------------------------
@@ -197,7 +157,6 @@ export class LinearElementEditor {
   // ---------------------------------------------------------------------------
 
   static POINT_HANDLE_SIZE = 10;
-
   /**
    * @param id the `elementId` from the instance of this class (so that we can
    *  statically guarantee this method returns an ExcalidrawLinearElement)
@@ -219,14 +178,11 @@ export class LinearElementEditor {
     setState: React.Component<any, AppState>["setState"],
     elementsMap: NonDeletedSceneElementsMap,
   ) {
-    if (
+    if (!appState.editingLinearElement || !appState.selectionElement) {
-      !appState.selectedLinearElement?.isEditing ||
-      !appState.selectionElement
-    ) {
       return false;
     }
-    const { selectedLinearElement } = appState;
+    const { editingLinearElement } = appState;
-    const { selectedPointsIndices, elementId } = selectedLinearElement;
+    const { selectedPointsIndices, elementId } = editingLinearElement;
 
     const element = LinearElementEditor.getElement(elementId, elementsMap);
     if (!element) {
@@ -267,8 +223,8 @@ export class LinearElementEditor {
       });
 
     setState({
-      selectedLinearElement: {
+      editingLinearElement: {
-        ...selectedLinearElement,
+        ...editingLinearElement,
         selectedPointsIndices: nextSelectedPoints.length
           ? nextSelectedPoints
           : null,
@@ -284,15 +240,19 @@ export class LinearElementEditor {
     app: AppClassProperties,
     scenePointerX: number,
     scenePointerY: number,
+    maybeSuggestBinding: (
+      element: NonDeleted<ExcalidrawLinearElement>,
+      pointSceneCoords: { x: number; y: number }[],
+    ) => void,
     linearElementEditor: LinearElementEditor,
-  ): Pick<AppState, keyof AppState> | null {
+    scene: Scene,
+  ): LinearElementEditor | null {
     if (!linearElementEditor) {
       return null;
     }
     const { elementId } = linearElementEditor;
-    const elementsMap = app.scene.getNonDeletedElementsMap();
+    const elementsMap = scene.getNonDeletedElementsMap();
     const element = LinearElementEditor.getElement(elementId, elementsMap);
-    let customLineAngle = linearElementEditor.customLineAngle;
     if (!element) {
       return null;
     }
@@ -333,12 +293,6 @@ export class LinearElementEditor {
         const selectedIndex = selectedPointsIndices[0];
         const referencePoint =
           element.points[selectedIndex === 0 ? 1 : selectedIndex - 1];
-        customLineAngle =
-          linearElementEditor.customLineAngle ??
-          Math.atan2(
-            element.points[selectedIndex][1] - referencePoint[1],
-            element.points[selectedIndex][0] - referencePoint[0],
-          );
 
         const [width, height] = LinearElementEditor._getShiftLockedDelta(
           element,
@@ -346,12 +300,11 @@ export class LinearElementEditor {
           referencePoint,
           pointFrom(scenePointerX, scenePointerY),
           event[KEYS.CTRL_OR_CMD] ? null : app.getEffectiveGridSize(),
-          customLineAngle,
         );
 
         LinearElementEditor.movePoints(
           element,
-          app.scene,
+          scene,
           new Map([
             [
               selectedIndex,
@@ -379,7 +332,7 @@ export class LinearElementEditor {
 
         LinearElementEditor.movePoints(
           element,
-          app.scene,
+          scene,
           new Map(
             selectedPointsIndices.map((pointIndex) => {
               const newPointPosition: LocalPoint =
@@ -411,59 +364,46 @@ export class LinearElementEditor {
 
       const boundTextElement = getBoundTextElement(element, elementsMap);
       if (boundTextElement) {
-        handleBindTextResize(element, app.scene, false);
+        handleBindTextResize(element, scene, false);
       }
 
       // suggest bindings for first and last point if selected
-      let suggestedBindings: ExcalidrawBindableElement[] = [];
       if (isBindingElement(element, false)) {
-        const firstSelectedIndex = selectedPointsIndices[0] === 0;
-        const lastSelectedIndex =
-          selectedPointsIndices[selectedPointsIndices.length - 1] ===
-          element.points.length - 1;
         const coords: { x: number; y: number }[] = [];
 
-        if (!firstSelectedIndex !== !lastSelectedIndex) {
+        const firstSelectedIndex = selectedPointsIndices[0];
-          coords.push({ x: scenePointerX, y: scenePointerY });
+        if (firstSelectedIndex === 0) {
-        } else {
+          coords.push(
-          if (firstSelectedIndex) {
+            tupleToCoors(
-            coords.push(
+              LinearElementEditor.getPointGlobalCoordinates(
-              tupleToCoors(
+                element,
-                LinearElementEditor.getPointGlobalCoordinates(
+                element.points[0],
-                  element,
+                elementsMap,
-                  element.points[0],
-                  elementsMap,
-                ),
               ),
-            );
+            ),
-          }
+          );
+        }
 
-          if (lastSelectedIndex) {
+        const lastSelectedIndex =
-            coords.push(
+          selectedPointsIndices[selectedPointsIndices.length - 1];
-              tupleToCoors(
+        if (lastSelectedIndex === element.points.length - 1) {
-                LinearElementEditor.getPointGlobalCoordinates(
+          coords.push(
-                  element,
+            tupleToCoors(
-                  element.points[
+              LinearElementEditor.getPointGlobalCoordinates(
-                    selectedPointsIndices[selectedPointsIndices.length - 1]
+                element,
-                  ],
+                element.points[lastSelectedIndex],
-                  elementsMap,
+                elementsMap,
-                ),
               ),
-            );
+            ),
-          }
+          );
         }
 
         if (coords.length) {
-          suggestedBindings = maybeSuggestBindingsForLinearElementAtCoords(
+          maybeSuggestBinding(element, coords);
-            element,
-            coords,
-            app.scene,
-            app.state.zoom,
-          );
         }
       }
 
-      const newLinearElementEditor = {
+      return {
         ...linearElementEditor,
         selectedPointsIndices,
         segmentMidPointHoveredCoords:
@@ -481,13 +421,6 @@ export class LinearElementEditor {
             ? lastClickedPoint
             : -1,
         isDragging: true,
-        customLineAngle,
-      };
-
-      return {
-        ...app.state,
-        selectedLinearElement: newLinearElementEditor,
-        suggestedBindings,
       };
     }
 
@@ -502,7 +435,6 @@ export class LinearElementEditor {
   ): LinearElementEditor {
     const elementsMap = scene.getNonDeletedElementsMap();
     const elements = scene.getNonDeletedElements();
-    const pointerCoords = viewportCoordsToSceneCoords(event, appState);
 
     const { elementId, selectedPointsIndices, isDragging, pointerDownState } =
       editingLinearElement;
@@ -527,18 +459,6 @@ export class LinearElementEditor {
           selectedPoint === element.points.length - 1
         ) {
           if (isPathALoop(element.points, appState.zoom.value)) {
-            if (isLineElement(element)) {
-              scene.mutateElement(
-                element,
-                {
-                  ...toggleLinePolygonState(element, true),
-                },
-                {
-                  informMutation: false,
-                  isDragging: false,
-                },
-              );
-            }
             LinearElementEditor.movePoints(
               element,
               scene,
@@ -558,15 +478,13 @@ export class LinearElementEditor {
 
           const bindingElement = isBindingEnabled(appState)
             ? getHoveredElementForBinding(
-                (selectedPointsIndices?.length ?? 0) > 1
+                tupleToCoors(
-                  ? tupleToCoors(
+                  LinearElementEditor.getPointAtIndexGlobalCoordinates(
-                      LinearElementEditor.getPointAtIndexGlobalCoordinates(
+                    element,
-                        element,
+                    selectedPoint!,
-                        selectedPoint!,
+                    elementsMap,
-                        elementsMap,
+                  ),
-                      ),
+                ),
-                    )
-                  : pointerCoords,
                 elements,
                 elementsMap,
                 appState.zoom,
@@ -585,8 +503,6 @@ export class LinearElementEditor {
     return {
       ...editingLinearElement,
       ...bindings,
-      segmentMidPointHoveredCoords: null,
-      hoverPointIndex: -1,
       // if clicking without previously dragging a point(s), and not holding
       // shift, deselect all points except the one clicked. If holding shift,
       // toggle the point.
@@ -608,7 +524,6 @@ export class LinearElementEditor {
           : selectedPointsIndices,
       isDragging: false,
       pointerOffset: { x: 0, y: 0 },
-      customLineAngle: null,
     };
   }
 
@@ -622,7 +537,7 @@ export class LinearElementEditor {
     // Since its not needed outside editor unless 2 pointer lines or bound text
     if (
       !isElbowArrow(element) &&
-      !appState.selectedLinearElement?.isEditing &&
+      !appState.editingLinearElement &&
       element.points.length > 2 &&
       !boundText
     ) {
@@ -652,7 +567,10 @@ export class LinearElementEditor {
       }
       const segmentMidPoint = LinearElementEditor.getSegmentMidPoint(
         element,
+        points[index],
+        points[index + 1],
         index + 1,
+        elementsMap,
       );
       midpoints.push(segmentMidPoint);
       index++;
@@ -688,7 +606,7 @@ export class LinearElementEditor {
     );
     if (
       points.length >= 3 &&
-      !appState.selectedLinearElement?.isEditing &&
+      !appState.editingLinearElement &&
       !isElbowArrow(element)
     ) {
       return null;
@@ -754,18 +672,7 @@ export class LinearElementEditor {
 
     let distance = pointDistance(startPoint, endPoint);
     if (element.points.length > 2 && element.roundness) {
-      const [lines, curves] = deconstructLinearOrFreeDrawElement(element);
+      distance = getBezierCurveLength(element, endPoint);
-
-      invariant(
-        lines.length === 0 && curves.length > 0,
-        "Only linears built out of curves are supported",
-      );
-      invariant(
-        lines.length + curves.length >= index,
-        "Invalid segment index while calculating mid point",
-      );
-
-      distance = curveLength<GlobalPoint>(curves[index]);
     }
 
     return distance * zoom.value < LinearElementEditor.POINT_HANDLE_SIZE * 4;
@@ -773,42 +680,39 @@ export class LinearElementEditor {
 
   static getSegmentMidPoint(
     element: NonDeleted<ExcalidrawLinearElement>,
-    index: number,
+    startPoint: GlobalPoint,
+    endPoint: GlobalPoint,
+    endPointIndex: number,
+    elementsMap: ElementsMap,
   ): GlobalPoint {
-    if (isElbowArrow(element)) {
+    let segmentMidPoint = pointCenter(startPoint, endPoint);
-      invariant(
+    if (element.points.length > 2 && element.roundness) {
-        element.points.length >= index,
+      const controlPoints = getControlPointsForBezierCurve(
-        "Invalid segment index while calculating elbow arrow mid point",
+        element,
+        element.points[endPointIndex],
       );
+      if (controlPoints) {
+        const t = mapIntervalToBezierT(
+          element,
+          element.points[endPointIndex],
+          0.5,
+        );
 
-      const p = pointCenter(element.points[index - 1], element.points[index]);
+        segmentMidPoint = LinearElementEditor.getPointGlobalCoordinates(
-
+          element,
-      return pointFrom<GlobalPoint>(element.x + p[0], element.y + p[1]);
+          getBezierXY(
+            controlPoints[0],
+            controlPoints[1],
+            controlPoints[2],
+            controlPoints[3],
+            t,
+          ),
+          elementsMap,
+        );
+      }
     }
 
-    const [lines, curves] = deconstructLinearOrFreeDrawElement(element);
+    return segmentMidPoint;
-
-    invariant(
-      (lines.length === 0 && curves.length > 0) ||
-        (lines.length > 0 && curves.length === 0),
-      "Only linears built out of either segments or curves are supported",
-    );
-    invariant(
-      lines.length + curves.length >= index,
-      "Invalid segment index while calculating mid point",
-    );
-
-    if (lines.length) {
-      const segment = lines[index - 1];
-      return pointCenter(segment[0], segment[1]);
-    }
-
-    if (curves.length) {
-      const segment = curves[index - 1];
-      return curvePointAtLength(segment, 0.5);
-    }
-
-    invariant(false, "Invalid segment type while calculating mid point");
   }
 
   static getSegmentMidPointIndex(
@@ -885,7 +789,7 @@ export class LinearElementEditor {
         segmentMidpoint,
         elementsMap,
       );
-    } else if (event.altKey && appState.selectedLinearElement?.isEditing) {
+    } else if (event.altKey && appState.editingLinearElement) {
       if (linearElementEditor.lastUncommittedPoint == null) {
         scene.mutateElement(element, {
           points: [
@@ -1027,14 +931,14 @@ export class LinearElementEditor {
     app: AppClassProperties,
   ): LinearElementEditor | null {
     const appState = app.state;
-    if (!appState.selectedLinearElement?.isEditing) {
+    if (!appState.editingLinearElement) {
       return null;
     }
-    const { elementId, lastUncommittedPoint } = appState.selectedLinearElement;
+    const { elementId, lastUncommittedPoint } = appState.editingLinearElement;
     const elementsMap = app.scene.getNonDeletedElementsMap();
     const element = LinearElementEditor.getElement(elementId, elementsMap);
     if (!element) {
-      return appState.selectedLinearElement;
+      return appState.editingLinearElement;
     }
 
     const { points } = element;
@@ -1042,14 +946,14 @@ export class LinearElementEditor {
 
     if (!event.altKey) {
       if (lastPoint === lastUncommittedPoint) {
-        LinearElementEditor.deletePoints(element, app, [points.length - 1]);
+        LinearElementEditor.deletePoints(element, app.scene, [
+          points.length - 1,
+        ]);
       }
-      return appState.selectedLinearElement?.lastUncommittedPoint
+      return {
-        ? {
+        ...appState.editingLinearElement,
-            ...appState.selectedLinearElement,
+        lastUncommittedPoint: null,
-            lastUncommittedPoint: null,
+      };
-          }
-        : appState.selectedLinearElement;
     }
 
     let newPoint: LocalPoint;
@@ -1073,8 +977,8 @@ export class LinearElementEditor {
       newPoint = LinearElementEditor.createPointAt(
         element,
         elementsMap,
-        scenePointerX - appState.selectedLinearElement.pointerOffset.x,
+        scenePointerX - appState.editingLinearElement.pointerOffset.x,
-        scenePointerY - appState.selectedLinearElement.pointerOffset.y,
+        scenePointerY - appState.editingLinearElement.pointerOffset.y,
         event[KEYS.CTRL_OR_CMD] || isElbowArrow(element)
           ? null
           : app.getEffectiveGridSize(),
@@ -1095,10 +999,10 @@ export class LinearElementEditor {
         ]),
       );
     } else {
-      LinearElementEditor.addPoints(element, app.scene, [newPoint]);
+      LinearElementEditor.addPoints(element, app.scene, [{ point: newPoint }]);
     }
     return {
-      ...appState.selectedLinearElement,
+      ...appState.editingLinearElement,
       lastUncommittedPoint: element.points[element.points.length - 1],
     };
   }
@@ -1238,31 +1142,48 @@ export class LinearElementEditor {
 
   /**
    * Normalizes line points so that the start point is at [0,0]. This is
-   * expected in various parts of the codebase.
+   * expected in various parts of the codebase. Also returns new x/y to account
-   *
+   * for the potential normalization.
-   * Also returns normalized x and y coords to account for the normalization
-   * of the points.
    */
-  static getNormalizeElementPointsAndCoords(element: ExcalidrawLinearElement) {
+  static getNormalizedPoints(element: ExcalidrawLinearElement): {
-    const { points, offsetX, offsetY } = getNormalizedPoints(element);
+    points: LocalPoint[];
+    x: number;
+    y: number;
+  } {
+    const { points } = element;
+
+    const offsetX = points[0][0];
+    const offsetY = points[0][1];
 
     return {
-      points,
+      points: points.map((p) => {
+        return pointFrom(p[0] - offsetX, p[1] - offsetY);
+      }),
       x: element.x + offsetX,
       y: element.y + offsetY,
     };
   }
-
   // element-mutating methods
   // ---------------------------------------------------------------------------
+  static normalizePoints(
+    element: NonDeleted<ExcalidrawLinearElement>,
+    elementsMap: ElementsMap,
+  ) {
+    mutateElement(
+      element,
+      elementsMap,
+      LinearElementEditor.getNormalizedPoints(element),
+    );
+  }
+
   static duplicateSelectedPoints(appState: AppState, scene: Scene): AppState {
     invariant(
-      appState.selectedLinearElement?.isEditing,
+      appState.editingLinearElement,
       "Not currently editing a linear element",
     );
 
     const elementsMap = scene.getNonDeletedElementsMap();
-    const { selectedPointsIndices, elementId } = appState.selectedLinearElement;
+    const { selectedPointsIndices, elementId } = appState.editingLinearElement;
     const element = LinearElementEditor.getElement(elementId, elementsMap);
 
     invariant(
@@ -1324,8 +1245,8 @@ export class LinearElementEditor {
 
     return {
       ...appState,
-      selectedLinearElement: {
+      editingLinearElement: {
-        ...appState.selectedLinearElement,
+        ...appState.editingLinearElement,
         selectedPointsIndices: nextSelectedIndices,
       },
     };
@@ -1333,43 +1254,41 @@ export class LinearElementEditor {
 
   static deletePoints(
     element: NonDeleted<ExcalidrawLinearElement>,
-    app: AppClassProperties,
+    scene: Scene,
     pointIndices: readonly number[],
   ) {
-    const isUncommittedPoint =
+    let offsetX = 0;
-      app.state.selectedLinearElement?.isEditing &&
+    let offsetY = 0;
-      app.state.selectedLinearElement?.lastUncommittedPoint ===
-        element.points[element.points.length - 1];
 
-    const nextPoints = element.points.filter((_, idx) => {
+    const isDeletingOriginPoint = pointIndices.includes(0);
-      return !pointIndices.includes(idx);
-    });
 
-    const isPolygon = isLineElement(element) && element.polygon;
+    // if deleting first point, make the next to be [0,0] and recalculate
-
+    // positions of the rest with respect to it
-    // keep polygon intact if deleting start/end point or uncommitted point
+    if (isDeletingOriginPoint) {
-    if (
+      const firstNonDeletedPoint = element.points.find((point, idx) => {
-      isPolygon &&
+        return !pointIndices.includes(idx);
-      (isUncommittedPoint ||
+      });
-        pointIndices.includes(0) ||
+      if (firstNonDeletedPoint) {
-        pointIndices.includes(element.points.length - 1))
+        offsetX = firstNonDeletedPoint[0];
-    ) {
+        offsetY = firstNonDeletedPoint[1];
-      nextPoints[0] = pointFrom(
+      }
-        nextPoints[nextPoints.length - 1][0],
-        nextPoints[nextPoints.length - 1][1],
-      );
     }
 
-    const {
+    const nextPoints = element.points.reduce((acc: LocalPoint[], p, idx) => {
-      points: normalizedPoints,
+      if (!pointIndices.includes(idx)) {
-      offsetX,
+        acc.push(
-      offsetY,
+          !acc.length
-    } = getNormalizedPoints({ points: nextPoints });
+            ? pointFrom(0, 0)
+            : pointFrom(p[0] - offsetX, p[1] - offsetY),
+        );
+      }
+      return acc;
+    }, []);
 
     LinearElementEditor._updatePoints(
       element,
-      app.scene,
+      scene,
-      normalizedPoints,
+      nextPoints,
       offsetX,
       offsetY,
     );
@@ -1378,27 +1297,16 @@ export class LinearElementEditor {
   static addPoints(
     element: NonDeleted<ExcalidrawLinearElement>,
     scene: Scene,
-    addedPoints: LocalPoint[],
+    targetPoints: { point: LocalPoint }[],
   ) {
-    const nextPoints = [...element.points, ...addedPoints];
+    const offsetX = 0;
-
+    const offsetY = 0;
-    if (isLineElement(element) && element.polygon) {
-      nextPoints[0] = pointFrom(
-        nextPoints[nextPoints.length - 1][0],
-        nextPoints[nextPoints.length - 1][1],
-      );
-    }
-
-    const {
-      points: normalizedPoints,
-      offsetX,
-      offsetY,
-    } = getNormalizedPoints({ points: nextPoints });
 
+    const nextPoints = [...element.points, ...targetPoints.map((x) => x.point)];
     LinearElementEditor._updatePoints(
       element,
       scene,
-      normalizedPoints,
+      nextPoints,
       offsetX,
       offsetY,
     );
@@ -1415,37 +1323,17 @@ export class LinearElementEditor {
   ) {
     const { points } = element;
 
-    // if polygon, move start and end points together
-    if (isLineElement(element) && element.polygon) {
-      const firstPointUpdate = pointUpdates.get(0);
-      const lastPointUpdate = pointUpdates.get(points.length - 1);
-
-      if (firstPointUpdate) {
-        pointUpdates.set(points.length - 1, {
-          point: pointFrom(
-            firstPointUpdate.point[0],
-            firstPointUpdate.point[1],
-          ),
-          isDragging: firstPointUpdate.isDragging,
-        });
-      } else if (lastPointUpdate) {
-        pointUpdates.set(0, {
-          point: pointFrom(lastPointUpdate.point[0], lastPointUpdate.point[1]),
-          isDragging: lastPointUpdate.isDragging,
-        });
-      }
-    }
-
     // in case we're moving start point, instead of modifying its position
     // which would break the invariant of it being at [0,0], we move
     // all the other points in the opposite direction by delta to
     // offset it. We do the same with actual element.x/y position, so
     // this hacks are completely transparent to the user.
-
+    const [deltaX, deltaY] =
-    const updatedOriginPoint =
       pointUpdates.get(0)?.point ?? pointFrom<LocalPoint>(0, 0);
-
+    const [offsetX, offsetY] = pointFrom<LocalPoint>(
-    const [offsetX, offsetY] = updatedOriginPoint;
+      deltaX - points[0][0],
+      deltaY - points[0][1],
+    );
 
     const nextPoints = isElbowArrow(element)
       ? [
@@ -1512,7 +1400,7 @@ export class LinearElementEditor {
       pointFrom(pointerCoords.x, pointerCoords.y),
     );
     if (
-      !appState.selectedLinearElement?.isEditing &&
+      !appState.editingLinearElement &&
       dist < DRAGGING_THRESHOLD / appState.zoom.value
     ) {
       return false;
@@ -1615,7 +1503,6 @@ export class LinearElementEditor {
         isDragging: options?.isDragging ?? false,
       });
     } else {
-      // TODO do we need to get precise coords here just to calc centers?
       const nextCoords = getElementPointsCoords(element, nextPoints);
       const prevCoords = getElementPointsCoords(element, element.points);
       const nextCenterX = (nextCoords[0] + nextCoords[2]) / 2;
@@ -1624,7 +1511,7 @@ export class LinearElementEditor {
       const prevCenterY = (prevCoords[1] + prevCoords[3]) / 2;
       const dX = prevCenterX - nextCenterX;
       const dY = prevCenterY - nextCenterY;
-      const rotatedOffset = pointRotateRads(
+      const rotated = pointRotateRads(
         pointFrom(offsetX, offsetY),
         pointFrom(dX, dY),
         element.angle,
@@ -1632,8 +1519,8 @@ export class LinearElementEditor {
       scene.mutateElement(element, {
         ...otherUpdates,
         points: nextPoints,
-        x: element.x + rotatedOffset[0],
+        x: element.x + rotated[0],
-        y: element.y + rotatedOffset[1],
+        y: element.y + rotated[1],
       });
     }
   }
@@ -1644,7 +1531,6 @@ export class LinearElementEditor {
     referencePoint: LocalPoint,
     scenePointer: GlobalPoint,
     gridSize: NullableGridSize,
-    customLineAngle?: number,
   ) {
     const referencePointCoords = LinearElementEditor.getPointGlobalCoordinates(
       element,
@@ -1670,7 +1556,6 @@ export class LinearElementEditor {
       referencePointCoords[1],
       gridX,
       gridY,
-      customLineAngle,
     );
 
     return pointRotateRads(
@@ -1707,7 +1592,10 @@ export class LinearElementEditor {
       const index = element.points.length / 2 - 1;
       const midSegmentMidpoint = LinearElementEditor.getSegmentMidPoint(
         element,
+        points[index],
+        points[index + 1],
         index + 1,
+        elementsMap,
       );
 
       x = midSegmentMidpoint[0] - boundTextElement.width / 2;

packages/element/src/mutateElement.ts

@@ -8,7 +8,7 @@ import type { Radians } from "@excalidraw/math";
 
 import type { Mutable } from "@excalidraw/common/utility-types";
 
-import { ShapeCache } from "./shape";
+import { ShapeCache } from "./ShapeCache";
 
 import { updateElbowArrowPoints } from "./elbowArrow";
 
@@ -23,7 +23,7 @@ import type {
 
 export type ElementUpdate<TElement extends ExcalidrawElement> = Omit<
   Partial<TElement>,
-  "id" | "updated"
+  "id" | "version" | "versionNonce" | "updated"
 >;
 
 /**
@@ -137,8 +137,8 @@ export const mutateElement = <TElement extends Mutable<ExcalidrawElement>>(
     ShapeCache.delete(element);
   }
 
-  element.version = updates.version ?? element.version + 1;
+  element.version++;
-  element.versionNonce = updates.versionNonce ?? randomInteger();
+  element.versionNonce = randomInteger();
   element.updated = getUpdatedTimestamp();
 
   return element;
@@ -172,9 +172,9 @@ export const newElementWith = <TElement extends ExcalidrawElement>(
   return {
     ...element,
     ...updates,
-    version: updates.version ?? element.version + 1,
-    versionNonce: updates.versionNonce ?? randomInteger(),
     updated: getUpdatedTimestamp(),
+    version: element.version + 1,
+    versionNonce: randomInteger(),
   };
 };
 

packages/element/src/newElement.ts

@@ -25,8 +25,6 @@ import { getBoundTextMaxWidth } from "./textElement";
 import { normalizeText, measureText } from "./textMeasurements";
 import { wrapText } from "./textWrapping";
 
-import { isLineElement } from "./typeChecks";
-
 import type {
   ExcalidrawElement,
   ExcalidrawImageElement,
@@ -47,7 +45,6 @@ import type {
   ElementsMap,
   ExcalidrawArrowElement,
   ExcalidrawElbowArrowElement,
-  ExcalidrawLineElement,
 } from "./types";
 
 export type ElementConstructorOpts = MarkOptional<
@@ -460,10 +457,9 @@ export const newLinearElement = (
   opts: {
     type: ExcalidrawLinearElement["type"];
     points?: ExcalidrawLinearElement["points"];
-    polygon?: ExcalidrawLineElement["polygon"];
   } & ElementConstructorOpts,
 ): NonDeleted<ExcalidrawLinearElement> => {
-  const element = {
+  return {
     ..._newElementBase<ExcalidrawLinearElement>(opts.type, opts),
     points: opts.points || [],
     lastCommittedPoint: null,
@@ -472,17 +468,6 @@ export const newLinearElement = (
     startArrowhead: null,
     endArrowhead: null,
   };
-
-  if (isLineElement(element)) {
-    const lineElement: NonDeleted<ExcalidrawLineElement> = {
-      ...element,
-      polygon: opts.polygon ?? false,
-    };
-
-    return lineElement;
-  }
-
-  return element;
 };
 
 export const newArrowElement = <T extends boolean>(

packages/element/src/positionElementsOnGrid.ts

@@ -1,112 +0,0 @@
-import { getCommonBounds } from "./bounds";
-import { type ElementUpdate, newElementWith } from "./mutateElement";
-
-import type { ExcalidrawElement } from "./types";
-
-// TODO rewrite (mostly vibe-coded)
-export const positionElementsOnGrid = <TElement extends ExcalidrawElement>(
-  elements: TElement[] | TElement[][],
-  centerX: number,
-  centerY: number,
-  padding = 50,
-): TElement[] => {
-  // Ensure there are elements to position
-  if (!elements || elements.length === 0) {
-    return [];
-  }
-
-  const res: TElement[] = [];
-  // Normalize input to work with atomic units (groups of elements)
-  // If elements is a flat array, treat each element as its own atomic unit
-  const atomicUnits: TElement[][] = Array.isArray(elements[0])
-    ? (elements as TElement[][])
-    : (elements as TElement[]).map((element) => [element]);
-
-  // Determine the number of columns for atomic units
-  // A common approach for a "grid-like" layout without specific column constraints
-  // is to aim for a roughly square arrangement.
-  const numUnits = atomicUnits.length;
-  const numColumns = Math.max(1, Math.ceil(Math.sqrt(numUnits)));
-
-  // Group atomic units into rows based on the calculated number of columns
-  const rows: TElement[][][] = [];
-  for (let i = 0; i < numUnits; i += numColumns) {
-    rows.push(atomicUnits.slice(i, i + numColumns));
-  }
-
-  // Calculate properties for each row (total width, max height)
-  // and the total actual height of all row content.
-  let totalGridActualHeight = 0; // Sum of max heights of rows, without inter-row padding
-  const rowProperties = rows.map((rowUnits) => {
-    let rowWidth = 0;
-    let maxUnitHeightInRow = 0;
-
-    const unitBounds = rowUnits.map((unit) => {
-      const [minX, minY, maxX, maxY] = getCommonBounds(unit);
-      return {
-        elements: unit,
-        bounds: [minX, minY, maxX, maxY] as const,
-        width: maxX - minX,
-        height: maxY - minY,
-      };
-    });
-
-    unitBounds.forEach((unitBound, index) => {
-      rowWidth += unitBound.width;
-      // Add padding between units in the same row, but not after the last one
-      if (index < unitBounds.length - 1) {
-        rowWidth += padding;
-      }
-      if (unitBound.height > maxUnitHeightInRow) {
-        maxUnitHeightInRow = unitBound.height;
-      }
-    });
-
-    totalGridActualHeight += maxUnitHeightInRow;
-    return {
-      unitBounds,
-      width: rowWidth,
-      maxHeight: maxUnitHeightInRow,
-    };
-  });
-
-  // Calculate the total height of the grid including padding between rows
-  const totalGridHeightWithPadding =
-    totalGridActualHeight + Math.max(0, rows.length - 1) * padding;
-
-  // Calculate the starting Y position to center the entire grid vertically around centerY
-  let currentY = centerY - totalGridHeightWithPadding / 2;
-
-  // Position atomic units row by row
-  rowProperties.forEach((rowProp) => {
-    const { unitBounds, width: rowWidth, maxHeight: rowMaxHeight } = rowProp;
-
-    // Calculate the starting X for the current row to center it horizontally around centerX
-    let currentX = centerX - rowWidth / 2;
-
-    unitBounds.forEach((unitBound) => {
-      // Calculate the offset needed to position this atomic unit
-      const [originalMinX, originalMinY] = unitBound.bounds;
-      const offsetX = currentX - originalMinX;
-      const offsetY = currentY - originalMinY;
-
-      // Apply the offset to all elements in this atomic unit
-      unitBound.elements.forEach((element) => {
-        res.push(
-          newElementWith(element, {
-            x: element.x + offsetX,
-            y: element.y + offsetY,
-          } as ElementUpdate<TElement>),
-        );
-      });
-
-      // Move X for the next unit in the row
-      currentX += unitBound.width + padding;
-    });
-
-    // Move Y to the starting position for the next row
-    // This accounts for the tallest unit in the current row and the inter-row padding
-    currentY += rowMaxHeight + padding;
-  });
-  return res;
-};

packages/element/src/renderElement.ts

@@ -1,14 +1,7 @@
 import rough from "roughjs/bin/rough";
 import { getStroke } from "perfect-freehand";
 
-import {
+import { isRightAngleRads } from "@excalidraw/math";
-  type GlobalPoint,
-  isRightAngleRads,
-  lineSegment,
-  pointFrom,
-  pointRotateRads,
-  type Radians,
-} from "@excalidraw/math";
 
 import {
   BOUND_TEXT_PADDING,
@@ -21,7 +14,6 @@ import {
   getFontString,
   isRTL,
   getVerticalOffset,
-  invariant,
 } from "@excalidraw/common";
 
 import type {
@@ -40,7 +32,7 @@ import type {
   InteractiveCanvasRenderConfig,
 } from "@excalidraw/excalidraw/scene/types";
 
-import { getElementAbsoluteCoords, getElementBounds } from "./bounds";
+import { getElementAbsoluteCoords } from "./bounds";
 import { getUncroppedImageElement } from "./cropElement";
 import { LinearElementEditor } from "./linearElementEditor";
 import {
@@ -62,9 +54,9 @@ import {
   isImageElement,
 } from "./typeChecks";
 import { getContainingFrame } from "./frame";
-import { getCornerRadius } from "./utils";
+import { getCornerRadius } from "./shapes";
 
-import { ShapeCache } from "./shape";
+import { ShapeCache } from "./ShapeCache";
 
 import type {
   ExcalidrawElement,
@@ -114,11 +106,6 @@ const getCanvasPadding = (element: ExcalidrawElement) => {
       return element.strokeWidth * 12;
     case "text":
       return element.fontSize / 2;
-    case "arrow":
-      if (element.endArrowhead || element.endArrowhead) {
-        return 40;
-      }
-      return 20;
     default:
       return 20;
   }
@@ -1047,66 +1034,6 @@ export function getFreeDrawPath2D(element: ExcalidrawFreeDrawElement) {
 }
 
 export function getFreeDrawSvgPath(element: ExcalidrawFreeDrawElement) {
-  return getSvgPathFromStroke(getFreedrawOutlinePoints(element));
-}
-
-export function getFreedrawOutlineAsSegments(
-  element: ExcalidrawFreeDrawElement,
-  points: [number, number][],
-  elementsMap: ElementsMap,
-) {
-  const bounds = getElementBounds(
-    {
-      ...element,
-      angle: 0 as Radians,
-    },
-    elementsMap,
-  );
-  const center = pointFrom<GlobalPoint>(
-    (bounds[0] + bounds[2]) / 2,
-    (bounds[1] + bounds[3]) / 2,
-  );
-
-  invariant(points.length >= 2, "Freepath outline must have at least 2 points");
-
-  return points.slice(2).reduce(
-    (acc, curr) => {
-      acc.push(
-        lineSegment<GlobalPoint>(
-          acc[acc.length - 1][1],
-          pointRotateRads(
-            pointFrom<GlobalPoint>(curr[0] + element.x, curr[1] + element.y),
-            center,
-            element.angle,
-          ),
-        ),
-      );
-      return acc;
-    },
-    [
-      lineSegment<GlobalPoint>(
-        pointRotateRads(
-          pointFrom<GlobalPoint>(
-            points[0][0] + element.x,
-            points[0][1] + element.y,
-          ),
-          center,
-          element.angle,
-        ),
-        pointRotateRads(
-          pointFrom<GlobalPoint>(
-            points[1][0] + element.x,
-            points[1][1] + element.y,
-          ),
-          center,
-          element.angle,
-        ),
-      ),
-    ],
-  );
-}
-
-export function getFreedrawOutlinePoints(element: ExcalidrawFreeDrawElement) {
   // If input points are empty (should they ever be?) return a dot
   const inputPoints = element.simulatePressure
     ? element.points
@@ -1125,7 +1052,7 @@ export function getFreedrawOutlinePoints(element: ExcalidrawFreeDrawElement) {
     last: !!element.lastCommittedPoint, // LastCommittedPoint is added on pointerup
   };
 
-  return getStroke(inputPoints as number[][], options) as [number, number][];
+  return getSvgPathFromStroke(getStroke(inputPoints as number[][], options));
 }
 
 function med(A: number[], B: number[]) {

packages/element/src/resizeElements.ts

@@ -2,6 +2,7 @@ import {
   pointCenter,
   normalizeRadians,
   pointFrom,
+  pointFromPair,
   pointRotateRads,
   type Radians,
   type LocalPoint,
@@ -35,7 +36,6 @@ import {
   getContainerElement,
   handleBindTextResize,
   getBoundTextMaxWidth,
-  computeBoundTextPosition,
 } from "./textElement";
 import {
   getMinTextElementWidth,
@@ -104,6 +104,18 @@ export const transformElements = (
         );
         updateBoundElements(element, scene);
       }
+    } else if (isTextElement(element) && transformHandleType) {
+      resizeSingleTextElement(
+        originalElements,
+        element,
+        scene,
+        transformHandleType,
+        shouldResizeFromCenter,
+        pointerX,
+        pointerY,
+      );
+      updateBoundElements(element, scene);
+      return true;
     } else if (transformHandleType) {
       const elementId = selectedElements[0].id;
       const latestElement = elementsMap.get(elementId);
@@ -138,9 +150,6 @@ export const transformElements = (
         );
       }
     }
-    if (isTextElement(element)) {
-      updateBoundElements(element, scene);
-    }
     return true;
   } else if (selectedElements.length > 1) {
     if (transformHandleType === "rotation") {
@@ -226,16 +235,7 @@ const rotateSingleElement = (
       scene.getElement<ExcalidrawTextElementWithContainer>(boundTextElementId);
 
     if (textElement && !isArrowElement(element)) {
-      const { x, y } = computeBoundTextPosition(
+      scene.mutateElement(textElement, { angle });
-        element,
-        textElement,
-        scene.getNonDeletedElementsMap(),
-      );
-      scene.mutateElement(textElement, {
-        angle,
-        x,
-        y,
-      });
     }
   }
 };
@@ -282,50 +282,151 @@ export const measureFontSizeFromWidth = (
   };
 };
 
-export const resizeSingleTextElement = (
+const resizeSingleTextElement = (
-  origElement: NonDeleted<ExcalidrawTextElement>,
+  originalElements: PointerDownState["originalElements"],
   element: NonDeleted<ExcalidrawTextElement>,
   scene: Scene,
   transformHandleType: TransformHandleDirection,
   shouldResizeFromCenter: boolean,
-  nextWidth: number,
+  pointerX: number,
-  nextHeight: number,
+  pointerY: number,
 ) => {
   const elementsMap = scene.getNonDeletedElementsMap();
+  const [x1, y1, x2, y2, cx, cy] = getElementAbsoluteCoords(
+    element,
+    elementsMap,
+  );
+  // rotation pointer with reverse angle
+  const [rotatedX, rotatedY] = pointRotateRads(
+    pointFrom(pointerX, pointerY),
+    pointFrom(cx, cy),
+    -element.angle as Radians,
+  );
+  let scaleX = 0;
+  let scaleY = 0;
 
-  const metricsWidth = element.width * (nextHeight / element.height);
+  if (transformHandleType !== "e" && transformHandleType !== "w") {
-
+    if (transformHandleType.includes("e")) {
-  const metrics = measureFontSizeFromWidth(element, elementsMap, metricsWidth);
+      scaleX = (rotatedX - x1) / (x2 - x1);
-  if (metrics === null) {
+    }
-    return;
+    if (transformHandleType.includes("w")) {
+      scaleX = (x2 - rotatedX) / (x2 - x1);
+    }
+    if (transformHandleType.includes("n")) {
+      scaleY = (y2 - rotatedY) / (y2 - y1);
+    }
+    if (transformHandleType.includes("s")) {
+      scaleY = (rotatedY - y1) / (y2 - y1);
+    }
   }
 
-  if (transformHandleType.includes("n") || transformHandleType.includes("s")) {
+  const scale = Math.max(scaleX, scaleY);
-    const previousOrigin = pointFrom<GlobalPoint>(origElement.x, origElement.y);
 
-    const newOrigin = getResizedOrigin(
+  if (scale > 0) {
-      previousOrigin,
+    const nextWidth = element.width * scale;
-      origElement.width,
+    const nextHeight = element.height * scale;
-      origElement.height,
+    const metrics = measureFontSizeFromWidth(element, elementsMap, nextWidth);
-      metricsWidth,
+    if (metrics === null) {
-      nextHeight,
+      return;
-      origElement.angle,
+    }
-      transformHandleType,
+
-      false,
+    const startTopLeft = [x1, y1];
-      shouldResizeFromCenter,
+    const startBottomRight = [x2, y2];
+    const startCenter = [cx, cy];
+
+    let newTopLeft = pointFrom<GlobalPoint>(x1, y1);
+    if (["n", "w", "nw"].includes(transformHandleType)) {
+      newTopLeft = pointFrom<GlobalPoint>(
+        startBottomRight[0] - Math.abs(nextWidth),
+        startBottomRight[1] - Math.abs(nextHeight),
+      );
+    }
+    if (transformHandleType === "ne") {
+      const bottomLeft = [startTopLeft[0], startBottomRight[1]];
+      newTopLeft = pointFrom<GlobalPoint>(
+        bottomLeft[0],
+        bottomLeft[1] - Math.abs(nextHeight),
+      );
+    }
+    if (transformHandleType === "sw") {
+      const topRight = [startBottomRight[0], startTopLeft[1]];
+      newTopLeft = pointFrom<GlobalPoint>(
+        topRight[0] - Math.abs(nextWidth),
+        topRight[1],
+      );
+    }
+
+    if (["s", "n"].includes(transformHandleType)) {
+      newTopLeft[0] = startCenter[0] - nextWidth / 2;
+    }
+    if (["e", "w"].includes(transformHandleType)) {
+      newTopLeft[1] = startCenter[1] - nextHeight / 2;
+    }
+
+    if (shouldResizeFromCenter) {
+      newTopLeft[0] = startCenter[0] - Math.abs(nextWidth) / 2;
+      newTopLeft[1] = startCenter[1] - Math.abs(nextHeight) / 2;
+    }
+
+    const angle = element.angle;
+    const rotatedTopLeft = pointRotateRads(
+      newTopLeft,
+      pointFrom(cx, cy),
+      angle,
     );
+    const newCenter = pointFrom<GlobalPoint>(
+      newTopLeft[0] + Math.abs(nextWidth) / 2,
+      newTopLeft[1] + Math.abs(nextHeight) / 2,
+    );
+    const rotatedNewCenter = pointRotateRads(
+      newCenter,
+      pointFrom(cx, cy),
+      angle,
+    );
+    newTopLeft = pointRotateRads(
+      rotatedTopLeft,
+      rotatedNewCenter,
+      -angle as Radians,
+    );
+    const [nextX, nextY] = newTopLeft;
 
     scene.mutateElement(element, {
       fontSize: metrics.size,
-      width: metricsWidth,
+      width: nextWidth,
       height: nextHeight,
-      x: newOrigin.x,
+      x: nextX,
-      y: newOrigin.y,
+      y: nextY,
     });
-    return;
   }
 
   if (transformHandleType === "e" || transformHandleType === "w") {
+    const stateAtResizeStart = originalElements.get(element.id)!;
+    const [x1, y1, x2, y2] = getResizedElementAbsoluteCoords(
+      stateAtResizeStart,
+      stateAtResizeStart.width,
+      stateAtResizeStart.height,
+      true,
+    );
+    const startTopLeft = pointFrom<GlobalPoint>(x1, y1);
+    const startBottomRight = pointFrom<GlobalPoint>(x2, y2);
+    const startCenter = pointCenter(startTopLeft, startBottomRight);
+
+    const rotatedPointer = pointRotateRads(
+      pointFrom(pointerX, pointerY),
+      startCenter,
+      -stateAtResizeStart.angle as Radians,
+    );
+
+    const [esx1, , esx2] = getResizedElementAbsoluteCoords(
+      element,
+      element.width,
+      element.height,
+      true,
+    );
+
+    const boundsCurrentWidth = esx2 - esx1;
+
+    const atStartBoundsWidth = startBottomRight[0] - startTopLeft[0];
     const minWidth = getMinTextElementWidth(
       getFontString({
         fontSize: element.fontSize,
@@ -334,7 +435,17 @@ export const resizeSingleTextElement = (
       element.lineHeight,
     );
 
-    const newWidth = Math.max(minWidth, nextWidth);
+    let scaleX = atStartBoundsWidth / boundsCurrentWidth;
+
+    if (transformHandleType.includes("e")) {
+      scaleX = (rotatedPointer[0] - startTopLeft[0]) / boundsCurrentWidth;
+    }
+    if (transformHandleType.includes("w")) {
+      scaleX = (startBottomRight[0] - rotatedPointer[0]) / boundsCurrentWidth;
+    }
+
+    const newWidth =
+      element.width * scaleX < minWidth ? minWidth : element.width * scaleX;
 
     const text = wrapText(
       element.originalText,
@@ -347,27 +458,49 @@ export const resizeSingleTextElement = (
       element.lineHeight,
     );
 
-    const newHeight = metrics.height;
+    const eleNewHeight = metrics.height;
 
-    const previousOrigin = pointFrom<GlobalPoint>(origElement.x, origElement.y);
+    const [newBoundsX1, newBoundsY1, newBoundsX2, newBoundsY2] =
+      getResizedElementAbsoluteCoords(
+        stateAtResizeStart,
+        newWidth,
+        eleNewHeight,
+        true,
+      );
+    const newBoundsWidth = newBoundsX2 - newBoundsX1;
+    const newBoundsHeight = newBoundsY2 - newBoundsY1;
 
-    const newOrigin = getResizedOrigin(
+    let newTopLeft = [...startTopLeft] as [number, number];
-      previousOrigin,
+    if (["n", "w", "nw"].includes(transformHandleType)) {
-      origElement.width,
+      newTopLeft = [
-      origElement.height,
+        startBottomRight[0] - Math.abs(newBoundsWidth),
-      newWidth,
+        startTopLeft[1],
-      newHeight,
+      ];
-      element.angle,
+    }
-      transformHandleType,
+
-      false,
+    // adjust topLeft to new rotation point
-      shouldResizeFromCenter,
+    const angle = stateAtResizeStart.angle;
+    const rotatedTopLeft = pointRotateRads(
+      pointFromPair(newTopLeft),
+      startCenter,
+      angle,
+    );
+    const newCenter = pointFrom(
+      newTopLeft[0] + Math.abs(newBoundsWidth) / 2,
+      newTopLeft[1] + Math.abs(newBoundsHeight) / 2,
+    );
+    const rotatedNewCenter = pointRotateRads(newCenter, startCenter, angle);
+    newTopLeft = pointRotateRads(
+      rotatedTopLeft,
+      rotatedNewCenter,
+      -angle as Radians,
     );
 
     const resizedElement: Partial<ExcalidrawTextElement> = {
       width: Math.abs(newWidth),
       height: Math.abs(metrics.height),
-      x: newOrigin.x,
+      x: newTopLeft[0],
-      y: newOrigin.y,
+      y: newTopLeft[1],
       text,
       autoResize: false,
     };
@@ -426,15 +559,9 @@ const rotateMultipleElements = (
 
       const boundText = getBoundTextElement(element, elementsMap);
       if (boundText && !isArrowElement(element)) {
-        const { x, y } = computeBoundTextPosition(
-          element,
-          boundText,
-          elementsMap,
-        );
-
         scene.mutateElement(boundText, {
-          x,
+          x: boundText.x + (rotatedCX - cx),
-          y,
+          y: boundText.y + (rotatedCY - cy),
           angle: normalizeRadians((centerAngle + origAngle) as Radians),
         });
       }
@@ -694,18 +821,6 @@ export const resizeSingleElement = (
     shouldInformMutation?: boolean;
   } = {},
 ) => {
-  if (isTextElement(latestElement) && isTextElement(origElement)) {
-    return resizeSingleTextElement(
-      origElement,
-      latestElement,
-      scene,
-      handleDirection,
-      shouldResizeFromCenter,
-      nextWidth,
-      nextHeight,
-    );
-  }
-
   let boundTextFont: { fontSize?: number } = {};
   const elementsMap = scene.getNonDeletedElementsMap();
   const boundTextElement = getBoundTextElement(latestElement, elementsMap);
@@ -1403,7 +1518,11 @@ export const resizeMultipleElements = (
     } of elementsAndUpdates) {
       const { width, height, angle } = update;
 
-      scene.mutateElement(element, update);
+      scene.mutateElement(element, update, {
+        informMutation: true,
+        // needed for the fixed binding point udpate to take effect
+        isDragging: true,
+      });
 
       updateBoundElements(element, scene, {
         simultaneouslyUpdated: elementsToUpdate,

packages/element/src/resizeTest.ts

@@ -5,20 +5,17 @@ import {
   type Radians,
 } from "@excalidraw/math";
 
-import {
+import { SIDE_RESIZING_THRESHOLD } from "@excalidraw/common";
-  SIDE_RESIZING_THRESHOLD,
-  type EditorInterface,
-} from "@excalidraw/common";
 
 import type { GlobalPoint, LineSegment, LocalPoint } from "@excalidraw/math";
 
-import type { AppState, Zoom } from "@excalidraw/excalidraw/types";
+import type { AppState, Device, Zoom } from "@excalidraw/excalidraw/types";
 
 import { getElementAbsoluteCoords } from "./bounds";
 import {
   getTransformHandlesFromCoords,
   getTransformHandles,
-  getOmitSidesForEditorInterface,
+  getOmitSidesForDevice,
   canResizeFromSides,
 } from "./transformHandles";
 import { isImageElement, isLinearElement } from "./typeChecks";
@@ -54,7 +51,7 @@ export const resizeTest = <Point extends GlobalPoint | LocalPoint>(
   y: number,
   zoom: Zoom,
   pointerType: PointerType,
-  editorInterface: EditorInterface,
+  device: Device,
 ): MaybeTransformHandleType => {
   if (!appState.selectedElementIds[element.id]) {
     return false;
@@ -66,7 +63,7 @@ export const resizeTest = <Point extends GlobalPoint | LocalPoint>(
       zoom,
       elementsMap,
       pointerType,
-      getOmitSidesForEditorInterface(editorInterface),
+      getOmitSidesForDevice(device),
     );
 
   if (
@@ -89,7 +86,7 @@ export const resizeTest = <Point extends GlobalPoint | LocalPoint>(
     return filter[0] as TransformHandleType;
   }
 
-  if (canResizeFromSides(editorInterface)) {
+  if (canResizeFromSides(device)) {
     const [x1, y1, x2, y2, cx, cy] = getElementAbsoluteCoords(
       element,
       elementsMap,
@@ -135,7 +132,7 @@ export const getElementWithTransformHandleType = (
   zoom: Zoom,
   pointerType: PointerType,
   elementsMap: ElementsMap,
-  editorInterface: EditorInterface,
+  device: Device,
 ) => {
   return elements.reduce((result, element) => {
     if (result) {
@@ -149,7 +146,7 @@ export const getElementWithTransformHandleType = (
       scenePointerY,
       zoom,
       pointerType,
-      editorInterface,
+      device,
     );
     return transformHandleType ? { element, transformHandleType } : null;
   }, null as { element: NonDeletedExcalidrawElement; transformHandleType: MaybeTransformHandleType } | null);
@@ -163,14 +160,14 @@ export const getTransformHandleTypeFromCoords = <
   scenePointerY: number,
   zoom: Zoom,
   pointerType: PointerType,
-  editorInterface: EditorInterface,
+  device: Device,
 ): MaybeTransformHandleType => {
   const transformHandles = getTransformHandlesFromCoords(
     [x1, y1, x2, y2, (x1 + x2) / 2, (y1 + y2) / 2],
     0 as Radians,
     zoom,
     pointerType,
-    getOmitSidesForEditorInterface(editorInterface),
+    getOmitSidesForDevice(device),
   );
 
   const found = Object.keys(transformHandles).find((key) => {
@@ -186,7 +183,7 @@ export const getTransformHandleTypeFromCoords = <
     return found as MaybeTransformHandleType;
   }
 
-  if (canResizeFromSides(editorInterface)) {
+  if (canResizeFromSides(device)) {
     const cx = (x1 + x2) / 2;
     const cy = (y1 + y2) / 2;
 

packages/element/src/shapes.ts

@@ -0,0 +1,398 @@
+import {
+  DEFAULT_ADAPTIVE_RADIUS,
+  DEFAULT_PROPORTIONAL_RADIUS,
+  LINE_CONFIRM_THRESHOLD,
+  ROUNDNESS,
+  invariant,
+  elementCenterPoint,
+} from "@excalidraw/common";
+import {
+  isPoint,
+  pointFrom,
+  pointDistance,
+  pointFromPair,
+  pointRotateRads,
+  pointsEqual,
+  type GlobalPoint,
+  type LocalPoint,
+} from "@excalidraw/math";
+import {
+  getClosedCurveShape,
+  getCurvePathOps,
+  getCurveShape,
+  getEllipseShape,
+  getFreedrawShape,
+  getPolygonShape,
+  type GeometricShape,
+} from "@excalidraw/utils/shape";
+
+import type { NormalizedZoomValue, Zoom } from "@excalidraw/excalidraw/types";
+
+import { shouldTestInside } from "./collision";
+import { LinearElementEditor } from "./linearElementEditor";
+import { getBoundTextElement } from "./textElement";
+import { ShapeCache } from "./ShapeCache";
+
+import { getElementAbsoluteCoords, type Bounds } from "./bounds";
+
+import type {
+  ElementsMap,
+  ExcalidrawElement,
+  ExcalidrawLinearElement,
+  NonDeleted,
+} from "./types";
+
+/**
+ * get the pure geometric shape of an excalidraw elementw
+ * which is then used for hit detection
+ */
+export const getElementShape = <Point extends GlobalPoint | LocalPoint>(
+  element: ExcalidrawElement,
+  elementsMap: ElementsMap,
+): GeometricShape<Point> => {
+  switch (element.type) {
+    case "rectangle":
+    case "diamond":
+    case "frame":
+    case "magicframe":
+    case "embeddable":
+    case "image":
+    case "iframe":
+    case "text":
+    case "selection":
+      return getPolygonShape(element);
+    case "arrow":
+    case "line": {
+      const roughShape =
+        ShapeCache.get(element)?.[0] ??
+        ShapeCache.generateElementShape(element, null)[0];
+      const [, , , , cx, cy] = getElementAbsoluteCoords(element, elementsMap);
+
+      return shouldTestInside(element)
+        ? getClosedCurveShape<Point>(
+            element,
+            roughShape,
+            pointFrom<Point>(element.x, element.y),
+            element.angle,
+            pointFrom(cx, cy),
+          )
+        : getCurveShape<Point>(
+            roughShape,
+            pointFrom<Point>(element.x, element.y),
+            element.angle,
+            pointFrom(cx, cy),
+          );
+    }
+
+    case "ellipse":
+      return getEllipseShape(element);
+
+    case "freedraw": {
+      const [, , , , cx, cy] = getElementAbsoluteCoords(element, elementsMap);
+      return getFreedrawShape(
+        element,
+        pointFrom(cx, cy),
+        shouldTestInside(element),
+      );
+    }
+  }
+};
+
+export const getBoundTextShape = <Point extends GlobalPoint | LocalPoint>(
+  element: ExcalidrawElement,
+  elementsMap: ElementsMap,
+): GeometricShape<Point> | null => {
+  const boundTextElement = getBoundTextElement(element, elementsMap);
+
+  if (boundTextElement) {
+    if (element.type === "arrow") {
+      return getElementShape(
+        {
+          ...boundTextElement,
+          // arrow's bound text accurate position is not stored in the element's property
+          // but rather calculated and returned from the following static method
+          ...LinearElementEditor.getBoundTextElementPosition(
+            element,
+            boundTextElement,
+            elementsMap,
+          ),
+        },
+        elementsMap,
+      );
+    }
+    return getElementShape(boundTextElement, elementsMap);
+  }
+
+  return null;
+};
+
+export const getControlPointsForBezierCurve = <
+  P extends GlobalPoint | LocalPoint,
+>(
+  element: NonDeleted<ExcalidrawLinearElement>,
+  endPoint: P,
+) => {
+  const shape = ShapeCache.generateElementShape(element, null);
+  if (!shape) {
+    return null;
+  }
+
+  const ops = getCurvePathOps(shape[0]);
+  let currentP = pointFrom<P>(0, 0);
+  let index = 0;
+  let minDistance = Infinity;
+  let controlPoints: P[] | null = null;
+
+  while (index < ops.length) {
+    const { op, data } = ops[index];
+    if (op === "move") {
+      invariant(
+        isPoint(data),
+        "The returned ops is not compatible with a point",
+      );
+      currentP = pointFromPair(data);
+    }
+    if (op === "bcurveTo") {
+      const p0 = currentP;
+      const p1 = pointFrom<P>(data[0], data[1]);
+      const p2 = pointFrom<P>(data[2], data[3]);
+      const p3 = pointFrom<P>(data[4], data[5]);
+      const distance = pointDistance(p3, endPoint);
+      if (distance < minDistance) {
+        minDistance = distance;
+        controlPoints = [p0, p1, p2, p3];
+      }
+      currentP = p3;
+    }
+    index++;
+  }
+
+  return controlPoints;
+};
+
+export const getBezierXY = <P extends GlobalPoint | LocalPoint>(
+  p0: P,
+  p1: P,
+  p2: P,
+  p3: P,
+  t: number,
+): P => {
+  const equation = (t: number, idx: number) =>
+    Math.pow(1 - t, 3) * p3[idx] +
+    3 * t * Math.pow(1 - t, 2) * p2[idx] +
+    3 * Math.pow(t, 2) * (1 - t) * p1[idx] +
+    p0[idx] * Math.pow(t, 3);
+  const tx = equation(t, 0);
+  const ty = equation(t, 1);
+  return pointFrom(tx, ty);
+};
+
+const getPointsInBezierCurve = <P extends GlobalPoint | LocalPoint>(
+  element: NonDeleted<ExcalidrawLinearElement>,
+  endPoint: P,
+) => {
+  const controlPoints: P[] = getControlPointsForBezierCurve(element, endPoint)!;
+  if (!controlPoints) {
+    return [];
+  }
+  const pointsOnCurve: P[] = [];
+  let t = 1;
+  // Take 20 points on curve for better accuracy
+  while (t > 0) {
+    const p = getBezierXY(
+      controlPoints[0],
+      controlPoints[1],
+      controlPoints[2],
+      controlPoints[3],
+      t,
+    );
+    pointsOnCurve.push(pointFrom(p[0], p[1]));
+    t -= 0.05;
+  }
+  if (pointsOnCurve.length) {
+    if (pointsEqual(pointsOnCurve.at(-1)!, endPoint)) {
+      pointsOnCurve.push(pointFrom(endPoint[0], endPoint[1]));
+    }
+  }
+  return pointsOnCurve;
+};
+
+const getBezierCurveArcLengths = <P extends GlobalPoint | LocalPoint>(
+  element: NonDeleted<ExcalidrawLinearElement>,
+  endPoint: P,
+) => {
+  const arcLengths: number[] = [];
+  arcLengths[0] = 0;
+  const points = getPointsInBezierCurve(element, endPoint);
+  let index = 0;
+  let distance = 0;
+  while (index < points.length - 1) {
+    const segmentDistance = pointDistance(points[index], points[index + 1]);
+    distance += segmentDistance;
+    arcLengths.push(distance);
+    index++;
+  }
+
+  return arcLengths;
+};
+
+export const getBezierCurveLength = <P extends GlobalPoint | LocalPoint>(
+  element: NonDeleted<ExcalidrawLinearElement>,
+  endPoint: P,
+) => {
+  const arcLengths = getBezierCurveArcLengths(element, endPoint);
+  return arcLengths.at(-1) as number;
+};
+
+// This maps interval to actual interval t on the curve so that when t = 0.5, its actually the point at 50% of the length
+export const mapIntervalToBezierT = <P extends GlobalPoint | LocalPoint>(
+  element: NonDeleted<ExcalidrawLinearElement>,
+  endPoint: P,
+  interval: number, // The interval between 0 to 1 for which you want to find the point on the curve,
+) => {
+  const arcLengths = getBezierCurveArcLengths(element, endPoint);
+  const pointsCount = arcLengths.length - 1;
+  const curveLength = arcLengths.at(-1) as number;
+  const targetLength = interval * curveLength;
+  let low = 0;
+  let high = pointsCount;
+  let index = 0;
+  // Doing a binary search to find the largest length that is less than the target length
+  while (low < high) {
+    index = Math.floor(low + (high - low) / 2);
+    if (arcLengths[index] < targetLength) {
+      low = index + 1;
+    } else {
+      high = index;
+    }
+  }
+  if (arcLengths[index] > targetLength) {
+    index--;
+  }
+  if (arcLengths[index] === targetLength) {
+    return index / pointsCount;
+  }
+
+  return (
+    1 -
+    (index +
+      (targetLength - arcLengths[index]) /
+        (arcLengths[index + 1] - arcLengths[index])) /
+      pointsCount
+  );
+};
+
+/**
+ * Get the axis-aligned bounding box for a given element
+ */
+export const aabbForElement = (
+  element: Readonly<ExcalidrawElement>,
+  offset?: [number, number, number, number],
+) => {
+  const bbox = {
+    minX: element.x,
+    minY: element.y,
+    maxX: element.x + element.width,
+    maxY: element.y + element.height,
+    midX: element.x + element.width / 2,
+    midY: element.y + element.height / 2,
+  };
+
+  const center = elementCenterPoint(element);
+  const [topLeftX, topLeftY] = pointRotateRads(
+    pointFrom(bbox.minX, bbox.minY),
+    center,
+    element.angle,
+  );
+  const [topRightX, topRightY] = pointRotateRads(
+    pointFrom(bbox.maxX, bbox.minY),
+    center,
+    element.angle,
+  );
+  const [bottomRightX, bottomRightY] = pointRotateRads(
+    pointFrom(bbox.maxX, bbox.maxY),
+    center,
+    element.angle,
+  );
+  const [bottomLeftX, bottomLeftY] = pointRotateRads(
+    pointFrom(bbox.minX, bbox.maxY),
+    center,
+    element.angle,
+  );
+
+  const bounds = [
+    Math.min(topLeftX, topRightX, bottomRightX, bottomLeftX),
+    Math.min(topLeftY, topRightY, bottomRightY, bottomLeftY),
+    Math.max(topLeftX, topRightX, bottomRightX, bottomLeftX),
+    Math.max(topLeftY, topRightY, bottomRightY, bottomLeftY),
+  ] as Bounds;
+
+  if (offset) {
+    const [topOffset, rightOffset, downOffset, leftOffset] = offset;
+    return [
+      bounds[0] - leftOffset,
+      bounds[1] - topOffset,
+      bounds[2] + rightOffset,
+      bounds[3] + downOffset,
+    ] as Bounds;
+  }
+
+  return bounds;
+};
+
+export const pointInsideBounds = <P extends GlobalPoint | LocalPoint>(
+  p: P,
+  bounds: Bounds,
+): boolean =>
+  p[0] > bounds[0] && p[0] < bounds[2] && p[1] > bounds[1] && p[1] < bounds[3];
+
+export const aabbsOverlapping = (a: Bounds, b: Bounds) =>
+  pointInsideBounds(pointFrom(a[0], a[1]), b) ||
+  pointInsideBounds(pointFrom(a[2], a[1]), b) ||
+  pointInsideBounds(pointFrom(a[2], a[3]), b) ||
+  pointInsideBounds(pointFrom(a[0], a[3]), b) ||
+  pointInsideBounds(pointFrom(b[0], b[1]), a) ||
+  pointInsideBounds(pointFrom(b[2], b[1]), a) ||
+  pointInsideBounds(pointFrom(b[2], b[3]), a) ||
+  pointInsideBounds(pointFrom(b[0], b[3]), a);
+
+export const getCornerRadius = (x: number, element: ExcalidrawElement) => {
+  if (
+    element.roundness?.type === ROUNDNESS.PROPORTIONAL_RADIUS ||
+    element.roundness?.type === ROUNDNESS.LEGACY
+  ) {
+    return x * DEFAULT_PROPORTIONAL_RADIUS;
+  }
+
+  if (element.roundness?.type === ROUNDNESS.ADAPTIVE_RADIUS) {
+    const fixedRadiusSize = element.roundness?.value ?? DEFAULT_ADAPTIVE_RADIUS;
+
+    const CUTOFF_SIZE = fixedRadiusSize / DEFAULT_PROPORTIONAL_RADIUS;
+
+    if (x <= CUTOFF_SIZE) {
+      return x * DEFAULT_PROPORTIONAL_RADIUS;
+    }
+
+    return fixedRadiusSize;
+  }
+
+  return 0;
+};
+
+// Checks if the first and last point are close enough
+// to be considered a loop
+export const isPathALoop = (
+  points: ExcalidrawLinearElement["points"],
+  /** supply if you want the loop detection to account for current zoom */
+  zoomValue: Zoom["value"] = 1 as NormalizedZoomValue,
+): boolean => {
+  if (points.length >= 3) {
+    const [first, last] = [points[0], points[points.length - 1]];
+    const distance = pointDistance(first, last);
+
+    // Adjusting LINE_CONFIRM_THRESHOLD to current zoom so that when zoomed in
+    // really close we make the threshold smaller, and vice versa.
+    return distance <= LINE_CONFIRM_THRESHOLD / zoomValue;
+  }
+  return false;
+};

packages/element/src/sizeHelpers.ts

@@ -2,28 +2,14 @@ import {
   SHIFT_LOCKING_ANGLE,
   viewportCoordsToSceneCoords,
 } from "@excalidraw/common";
-import {
-  normalizeRadians,
-  radiansBetweenAngles,
-  radiansDifference,
-  type Radians,
-} from "@excalidraw/math";
-
-import { pointsEqual } from "@excalidraw/math";
 
 import type { AppState, Offsets, Zoom } from "@excalidraw/excalidraw/types";
 
 import { getCommonBounds, getElementBounds } from "./bounds";
-import {
+import { isFreeDrawElement, isLinearElement } from "./typeChecks";
-  isArrowElement,
-  isFreeDrawElement,
-  isLinearElement,
-} from "./typeChecks";
 
 import type { ElementsMap, ExcalidrawElement } from "./types";
 
-export const INVISIBLY_SMALL_ELEMENT_SIZE = 0.1;
-
 // TODO:  remove invisible elements consistently actions, so that invisible elements are not recorded by the store, exported, broadcasted or persisted
 //        - perhaps could be as part of a standalone 'cleanup' action, in addition to 'finalize'
 //        - could also be part of `_clearElements`
@@ -31,18 +17,8 @@ export const isInvisiblySmallElement = (
   element: ExcalidrawElement,
 ): boolean => {
   if (isLinearElement(element) || isFreeDrawElement(element)) {
-    return (
+    return element.points.length < 2;
-      element.points.length < 2 ||
-      (element.points.length === 2 &&
-        isArrowElement(element) &&
-        pointsEqual(
-          element.points[0],
-          element.points[element.points.length - 1],
-          INVISIBLY_SMALL_ELEMENT_SIZE,
-        ))
-    );
   }
-
   return element.width === 0 && element.height === 0;
 };
 
@@ -158,42 +134,13 @@ export const getLockedLinearCursorAlignSize = (
   originY: number,
   x: number,
   y: number,
-  customAngle?: number,
 ) => {
   let width = x - originX;
   let height = y - originY;
 
-  const angle = Math.atan2(height, width) as Radians;
+  const lockedAngle =
-  let lockedAngle = (Math.round(angle / SHIFT_LOCKING_ANGLE) *
+    Math.round(Math.atan(height / width) / SHIFT_LOCKING_ANGLE) *
-    SHIFT_LOCKING_ANGLE) as Radians;
+    SHIFT_LOCKING_ANGLE;
-
-  if (customAngle) {
-    // If custom angle is provided, we check if the angle is close to the
-    // custom angle, snap to that if close engough, otherwise snap to the
-    // higher or lower angle depending on the current angle vs custom angle.
-    const lower = (Math.floor(customAngle / SHIFT_LOCKING_ANGLE) *
-      SHIFT_LOCKING_ANGLE) as Radians;
-    if (
-      radiansBetweenAngles(
-        angle,
-        lower,
-        (lower + SHIFT_LOCKING_ANGLE) as Radians,
-      )
-    ) {
-      if (
-        radiansDifference(angle, customAngle as Radians) <
-        SHIFT_LOCKING_ANGLE / 6
-      ) {
-        lockedAngle = customAngle as Radians;
-      } else if (
-        normalizeRadians(angle) > normalizeRadians(customAngle as Radians)
-      ) {
-        lockedAngle = (lower + SHIFT_LOCKING_ANGLE) as Radians;
-      } else {
-        lockedAngle = lower;
-      }
-    }
-  }
 
   if (lockedAngle === 0) {
     height = 0;

packages/element/src/store.ts

@@ -19,21 +19,9 @@ import { newElementWith } from "./mutateElement";
 
 import { ElementsDelta, AppStateDelta, Delta } from "./delta";
 
-import {
+import { hashElementsVersion, hashString } from "./index";
-  syncInvalidIndicesImmutable,
-  hashElementsVersion,
-  hashString,
-  isInitializedImageElement,
-  isImageElement,
-} from "./index";
 
-import type { ApplyToOptions } from "./delta";
+import type { OrderedExcalidrawElement, SceneElementsMap } from "./types";
-
-import type {
-  ExcalidrawElement,
-  OrderedExcalidrawElement,
-  SceneElementsMap,
-} from "./types";
 
 export const CaptureUpdateAction = {
   /**
@@ -76,9 +64,8 @@ type MicroActionsQueue = (() => void)[];
  * Store which captures the observed changes and emits them as `StoreIncrement` events.
  */
 export class Store {
-  // for internal use by history
+  // internally used by history
   public readonly onDurableIncrementEmitter = new Emitter<[DurableIncrement]>();
-  // for public use as part of onIncrement API
   public readonly onStoreIncrementEmitter = new Emitter<
     [DurableIncrement | EphemeralIncrement]
   >();
@@ -118,7 +105,7 @@ export class Store {
     params:
       | {
           action: CaptureUpdateActionType;
-          elements: readonly ExcalidrawElement[] | undefined;
+          elements: SceneElementsMap | undefined;
           appState: AppState | ObservedAppState | undefined;
         }
       | {
@@ -142,21 +129,13 @@ export class Store {
     } else {
       // immediately create an immutable change of the scheduled updates,
       // compared to the current state, so that they won't mutate later on during batching
-      // also, we have to compare against the current state,
-      // as comparing against the snapshot might include yet uncomitted changes (i.e. async freedraw / text / image, etc.)
       const currentSnapshot = StoreSnapshot.create(
         this.app.scene.getElementsMapIncludingDeleted(),
         this.app.state,
       );
-
       const scheduledSnapshot = currentSnapshot.maybeClone(
         action,
-        // let's sync invalid indices first, so that we could detect this change
+        params.elements,
-        // also have the synced elements immutable, so that we don't mutate elements,
-        // that are already in the scene, otherwise we wouldn't see any change
-        params.elements
-          ? syncInvalidIndicesImmutable(params.elements)
-          : undefined,
         params.appState,
       );
 
@@ -234,12 +213,22 @@ export class Store {
       // using the same instance, since in history we have a check against `HistoryEntry`, so that we don't re-record the same delta again
       storeDelta = delta;
     } else {
-      storeDelta = StoreDelta.calculate(prevSnapshot, snapshot);
+      // calculate the deltas based on the previous and next snapshot
+      const elementsDelta = snapshot.metadata.didElementsChange
+        ? ElementsDelta.calculate(prevSnapshot.elements, snapshot.elements)
+        : ElementsDelta.empty();
+
+      const appStateDelta = snapshot.metadata.didAppStateChange
+        ? AppStateDelta.calculate(prevSnapshot.appState, snapshot.appState)
+        : AppStateDelta.empty();
+
+      storeDelta = StoreDelta.create(elementsDelta, appStateDelta);
     }
 
     if (!storeDelta.isEmpty()) {
       const increment = new DurableIncrement(storeChange, storeDelta);
 
+      // Notify listeners with the increment
       this.onDurableIncrementEmitter.trigger(increment);
       this.onStoreIncrementEmitter.trigger(increment);
     }
@@ -516,24 +505,6 @@ export class StoreDelta {
     return new this(opts.id, elements, appState);
   }
 
-  /**
-   * Calculate the delta between the previous and next snapshot.
-   */
-  public static calculate(
-    prevSnapshot: StoreSnapshot,
-    nextSnapshot: StoreSnapshot,
-  ) {
-    const elementsDelta = nextSnapshot.metadata.didElementsChange
-      ? ElementsDelta.calculate(prevSnapshot.elements, nextSnapshot.elements)
-      : ElementsDelta.empty();
-
-    const appStateDelta = nextSnapshot.metadata.didAppStateChange
-      ? AppStateDelta.calculate(prevSnapshot.appState, nextSnapshot.appState)
-      : AppStateDelta.empty();
-
-    return this.create(elementsDelta, appStateDelta);
-  }
-
   /**
    * Restore a store delta instance from a DTO.
    */
@@ -552,35 +523,38 @@ export class StoreDelta {
   public static load({
     id,
     elements: { added, removed, updated },
-    appState: { delta: appStateDelta },
   }: DTO<StoreDelta>) {
-    const elements = ElementsDelta.create(added, removed, updated);
+    const elements = ElementsDelta.create(added, removed, updated, {
-    const appState = AppStateDelta.create(appStateDelta);
+      shouldRedistribute: false,
+    });
 
-    return new this(id, elements, appState);
+    return new this(id, elements, AppStateDelta.empty());
-  }
-
-  /**
-   * Squash the passed deltas into the aggregated delta instance.
-   */
-  public static squash(...deltas: StoreDelta[]) {
-    const aggregatedDelta = StoreDelta.empty();
-
-    for (const delta of deltas) {
-      aggregatedDelta.elements.squash(delta.elements);
-      aggregatedDelta.appState.squash(delta.appState);
-    }
-
-    return aggregatedDelta;
   }
 
   /**
    * Inverse store delta, creates new instance of `StoreDelta`.
    */
-  public static inverse(delta: StoreDelta) {
+  public static inverse(delta: StoreDelta): StoreDelta {
     return this.create(delta.elements.inverse(), delta.appState.inverse());
   }
 
+  /**
+   * Apply latest (remote) changes to the delta, creates new instance of `StoreDelta`.
+   */
+  public static applyLatestChanges(
+    delta: StoreDelta,
+    elements: SceneElementsMap,
+    modifierOptions: "deleted" | "inserted",
+  ): StoreDelta {
+    return this.create(
+      delta.elements.applyLatestChanges(elements, modifierOptions),
+      delta.appState,
+      {
+        id: delta.id,
+      },
+    );
+  }
+
   /**
    * Apply the delta to the passed elements and appState, does not modify the snapshot.
    */
@@ -588,12 +562,11 @@ export class StoreDelta {
     delta: StoreDelta,
     elements: SceneElementsMap,
     appState: AppState,
-    options?: ApplyToOptions,
+    prevSnapshot: StoreSnapshot = StoreSnapshot.empty(),
   ): [SceneElementsMap, AppState, boolean] {
     const [nextElements, elementsContainVisibleChange] = delta.elements.applyTo(
       elements,
-      StoreSnapshot.empty().elements,
+      prevSnapshot.elements,
-      options,
     );
 
     const [nextAppState, appStateContainsVisibleChange] =
@@ -605,32 +578,6 @@ export class StoreDelta {
     return [nextElements, nextAppState, appliedVisibleChanges];
   }
 
-  /**
-   * Apply latest (remote) changes to the delta, creates new instance of `StoreDelta`.
-   */
-  public static applyLatestChanges(
-    delta: StoreDelta,
-    prevElements: SceneElementsMap,
-    nextElements: SceneElementsMap,
-    modifierOptions?: "deleted" | "inserted",
-  ): StoreDelta {
-    return this.create(
-      delta.elements.applyLatestChanges(
-        prevElements,
-        nextElements,
-        modifierOptions,
-      ),
-      delta.appState,
-      {
-        id: delta.id,
-      },
-    );
-  }
-
-  public static empty() {
-    return StoreDelta.create(ElementsDelta.empty(), AppStateDelta.empty());
-  }
-
   public isEmpty() {
     return this.elements.isEmpty() && this.appState.isEmpty();
   }
@@ -740,10 +687,11 @@ export class StoreSnapshot {
       nextElements.set(id, changedElement);
     }
 
-    const nextAppState = getObservedAppState({
+    const nextAppState = Object.assign(
-      ...this.appState,
+      {},
-      ...change.appState,
+      this.appState,
-    });
+      change.appState,
+    ) as ObservedAppState;
 
     return StoreSnapshot.create(nextElements, nextAppState, {
       // by default we assume that change is different from what we have in the snapshot
@@ -899,7 +847,7 @@ export class StoreSnapshot {
   }
 
   /**
-   * Detect if there are any changed elements.
+   * Detect if there any changed elements.
    */
   private detectChangedElements(
     nextElements: SceneElementsMap,
@@ -934,14 +882,6 @@ export class StoreSnapshot {
         !prevElement || // element was added
         prevElement.version < nextElement.version // element was updated
       ) {
-        if (
-          isImageElement(nextElement) &&
-          !isInitializedImageElement(nextElement)
-        ) {
-          // ignore any updates on uninitialized image elements
-          continue;
-        }
-
         changedElements.set(nextElement.id, nextElement);
       }
     }
@@ -996,31 +936,26 @@ const getDefaultObservedAppState = (): ObservedAppState => {
     viewBackgroundColor: COLOR_PALETTE.white,
     selectedElementIds: {},
     selectedGroupIds: {},
-    selectedLinearElement: null,
+    editingLinearElementId: null,
+    selectedLinearElementId: null,
     croppingElementId: null,
     activeLockedId: null,
     lockedMultiSelections: {},
   };
 };
 
-export const getObservedAppState = (
+export const getObservedAppState = (appState: AppState): ObservedAppState => {
-  appState: AppState | ObservedAppState,
-): ObservedAppState => {
   const observedAppState = {
     name: appState.name,
     editingGroupId: appState.editingGroupId,
     viewBackgroundColor: appState.viewBackgroundColor,
     selectedElementIds: appState.selectedElementIds,
     selectedGroupIds: appState.selectedGroupIds,
+    editingLinearElementId: appState.editingLinearElement?.elementId || null,
+    selectedLinearElementId: appState.selectedLinearElement?.elementId || null,
     croppingElementId: appState.croppingElementId,
     activeLockedId: appState.activeLockedId,
     lockedMultiSelections: appState.lockedMultiSelections,
-    selectedLinearElement: appState.selectedLinearElement
-      ? {
-          elementId: appState.selectedLinearElement.elementId,
-          isEditing: !!appState.selectedLinearElement.isEditing,
-        }
-      : null,
   };
 
   Reflect.defineProperty(observedAppState, hiddenObservedAppStateProp, {

packages/element/src/textElement.ts

@@ -10,12 +10,12 @@ import {
   invariant,
 } from "@excalidraw/common";
 
-import { pointFrom, pointRotateRads, type Radians } from "@excalidraw/math";
-
 import type { AppState } from "@excalidraw/excalidraw/types";
 
 import type { ExtractSetType } from "@excalidraw/common/utility-types";
 
+import type { Radians } from "@excalidraw/math";
+
 import {
   resetOriginalContainerCache,
   updateOriginalContainerCache,
@@ -254,26 +254,6 @@ export const computeBoundTextPosition = (
     x =
       containerCoords.x + (maxContainerWidth / 2 - boundTextElement.width / 2);
   }
-  const angle = (container.angle ?? 0) as Radians;
-
-  if (angle !== 0) {
-    const contentCenter = pointFrom(
-      containerCoords.x + maxContainerWidth / 2,
-      containerCoords.y + maxContainerHeight / 2,
-    );
-    const textCenter = pointFrom(
-      x + boundTextElement.width / 2,
-      y + boundTextElement.height / 2,
-    );
-
-    const [rx, ry] = pointRotateRads(textCenter, contentCenter, angle);
-
-    return {
-      x: rx - boundTextElement.width / 2,
-      y: ry - boundTextElement.height / 2,
-    };
-  }
-
   return { x, y };
 };
 
@@ -346,7 +326,10 @@ export const getContainerCenter = (
   if (!midSegmentMidpoint) {
     midSegmentMidpoint = LinearElementEditor.getSegmentMidPoint(
       container,
+      points[index],
+      points[index + 1],
       index + 1,
+      elementsMap,
     );
   }
   return { x: midSegmentMidpoint[0], y: midSegmentMidpoint[1] };

packages/element/src/transformHandles.ts

@@ -1,6 +1,7 @@
 import {
   DEFAULT_TRANSFORM_HANDLE_SPACING,
-  type EditorInterface,
+  isAndroid,
+  isIOS,
 } from "@excalidraw/common";
 
 import { pointFrom, pointRotateRads } from "@excalidraw/math";
@@ -8,6 +9,7 @@ import { pointFrom, pointRotateRads } from "@excalidraw/math";
 import type { Radians } from "@excalidraw/math";
 
 import type {
+  Device,
   InteractiveCanvasAppState,
   Zoom,
 } from "@excalidraw/excalidraw/types";
@@ -109,21 +111,20 @@ const generateTransformHandle = (
   return [xx - width / 2, yy - height / 2, width, height];
 };
 
-export const canResizeFromSides = (editorInterface: EditorInterface) => {
+export const canResizeFromSides = (device: Device) => {
-  if (
+  if (device.viewport.isMobile) {
-    editorInterface.formFactor === "phone" &&
+    return false;
-    editorInterface.userAgent.isMobileDevice
+  }
-  ) {
+
+  if (device.isTouchScreen && (isAndroid || isIOS)) {
     return false;
   }
 
   return true;
 };
 
-export const getOmitSidesForEditorInterface = (
+export const getOmitSidesForDevice = (device: Device) => {
-  editorInterface: EditorInterface,
+  if (canResizeFromSides(device)) {
-) => {
-  if (canResizeFromSides(editorInterface)) {
     return DEFAULT_OMIT_SIDES;
   }
 
@@ -325,12 +326,11 @@ export const getTransformHandles = (
   );
 };
 
-export const hasBoundingBox = (
+export const shouldShowBoundingBox = (
   elements: readonly NonDeletedExcalidrawElement[],
   appState: InteractiveCanvasAppState,
-  editorInterface: EditorInterface,
 ) => {
-  if (appState.selectedLinearElement?.isEditing) {
+  if (appState.editingLinearElement) {
     return false;
   }
   if (elements.length > 1) {
@@ -345,7 +345,5 @@ export const hasBoundingBox = (
     return true;
   }
 
-  // on mobile/tablet we currently don't show bbox because of resize issues
+  return element.points.length > 2;
-  // (also prob best for simplicity's sake)
-  return element.points.length > 2 && !editorInterface.userAgent.isMobileDevice;
 };

packages/element/src/typeChecks.ts

@@ -1,7 +1,5 @@
 import { ROUNDNESS, assertNever } from "@excalidraw/common";
 
-import { pointsEqual } from "@excalidraw/math";
-
 import type { ElementOrToolType } from "@excalidraw/excalidraw/types";
 
 import type { MarkNonNullable } from "@excalidraw/common/utility-types";
@@ -27,7 +25,6 @@ import type {
   ExcalidrawMagicFrameElement,
   ExcalidrawArrowElement,
   ExcalidrawElbowArrowElement,
-  ExcalidrawLineElement,
   PointBinding,
   FixedPointBinding,
   ExcalidrawFlowchartNodeElement,
@@ -111,12 +108,6 @@ export const isLinearElement = (
   return element != null && isLinearElementType(element.type);
 };
 
-export const isLineElement = (
-  element?: ExcalidrawElement | null,
-): element is ExcalidrawLineElement => {
-  return element != null && element.type === "line";
-};
-
 export const isArrowElement = (
   element?: ExcalidrawElement | null,
 ): element is ExcalidrawArrowElement => {
@@ -129,15 +120,6 @@ export const isElbowArrow = (
   return isArrowElement(element) && element.elbowed;
 };
 
-/**
- * sharp or curved arrow, but not elbow
- */
-export const isSimpleArrow = (
-  element?: ExcalidrawElement,
-): element is ExcalidrawArrowElement => {
-  return isArrowElement(element) && !element.elbowed;
-};
-
 export const isSharpArrow = (
   element?: ExcalidrawElement,
 ): element is ExcalidrawArrowElement => {
@@ -390,26 +372,3 @@ export const getLinearElementSubType = (
   }
   return "line";
 };
-
-/**
- * Checks if current element points meet all the conditions for polygon=true
- * (this isn't a element type check, for that use isLineElement).
- *
- * If you want to check if points *can* be turned into a polygon, use
- *  canBecomePolygon(points).
- */
-export const isValidPolygon = (
-  points: ExcalidrawLineElement["points"],
-): boolean => {
-  return points.length > 3 && pointsEqual(points[0], points[points.length - 1]);
-};
-
-export const canBecomePolygon = (
-  points: ExcalidrawLineElement["points"],
-): boolean => {
-  return (
-    points.length > 3 ||
-    // 3-point polygons can't have all points in a single line
-    (points.length === 3 && !pointsEqual(points[0], points[points.length - 1]))
-  );
-};

packages/element/src/types.ts

@@ -195,8 +195,7 @@ export type ExcalidrawRectanguloidElement =
   | ExcalidrawFreeDrawElement
   | ExcalidrawIframeLikeElement
   | ExcalidrawFrameLikeElement
-  | ExcalidrawEmbeddableElement
+  | ExcalidrawEmbeddableElement;
-  | ExcalidrawSelectionElement;
 
 /**
  * ExcalidrawElement should be JSON serializable and (eventually) contain
@@ -297,10 +296,8 @@ export type FixedPointBinding = Merge<
   }
 >;
 
-type Index = number;
-
 export type PointsPositionUpdates = Map<
-  Index,
+  number,
   { point: LocalPoint; isDragging?: boolean }
 >;
 
@@ -329,16 +326,10 @@ export type ExcalidrawLinearElement = _ExcalidrawElementBase &
     endArrowhead: Arrowhead | null;
   }>;
 
-export type ExcalidrawLineElement = ExcalidrawLinearElement &
-  Readonly<{
-    type: "line";
-    polygon: boolean;
-  }>;
-
 export type FixedSegment = {
   start: LocalPoint;
   end: LocalPoint;
-  index: Index;
+  index: number;
 };
 
 export type ExcalidrawArrowElement = ExcalidrawLinearElement &

packages/element/src/utils.ts

@@ -1,346 +1,259 @@
-import {
-  DEFAULT_ADAPTIVE_RADIUS,
-  DEFAULT_PROPORTIONAL_RADIUS,
-  LINE_CONFIRM_THRESHOLD,
-  ROUNDNESS,
-} from "@excalidraw/common";
-
 import {
   curve,
-  curveCatmullRomCubicApproxPoints,
-  curveOffsetPoints,
   lineSegment,
-  pointDistance,
   pointFrom,
-  pointFromArray,
+  pointFromVector,
   rectangle,
+  vectorFromPoint,
+  vectorNormalize,
+  vectorScale,
   type GlobalPoint,
 } from "@excalidraw/math";
 
-import type { Curve, LineSegment, LocalPoint } from "@excalidraw/math";
+import { elementCenterPoint } from "@excalidraw/common";
 
-import type { NormalizedZoomValue, Zoom } from "@excalidraw/excalidraw/types";
+import type { Curve, LineSegment } from "@excalidraw/math";
+
+import { getCornerRadius } from "./shapes";
 
 import { getDiamondPoints } from "./bounds";
 
-import { generateLinearCollisionShape } from "./shape";
-
 import type {
   ExcalidrawDiamondElement,
-  ExcalidrawElement,
-  ExcalidrawFreeDrawElement,
-  ExcalidrawLinearElement,
   ExcalidrawRectanguloidElement,
 } from "./types";
 
-type ElementShape = [LineSegment<GlobalPoint>[], Curve<GlobalPoint>[]];
-
-const ElementShapesCache = new WeakMap<
-  ExcalidrawElement,
-  { version: ExcalidrawElement["version"]; shapes: Map<number, ElementShape> }
->();
-
-const getElementShapesCacheEntry = <T extends ExcalidrawElement>(
-  element: T,
-  offset: number,
-): ElementShape | undefined => {
-  const record = ElementShapesCache.get(element);
-
-  if (!record) {
-    return undefined;
-  }
-
-  const { version, shapes } = record;
-
-  if (version !== element.version) {
-    ElementShapesCache.delete(element);
-    return undefined;
-  }
-
-  return shapes.get(offset);
-};
-
-const setElementShapesCacheEntry = <T extends ExcalidrawElement>(
-  element: T,
-  shape: ElementShape,
-  offset: number,
-) => {
-  const record = ElementShapesCache.get(element);
-
-  if (!record) {
-    ElementShapesCache.set(element, {
-      version: element.version,
-      shapes: new Map([[offset, shape]]),
-    });
-
-    return;
-  }
-
-  const { version, shapes } = record;
-
-  if (version !== element.version) {
-    ElementShapesCache.set(element, {
-      version: element.version,
-      shapes: new Map([[offset, shape]]),
-    });
-
-    return;
-  }
-
-  shapes.set(offset, shape);
-};
-
-/**
- * Returns the **rotated** components of freedraw, line or arrow elements.
- *
- * @param element The linear element to deconstruct
- * @returns The rotated in components.
- */
-export function deconstructLinearOrFreeDrawElement(
-  element: ExcalidrawLinearElement | ExcalidrawFreeDrawElement,
-): [LineSegment<GlobalPoint>[], Curve<GlobalPoint>[]] {
-  const cachedShape = getElementShapesCacheEntry(element, 0);
-
-  if (cachedShape) {
-    return cachedShape;
-  }
-
-  const ops = generateLinearCollisionShape(element) as {
-    op: string;
-    data: number[];
-  }[];
-  const lines = [];
-  const curves = [];
-
-  for (let idx = 0; idx < ops.length; idx += 1) {
-    const op = ops[idx];
-    const prevPoint =
-      ops[idx - 1] && pointFromArray<LocalPoint>(ops[idx - 1].data.slice(-2));
-    switch (op.op) {
-      case "move":
-        continue;
-      case "lineTo":
-        if (!prevPoint) {
-          throw new Error("prevPoint is undefined");
-        }
-
-        lines.push(
-          lineSegment<GlobalPoint>(
-            pointFrom<GlobalPoint>(
-              element.x + prevPoint[0],
-              element.y + prevPoint[1],
-            ),
-            pointFrom<GlobalPoint>(
-              element.x + op.data[0],
-              element.y + op.data[1],
-            ),
-          ),
-        );
-        continue;
-      case "bcurveTo":
-        if (!prevPoint) {
-          throw new Error("prevPoint is undefined");
-        }
-
-        curves.push(
-          curve<GlobalPoint>(
-            pointFrom<GlobalPoint>(
-              element.x + prevPoint[0],
-              element.y + prevPoint[1],
-            ),
-            pointFrom<GlobalPoint>(
-              element.x + op.data[0],
-              element.y + op.data[1],
-            ),
-            pointFrom<GlobalPoint>(
-              element.x + op.data[2],
-              element.y + op.data[3],
-            ),
-            pointFrom<GlobalPoint>(
-              element.x + op.data[4],
-              element.y + op.data[5],
-            ),
-          ),
-        );
-        continue;
-      default: {
-        console.error("Unknown op type", op.op);
-      }
-    }
-  }
-
-  const shape = [lines, curves] as ElementShape;
-  setElementShapesCacheEntry(element, shape, 0);
-
-  return shape;
-}
-
 /**
  * Get the building components of a rectanguloid element in the form of
- * line segments and curves **unrotated**.
+ * line segments and curves.
  *
  * @param element Target rectanguloid element
  * @param offset Optional offset to expand the rectanguloid shape
- * @returns Tuple of **unrotated** line segments (0) and curves (1)
+ * @returns Tuple of line segments (0) and curves (1)
  */
 export function deconstructRectanguloidElement(
   element: ExcalidrawRectanguloidElement,
   offset: number = 0,
 ): [LineSegment<GlobalPoint>[], Curve<GlobalPoint>[]] {
-  const cachedShape = getElementShapesCacheEntry(element, offset);
+  const roundness = getCornerRadius(
-
-  if (cachedShape) {
-    return cachedShape;
-  }
-
-  let radius = getCornerRadius(
     Math.min(element.width, element.height),
     element,
   );
 
-  if (radius === 0) {
+  if (roundness <= 0) {
-    radius = 0.01;
+    const r = rectangle(
+      pointFrom(element.x - offset, element.y - offset),
+      pointFrom(
+        element.x + element.width + offset,
+        element.y + element.height + offset,
+      ),
+    );
+
+    const top = lineSegment<GlobalPoint>(
+      pointFrom<GlobalPoint>(r[0][0] + roundness, r[0][1]),
+      pointFrom<GlobalPoint>(r[1][0] - roundness, r[0][1]),
+    );
+    const right = lineSegment<GlobalPoint>(
+      pointFrom<GlobalPoint>(r[1][0], r[0][1] + roundness),
+      pointFrom<GlobalPoint>(r[1][0], r[1][1] - roundness),
+    );
+    const bottom = lineSegment<GlobalPoint>(
+      pointFrom<GlobalPoint>(r[0][0] + roundness, r[1][1]),
+      pointFrom<GlobalPoint>(r[1][0] - roundness, r[1][1]),
+    );
+    const left = lineSegment<GlobalPoint>(
+      pointFrom<GlobalPoint>(r[0][0], r[1][1] - roundness),
+      pointFrom<GlobalPoint>(r[0][0], r[0][1] + roundness),
+    );
+    const sides = [top, right, bottom, left];
+
+    return [sides, []];
   }
 
+  const center = elementCenterPoint(element);
+
   const r = rectangle(
     pointFrom(element.x, element.y),
     pointFrom(element.x + element.width, element.y + element.height),
   );
 
   const top = lineSegment<GlobalPoint>(
-    pointFrom<GlobalPoint>(r[0][0] + radius, r[0][1]),
+    pointFrom<GlobalPoint>(r[0][0] + roundness, r[0][1]),
-    pointFrom<GlobalPoint>(r[1][0] - radius, r[0][1]),
+    pointFrom<GlobalPoint>(r[1][0] - roundness, r[0][1]),
   );
   const right = lineSegment<GlobalPoint>(
-    pointFrom<GlobalPoint>(r[1][0], r[0][1] + radius),
+    pointFrom<GlobalPoint>(r[1][0], r[0][1] + roundness),
-    pointFrom<GlobalPoint>(r[1][0], r[1][1] - radius),
+    pointFrom<GlobalPoint>(r[1][0], r[1][1] - roundness),
   );
   const bottom = lineSegment<GlobalPoint>(
-    pointFrom<GlobalPoint>(r[0][0] + radius, r[1][1]),
+    pointFrom<GlobalPoint>(r[0][0] + roundness, r[1][1]),
-    pointFrom<GlobalPoint>(r[1][0] - radius, r[1][1]),
+    pointFrom<GlobalPoint>(r[1][0] - roundness, r[1][1]),
   );
   const left = lineSegment<GlobalPoint>(
-    pointFrom<GlobalPoint>(r[0][0], r[1][1] - radius),
+    pointFrom<GlobalPoint>(r[0][0], r[1][1] - roundness),
-    pointFrom<GlobalPoint>(r[0][0], r[0][1] + radius),
+    pointFrom<GlobalPoint>(r[0][0], r[0][1] + roundness),
   );
 
-  const baseCorners = [
+  const offsets = [
-    curve(
+    vectorScale(
-      left[1],
+      vectorNormalize(
-      pointFrom<GlobalPoint>(
+        vectorFromPoint(pointFrom(r[0][0] - offset, r[0][1] - offset), center),
-        left[1][0] + (2 / 3) * (r[0][0] - left[1][0]),
-        left[1][1] + (2 / 3) * (r[0][1] - left[1][1]),
       ),
-      pointFrom<GlobalPoint>(
+      offset,
-        top[0][0] + (2 / 3) * (r[0][0] - top[0][0]),
-        top[0][1] + (2 / 3) * (r[0][1] - top[0][1]),
-      ),
-      top[0],
     ), // TOP LEFT
-    curve(
+    vectorScale(
-      top[1],
+      vectorNormalize(
-      pointFrom<GlobalPoint>(
+        vectorFromPoint(pointFrom(r[1][0] + offset, r[0][1] - offset), center),
-        top[1][0] + (2 / 3) * (r[1][0] - top[1][0]),
-        top[1][1] + (2 / 3) * (r[0][1] - top[1][1]),
       ),
-      pointFrom<GlobalPoint>(
+      offset,
-        right[0][0] + (2 / 3) * (r[1][0] - right[0][0]),
+    ), //TOP RIGHT
-        right[0][1] + (2 / 3) * (r[0][1] - right[0][1]),
+    vectorScale(
+      vectorNormalize(
+        vectorFromPoint(pointFrom(r[1][0] + offset, r[1][1] + offset), center),
       ),
-      right[0],
+      offset,
-    ), // TOP RIGHT
-    curve(
-      right[1],
-      pointFrom<GlobalPoint>(
-        right[1][0] + (2 / 3) * (r[1][0] - right[1][0]),
-        right[1][1] + (2 / 3) * (r[1][1] - right[1][1]),
-      ),
-      pointFrom<GlobalPoint>(
-        bottom[1][0] + (2 / 3) * (r[1][0] - bottom[1][0]),
-        bottom[1][1] + (2 / 3) * (r[1][1] - bottom[1][1]),
-      ),
-      bottom[1],
     ), // BOTTOM RIGHT
-    curve(
+    vectorScale(
-      bottom[0],
+      vectorNormalize(
-      pointFrom<GlobalPoint>(
+        vectorFromPoint(pointFrom(r[0][0] - offset, r[1][1] + offset), center),
-        bottom[0][0] + (2 / 3) * (r[0][0] - bottom[0][0]),
-        bottom[0][1] + (2 / 3) * (r[1][1] - bottom[0][1]),
       ),
-      pointFrom<GlobalPoint>(
+      offset,
-        left[0][0] + (2 / 3) * (r[0][0] - left[0][0]),
-        left[0][1] + (2 / 3) * (r[1][1] - left[0][1]),
-      ),
-      left[0],
     ), // BOTTOM LEFT
   ];
 
-  const corners =
+  const corners = [
-    offset > 0
+    curve(
-      ? baseCorners.map(
+      pointFromVector(offsets[0], left[1]),
-          (corner) =>
+      pointFromVector(
-            curveCatmullRomCubicApproxPoints(
+        offsets[0],
-              curveOffsetPoints(corner, offset),
+        pointFrom<GlobalPoint>(
-            )!,
+          left[1][0] + (2 / 3) * (r[0][0] - left[1][0]),
-        )
+          left[1][1] + (2 / 3) * (r[0][1] - left[1][1]),
-      : [
+        ),
-          [baseCorners[0]],
+      ),
-          [baseCorners[1]],
+      pointFromVector(
-          [baseCorners[2]],
+        offsets[0],
-          [baseCorners[3]],
+        pointFrom<GlobalPoint>(
-        ];
+          top[0][0] + (2 / 3) * (r[0][0] - top[0][0]),
+          top[0][1] + (2 / 3) * (r[0][1] - top[0][1]),
+        ),
+      ),
+      pointFromVector(offsets[0], top[0]),
+    ), // TOP LEFT
+    curve(
+      pointFromVector(offsets[1], top[1]),
+      pointFromVector(
+        offsets[1],
+        pointFrom<GlobalPoint>(
+          top[1][0] + (2 / 3) * (r[1][0] - top[1][0]),
+          top[1][1] + (2 / 3) * (r[0][1] - top[1][1]),
+        ),
+      ),
+      pointFromVector(
+        offsets[1],
+        pointFrom<GlobalPoint>(
+          right[0][0] + (2 / 3) * (r[1][0] - right[0][0]),
+          right[0][1] + (2 / 3) * (r[0][1] - right[0][1]),
+        ),
+      ),
+      pointFromVector(offsets[1], right[0]),
+    ), // TOP RIGHT
+    curve(
+      pointFromVector(offsets[2], right[1]),
+      pointFromVector(
+        offsets[2],
+        pointFrom<GlobalPoint>(
+          right[1][0] + (2 / 3) * (r[1][0] - right[1][0]),
+          right[1][1] + (2 / 3) * (r[1][1] - right[1][1]),
+        ),
+      ),
+      pointFromVector(
+        offsets[2],
+        pointFrom<GlobalPoint>(
+          bottom[1][0] + (2 / 3) * (r[1][0] - bottom[1][0]),
+          bottom[1][1] + (2 / 3) * (r[1][1] - bottom[1][1]),
+        ),
+      ),
+      pointFromVector(offsets[2], bottom[1]),
+    ), // BOTTOM RIGHT
+    curve(
+      pointFromVector(offsets[3], bottom[0]),
+      pointFromVector(
+        offsets[3],
+        pointFrom<GlobalPoint>(
+          bottom[0][0] + (2 / 3) * (r[0][0] - bottom[0][0]),
+          bottom[0][1] + (2 / 3) * (r[1][1] - bottom[0][1]),
+        ),
+      ),
+      pointFromVector(
+        offsets[3],
+        pointFrom<GlobalPoint>(
+          left[0][0] + (2 / 3) * (r[0][0] - left[0][0]),
+          left[0][1] + (2 / 3) * (r[1][1] - left[0][1]),
+        ),
+      ),
+      pointFromVector(offsets[3], left[0]),
+    ), // BOTTOM LEFT
+  ];
 
   const sides = [
-    lineSegment<GlobalPoint>(
+    lineSegment<GlobalPoint>(corners[0][3], corners[1][0]),
-      corners[0][corners[0].length - 1][3],
+    lineSegment<GlobalPoint>(corners[1][3], corners[2][0]),
-      corners[1][0][0],
+    lineSegment<GlobalPoint>(corners[2][3], corners[3][0]),
-    ),
+    lineSegment<GlobalPoint>(corners[3][3], corners[0][0]),
-    lineSegment<GlobalPoint>(
-      corners[1][corners[1].length - 1][3],
-      corners[2][0][0],
-    ),
-    lineSegment<GlobalPoint>(
-      corners[2][corners[2].length - 1][3],
-      corners[3][0][0],
-    ),
-    lineSegment<GlobalPoint>(
-      corners[3][corners[3].length - 1][3],
-      corners[0][0][0],
-    ),
   ];
-  const shape = [sides, corners.flat()] as ElementShape;
 
-  setElementShapesCacheEntry(element, shape, offset);
+  return [sides, corners];
-
-  return shape;
 }
 
 /**
- * Get the **unrotated** building components of a diamond element
+ * Get the building components of a diamond element in the form of
- * in the form of line segments and curves as a tuple, in this order.
+ * line segments and curves as a tuple, in this order.
  *
  * @param element The element to deconstruct
  * @param offset An optional offset
- * @returns Tuple of line **unrotated** segments (0) and curves (1)
+ * @returns Tuple of line segments (0) and curves (1)
  */
 export function deconstructDiamondElement(
   element: ExcalidrawDiamondElement,
   offset: number = 0,
 ): [LineSegment<GlobalPoint>[], Curve<GlobalPoint>[]] {
-  const cachedShape = getElementShapesCacheEntry(element, offset);
-
-  if (cachedShape) {
-    return cachedShape;
-  }
-
   const [topX, topY, rightX, rightY, bottomX, bottomY, leftX, leftY] =
     getDiamondPoints(element);
-  const verticalRadius = element.roundness
+  const verticalRadius = getCornerRadius(Math.abs(topX - leftX), element);
-    ? getCornerRadius(Math.abs(topX - leftX), element)
+  const horizontalRadius = getCornerRadius(Math.abs(rightY - topY), element);
-    : (topX - leftX) * 0.01;
+
-  const horizontalRadius = element.roundness
+  if (element.roundness?.type == null) {
-    ? getCornerRadius(Math.abs(rightY - topY), element)
+    const [top, right, bottom, left]: GlobalPoint[] = [
-    : (rightY - topY) * 0.01;
+      pointFrom(element.x + topX, element.y + topY - offset),
+      pointFrom(element.x + rightX + offset, element.y + rightY),
+      pointFrom(element.x + bottomX, element.y + bottomY + offset),
+      pointFrom(element.x + leftX - offset, element.y + leftY),
+    ];
+
+    // Create the line segment parts of the diamond
+    // NOTE: Horizontal and vertical seems to be flipped here
+    const topRight = lineSegment<GlobalPoint>(
+      pointFrom(top[0] + verticalRadius, top[1] + horizontalRadius),
+      pointFrom(right[0] - verticalRadius, right[1] - horizontalRadius),
+    );
+    const bottomRight = lineSegment<GlobalPoint>(
+      pointFrom(right[0] - verticalRadius, right[1] + horizontalRadius),
+      pointFrom(bottom[0] + verticalRadius, bottom[1] - horizontalRadius),
+    );
+    const bottomLeft = lineSegment<GlobalPoint>(
+      pointFrom(bottom[0] - verticalRadius, bottom[1] - horizontalRadius),
+      pointFrom(left[0] + verticalRadius, left[1] + horizontalRadius),
+    );
+    const topLeft = lineSegment<GlobalPoint>(
+      pointFrom(left[0] + verticalRadius, left[1] - horizontalRadius),
+      pointFrom(top[0] - verticalRadius, top[1] + horizontalRadius),
+    );
+
+    return [[topRight, bottomRight, bottomLeft, topLeft], []];
+  }
+
+  const center = elementCenterPoint(element);
 
   const [top, right, bottom, left]: GlobalPoint[] = [
     pointFrom(element.x + topX, element.y + topY),
@@ -349,135 +262,94 @@ export function deconstructDiamondElement(
     pointFrom(element.x + leftX, element.y + leftY),
   ];
 
-  const baseCorners = [
+  const offsets = [
+    vectorScale(vectorNormalize(vectorFromPoint(right, center)), offset), // RIGHT
+    vectorScale(vectorNormalize(vectorFromPoint(bottom, center)), offset), // BOTTOM
+    vectorScale(vectorNormalize(vectorFromPoint(left, center)), offset), // LEFT
+    vectorScale(vectorNormalize(vectorFromPoint(top, center)), offset), // TOP
+  ];
+
+  const corners = [
     curve(
-      pointFrom<GlobalPoint>(
+      pointFromVector(
-        right[0] - verticalRadius,
+        offsets[0],
-        right[1] - horizontalRadius,
+        pointFrom<GlobalPoint>(
+          right[0] - verticalRadius,
+          right[1] - horizontalRadius,
+        ),
       ),
-      right,
+      pointFromVector(offsets[0], right),
-      right,
+      pointFromVector(offsets[0], right),
-      pointFrom<GlobalPoint>(
+      pointFromVector(
-        right[0] - verticalRadius,
+        offsets[0],
-        right[1] + horizontalRadius,
+        pointFrom<GlobalPoint>(
+          right[0] - verticalRadius,
+          right[1] + horizontalRadius,
+        ),
       ),
     ), // RIGHT
     curve(
-      pointFrom<GlobalPoint>(
+      pointFromVector(
-        bottom[0] + verticalRadius,
+        offsets[1],
-        bottom[1] - horizontalRadius,
+        pointFrom<GlobalPoint>(
+          bottom[0] + verticalRadius,
+          bottom[1] - horizontalRadius,
+        ),
       ),
-      bottom,
+      pointFromVector(offsets[1], bottom),
-      bottom,
+      pointFromVector(offsets[1], bottom),
-      pointFrom<GlobalPoint>(
+      pointFromVector(
-        bottom[0] - verticalRadius,
+        offsets[1],
-        bottom[1] - horizontalRadius,
+        pointFrom<GlobalPoint>(
+          bottom[0] - verticalRadius,
+          bottom[1] - horizontalRadius,
+        ),
       ),
     ), // BOTTOM
     curve(
-      pointFrom<GlobalPoint>(
+      pointFromVector(
-        left[0] + verticalRadius,
+        offsets[2],
-        left[1] + horizontalRadius,
+        pointFrom<GlobalPoint>(
+          left[0] + verticalRadius,
+          left[1] + horizontalRadius,
+        ),
       ),
-      left,
+      pointFromVector(offsets[2], left),
-      left,
+      pointFromVector(offsets[2], left),
-      pointFrom<GlobalPoint>(
+      pointFromVector(
-        left[0] + verticalRadius,
+        offsets[2],
-        left[1] - horizontalRadius,
+        pointFrom<GlobalPoint>(
+          left[0] + verticalRadius,
+          left[1] - horizontalRadius,
+        ),
       ),
     ), // LEFT
     curve(
-      pointFrom<GlobalPoint>(
+      pointFromVector(
-        top[0] - verticalRadius,
+        offsets[3],
-        top[1] + horizontalRadius,
+        pointFrom<GlobalPoint>(
+          top[0] - verticalRadius,
+          top[1] + horizontalRadius,
+        ),
       ),
-      top,
+      pointFromVector(offsets[3], top),
-      top,
+      pointFromVector(offsets[3], top),
-      pointFrom<GlobalPoint>(
+      pointFromVector(
-        top[0] + verticalRadius,
+        offsets[3],
-        top[1] + horizontalRadius,
+        pointFrom<GlobalPoint>(
+          top[0] + verticalRadius,
+          top[1] + horizontalRadius,
+        ),
       ),
     ), // TOP
   ];
 
-  const corners =
-    offset > 0
-      ? baseCorners.map(
-          (corner) =>
-            curveCatmullRomCubicApproxPoints(
-              curveOffsetPoints(corner, offset),
-            )!,
-        )
-      : [
-          [baseCorners[0]],
-          [baseCorners[1]],
-          [baseCorners[2]],
-          [baseCorners[3]],
-        ];
-
   const sides = [
-    lineSegment<GlobalPoint>(
+    lineSegment<GlobalPoint>(corners[0][3], corners[1][0]),
-      corners[0][corners[0].length - 1][3],
+    lineSegment<GlobalPoint>(corners[1][3], corners[2][0]),
-      corners[1][0][0],
+    lineSegment<GlobalPoint>(corners[2][3], corners[3][0]),
-    ),
+    lineSegment<GlobalPoint>(corners[3][3], corners[0][0]),
-    lineSegment<GlobalPoint>(
-      corners[1][corners[1].length - 1][3],
-      corners[2][0][0],
-    ),
-    lineSegment<GlobalPoint>(
-      corners[2][corners[2].length - 1][3],
-      corners[3][0][0],
-    ),
-    lineSegment<GlobalPoint>(
-      corners[3][corners[3].length - 1][3],
-      corners[0][0][0],
-    ),
   ];
 
-  const shape = [sides, corners.flat()] as ElementShape;
+  return [sides, corners];
-
-  setElementShapesCacheEntry(element, shape, offset);
-
-  return shape;
 }
-
-// Checks if the first and last point are close enough
-// to be considered a loop
-export const isPathALoop = (
-  points: ExcalidrawLinearElement["points"],
-  /** supply if you want the loop detection to account for current zoom */
-  zoomValue: Zoom["value"] = 1 as NormalizedZoomValue,
-): boolean => {
-  if (points.length >= 3) {
-    const [first, last] = [points[0], points[points.length - 1]];
-    const distance = pointDistance(first, last);
-
-    // Adjusting LINE_CONFIRM_THRESHOLD to current zoom so that when zoomed in
-    // really close we make the threshold smaller, and vice versa.
-    return distance <= LINE_CONFIRM_THRESHOLD / zoomValue;
-  }
-  return false;
-};
-
-export const getCornerRadius = (x: number, element: ExcalidrawElement) => {
-  if (
-    element.roundness?.type === ROUNDNESS.PROPORTIONAL_RADIUS ||
-    element.roundness?.type === ROUNDNESS.LEGACY
-  ) {
-    return x * DEFAULT_PROPORTIONAL_RADIUS;
-  }
-
-  if (element.roundness?.type === ROUNDNESS.ADAPTIVE_RADIUS) {
-    const fixedRadiusSize = element.roundness?.value ?? DEFAULT_ADAPTIVE_RADIUS;
-
-    const CUTOFF_SIZE = fixedRadiusSize / DEFAULT_PROPORTIONAL_RADIUS;
-
-    if (x <= CUTOFF_SIZE) {
-      return x * DEFAULT_PROPORTIONAL_RADIUS;
-    }
-
-    return fixedRadiusSize;
-  }
-
-  return 0;
-};

packages/element/tests/__snapshots__/linearElementEditor.test.tsx.snap

@@ -17,7 +17,7 @@ exports[`Test Linear Elements > Test bound text element > should match styles fo
   class="excalidraw-wysiwyg"
   data-type="wysiwyg"
   dir="auto"
-  style="position: absolute; display: inline-block; min-height: 1em; backface-visibility: hidden; margin: 0px; padding: 0px; border: 0px; outline: 0; resize: none; background: transparent; overflow: hidden; z-index: var(--zIndex-wysiwyg); word-break: break-word; white-space: pre-wrap; overflow-wrap: break-word; box-sizing: content-box; width: 10.5px; height: 26.25px; left: 35px; top: 7.5px; transform: translate(0px, 0px) scale(1) rotate(0deg); text-align: center; vertical-align: middle; color: rgb(30, 30, 30); opacity: 1; filter: var(--theme-filter); max-height: 992.5px; font: Emoji 20px 20px; line-height: 1.25; font-family: Excalifont, Xiaolai, sans-serif, Segoe UI Emoji;"
+  style="position: absolute; display: inline-block; min-height: 1em; backface-visibility: hidden; margin: 0px; padding: 0px; border: 0px; outline: 0; resize: none; background: transparent; overflow: hidden; z-index: var(--zIndex-wysiwyg); word-break: break-word; white-space: pre-wrap; overflow-wrap: break-word; box-sizing: content-box; width: 10.5px; height: 26.25px; left: 35px; top: 7.5px; transform: translate(0px, 0px) scale(1) rotate(0deg); text-align: center; vertical-align: middle; color: rgb(30, 30, 30); opacity: 1; filter: var(--theme-filter); max-height: 992.5px; font: Emoji 20px 20px; line-height: 1.25; font-family: Excalifont, Xiaolai, Segoe UI Emoji;"
   tabindex="0"
   wrap="off"
 />

packages/element/tests/align.test.tsx

@@ -35,7 +35,6 @@ const createAndSelectTwoRectangles = () => {
   // The second rectangle is already reselected because it was the last element created
   mouse.reset();
   Keyboard.withModifierKeys({ shift: true }, () => {
-    mouse.moveTo(10, 0);
     mouse.click();
   });
 };
@@ -53,7 +52,6 @@ const createAndSelectTwoRectanglesWithDifferentSizes = () => {
   // The second rectangle is already reselected because it was the last element created
   mouse.reset();
   Keyboard.withModifierKeys({ shift: true }, () => {
-    mouse.moveTo(10, 0);
     mouse.click();
   });
 };
@@ -204,7 +202,6 @@ describe("aligning", () => {
     // The second rectangle is already reselected because it was the last element created
     mouse.reset();
     Keyboard.withModifierKeys({ shift: true }, () => {
-      mouse.moveTo(10, 0);
       mouse.click();
     });
 
@@ -218,7 +215,6 @@ describe("aligning", () => {
     // Add the created group to the current selection
     mouse.restorePosition(0, 0);
     Keyboard.withModifierKeys({ shift: true }, () => {
-      mouse.moveTo(10, 0);
       mouse.click();
     });
   };
@@ -320,7 +316,6 @@ describe("aligning", () => {
     // The second rectangle is already selected because it was the last element created
     mouse.reset();
     Keyboard.withModifierKeys({ shift: true }, () => {
-      mouse.moveTo(10, 0);
       mouse.click();
     });
 
@@ -335,7 +330,7 @@ describe("aligning", () => {
     mouse.down();
     mouse.up(100, 100);
 
-    mouse.restorePosition(210, 200);
+    mouse.restorePosition(200, 200);
     Keyboard.withModifierKeys({ shift: true }, () => {
       mouse.click();
     });
@@ -346,7 +341,6 @@ describe("aligning", () => {
     // The second group is already selected because it was the last group created
     mouse.reset();
     Keyboard.withModifierKeys({ shift: true }, () => {
-      mouse.moveTo(10, 0);
       mouse.click();
     });
   };
@@ -460,7 +454,6 @@ describe("aligning", () => {
     // The second rectangle is already reselected because it was the last element created
     mouse.reset();
     Keyboard.withModifierKeys({ shift: true }, () => {
-      mouse.moveTo(10, 0);
       mouse.click();
     });
 
@@ -473,7 +466,7 @@ describe("aligning", () => {
     mouse.up(100, 100);
 
     // Add group to current selection
-    mouse.restorePosition(10, 0);
+    mouse.restorePosition(0, 0);
     Keyboard.withModifierKeys({ shift: true }, () => {
       mouse.click();
     });
@@ -489,7 +482,6 @@ describe("aligning", () => {
     // Select the nested group, the rectangle is already selected
     mouse.reset();
     Keyboard.withModifierKeys({ shift: true }, () => {
-      mouse.moveTo(10, 0);
       mouse.click();
     });
   };
@@ -589,424 +581,4 @@ describe("aligning", () => {
     expect(API.getSelectedElements()[2].x).toEqual(250);
     expect(API.getSelectedElements()[3].x).toEqual(150);
   });
-
-  const createGroupAndSelectInEditGroupMode = () => {
-    UI.clickTool("rectangle");
-    mouse.down();
-    mouse.up(100, 100);
-
-    UI.clickTool("rectangle");
-    mouse.down(0, 0);
-    mouse.up(100, 100);
-
-    // select the first element.
-    // The second rectangle is already reselected because it was the last element created
-    mouse.reset();
-    Keyboard.withModifierKeys({ shift: true }, () => {
-      mouse.moveTo(10, 0);
-      mouse.click();
-    });
-
-    API.executeAction(actionGroup);
-    mouse.reset();
-    mouse.moveTo(10, 0);
-    mouse.doubleClick();
-
-    Keyboard.withModifierKeys({ shift: true }, () => {
-      mouse.click();
-      mouse.moveTo(100, 100);
-      mouse.click();
-    });
-  };
-
-  it("aligns elements within a group while in group edit mode correctly to the top", () => {
-    createGroupAndSelectInEditGroupMode();
-
-    expect(API.getSelectedElements()[0].y).toEqual(0);
-    expect(API.getSelectedElements()[1].y).toEqual(100);
-
-    API.executeAction(actionAlignTop);
-
-    expect(API.getSelectedElements()[0].y).toEqual(0);
-    expect(API.getSelectedElements()[1].y).toEqual(0);
-  });
-  it("aligns elements within a group while in group edit mode correctly to the bottom", () => {
-    createGroupAndSelectInEditGroupMode();
-
-    expect(API.getSelectedElements()[0].y).toEqual(0);
-    expect(API.getSelectedElements()[1].y).toEqual(100);
-
-    API.executeAction(actionAlignBottom);
-
-    expect(API.getSelectedElements()[0].y).toEqual(100);
-    expect(API.getSelectedElements()[1].y).toEqual(100);
-  });
-  it("aligns elements within a group while in group edit mode correctly to the left", () => {
-    createGroupAndSelectInEditGroupMode();
-
-    expect(API.getSelectedElements()[0].x).toEqual(0);
-    expect(API.getSelectedElements()[1].x).toEqual(100);
-
-    API.executeAction(actionAlignLeft);
-
-    expect(API.getSelectedElements()[0].x).toEqual(0);
-    expect(API.getSelectedElements()[1].x).toEqual(0);
-  });
-  it("aligns elements within a group while in group edit mode correctly to the right", () => {
-    createGroupAndSelectInEditGroupMode();
-
-    expect(API.getSelectedElements()[0].x).toEqual(0);
-    expect(API.getSelectedElements()[1].x).toEqual(100);
-
-    API.executeAction(actionAlignRight);
-
-    expect(API.getSelectedElements()[0].x).toEqual(100);
-    expect(API.getSelectedElements()[1].x).toEqual(100);
-  });
-  it("aligns elements within a group while in group edit mode correctly to the vertical center", () => {
-    createGroupAndSelectInEditGroupMode();
-
-    expect(API.getSelectedElements()[0].y).toEqual(0);
-    expect(API.getSelectedElements()[1].y).toEqual(100);
-
-    API.executeAction(actionAlignVerticallyCentered);
-
-    expect(API.getSelectedElements()[0].y).toEqual(50);
-    expect(API.getSelectedElements()[1].y).toEqual(50);
-  });
-  it("aligns elements within a group while in group edit mode correctly to the horizontal center", () => {
-    createGroupAndSelectInEditGroupMode();
-
-    expect(API.getSelectedElements()[0].x).toEqual(0);
-    expect(API.getSelectedElements()[1].x).toEqual(100);
-
-    API.executeAction(actionAlignHorizontallyCentered);
-
-    expect(API.getSelectedElements()[0].x).toEqual(50);
-    expect(API.getSelectedElements()[1].x).toEqual(50);
-  });
-
-  const createNestedGroupAndSelectInEditGroupMode = () => {
-    UI.clickTool("rectangle");
-    mouse.down();
-    mouse.up(100, 100);
-
-    UI.clickTool("rectangle");
-    mouse.down(0, 0);
-    mouse.up(100, 100);
-
-    // Select the first element.
-    // The second rectangle is already reselected because it was the last element created
-    mouse.reset();
-    Keyboard.withModifierKeys({ shift: true }, () => {
-      mouse.moveTo(10, 0);
-      mouse.click();
-    });
-
-    API.executeAction(actionGroup);
-
-    mouse.reset();
-    mouse.moveTo(200, 200);
-    // create third element
-    UI.clickTool("rectangle");
-    mouse.down(0, 0);
-    mouse.up(100, 100);
-
-    // third element is already selected, select the initial group and group together
-    mouse.reset();
-
-    Keyboard.withModifierKeys({ shift: true }, () => {
-      mouse.moveTo(10, 0);
-      mouse.click();
-    });
-
-    API.executeAction(actionGroup);
-
-    // double click to enter edit mode
-    mouse.doubleClick();
-
-    // select nested group and other element within the group
-    Keyboard.withModifierKeys({ shift: true }, () => {
-      mouse.moveTo(200, 200);
-      mouse.click();
-    });
-  };
-
-  it("aligns element and nested group while in group edit mode correctly to the top", () => {
-    createNestedGroupAndSelectInEditGroupMode();
-
-    expect(API.getSelectedElements()[0].y).toEqual(0);
-    expect(API.getSelectedElements()[1].y).toEqual(100);
-    expect(API.getSelectedElements()[2].y).toEqual(200);
-
-    API.executeAction(actionAlignTop);
-
-    expect(API.getSelectedElements()[0].y).toEqual(0);
-    expect(API.getSelectedElements()[1].y).toEqual(100);
-    expect(API.getSelectedElements()[2].y).toEqual(0);
-  });
-  it("aligns element and nested group while in group edit mode correctly to the bottom", () => {
-    createNestedGroupAndSelectInEditGroupMode();
-
-    expect(API.getSelectedElements()[0].y).toEqual(0);
-    expect(API.getSelectedElements()[1].y).toEqual(100);
-    expect(API.getSelectedElements()[2].y).toEqual(200);
-
-    API.executeAction(actionAlignBottom);
-
-    expect(API.getSelectedElements()[0].y).toEqual(100);
-    expect(API.getSelectedElements()[1].y).toEqual(200);
-    expect(API.getSelectedElements()[2].y).toEqual(200);
-  });
-  it("aligns element and nested group while in group edit mode correctly to the left", () => {
-    createNestedGroupAndSelectInEditGroupMode();
-
-    expect(API.getSelectedElements()[0].x).toEqual(0);
-    expect(API.getSelectedElements()[1].x).toEqual(100);
-    expect(API.getSelectedElements()[2].x).toEqual(200);
-
-    API.executeAction(actionAlignLeft);
-
-    expect(API.getSelectedElements()[0].x).toEqual(0);
-    expect(API.getSelectedElements()[1].x).toEqual(100);
-    expect(API.getSelectedElements()[2].x).toEqual(0);
-  });
-  it("aligns element and nested group while in group edit mode correctly to the right", () => {
-    createNestedGroupAndSelectInEditGroupMode();
-
-    expect(API.getSelectedElements()[0].x).toEqual(0);
-    expect(API.getSelectedElements()[1].x).toEqual(100);
-    expect(API.getSelectedElements()[2].x).toEqual(200);
-
-    API.executeAction(actionAlignRight);
-
-    expect(API.getSelectedElements()[0].x).toEqual(100);
-    expect(API.getSelectedElements()[1].x).toEqual(200);
-    expect(API.getSelectedElements()[2].x).toEqual(200);
-  });
-  it("aligns element and nested group while in group edit mode correctly to the vertical center", () => {
-    createNestedGroupAndSelectInEditGroupMode();
-
-    expect(API.getSelectedElements()[0].y).toEqual(0);
-    expect(API.getSelectedElements()[1].y).toEqual(100);
-    expect(API.getSelectedElements()[2].y).toEqual(200);
-
-    API.executeAction(actionAlignVerticallyCentered);
-
-    expect(API.getSelectedElements()[0].y).toEqual(50);
-    expect(API.getSelectedElements()[1].y).toEqual(150);
-    expect(API.getSelectedElements()[2].y).toEqual(100);
-  });
-  it("aligns elements and nested group within a group while in group edit mode correctly to the horizontal center", () => {
-    createNestedGroupAndSelectInEditGroupMode();
-
-    expect(API.getSelectedElements()[0].x).toEqual(0);
-    expect(API.getSelectedElements()[1].x).toEqual(100);
-    expect(API.getSelectedElements()[2].x).toEqual(200);
-
-    API.executeAction(actionAlignHorizontallyCentered);
-
-    expect(API.getSelectedElements()[0].x).toEqual(50);
-    expect(API.getSelectedElements()[1].x).toEqual(150);
-    expect(API.getSelectedElements()[2].x).toEqual(100);
-  });
-
-  const createAndSelectSingleGroup = () => {
-    UI.clickTool("rectangle");
-    mouse.down();
-    mouse.up(100, 100);
-
-    UI.clickTool("rectangle");
-    mouse.down(0, 0);
-    mouse.up(100, 100);
-
-    // Select the first element.
-    // The second rectangle is already reselected because it was the last element created
-    mouse.reset();
-    Keyboard.withModifierKeys({ shift: true }, () => {
-      mouse.moveTo(10, 0);
-      mouse.click();
-    });
-
-    API.executeAction(actionGroup);
-  };
-
-  it("aligns elements within a single-selected group correctly to the top", () => {
-    createAndSelectSingleGroup();
-
-    expect(API.getSelectedElements()[0].y).toEqual(0);
-    expect(API.getSelectedElements()[1].y).toEqual(100);
-
-    API.executeAction(actionAlignTop);
-
-    expect(API.getSelectedElements()[0].y).toEqual(0);
-    expect(API.getSelectedElements()[1].y).toEqual(0);
-  });
-  it("aligns elements within a single-selected group correctly to the bottom", () => {
-    createAndSelectSingleGroup();
-
-    expect(API.getSelectedElements()[0].y).toEqual(0);
-    expect(API.getSelectedElements()[1].y).toEqual(100);
-
-    API.executeAction(actionAlignBottom);
-
-    expect(API.getSelectedElements()[0].y).toEqual(100);
-    expect(API.getSelectedElements()[1].y).toEqual(100);
-  });
-  it("aligns elements within a single-selected group correctly to the left", () => {
-    createAndSelectSingleGroup();
-
-    expect(API.getSelectedElements()[0].x).toEqual(0);
-    expect(API.getSelectedElements()[1].x).toEqual(100);
-
-    API.executeAction(actionAlignLeft);
-
-    expect(API.getSelectedElements()[0].x).toEqual(0);
-    expect(API.getSelectedElements()[1].x).toEqual(0);
-  });
-  it("aligns elements within a single-selected group correctly to the right", () => {
-    createAndSelectSingleGroup();
-
-    expect(API.getSelectedElements()[0].x).toEqual(0);
-    expect(API.getSelectedElements()[1].x).toEqual(100);
-
-    API.executeAction(actionAlignRight);
-
-    expect(API.getSelectedElements()[0].x).toEqual(100);
-    expect(API.getSelectedElements()[1].x).toEqual(100);
-  });
-  it("aligns elements within a single-selected group correctly to the vertical center", () => {
-    createAndSelectSingleGroup();
-
-    expect(API.getSelectedElements()[0].y).toEqual(0);
-    expect(API.getSelectedElements()[1].y).toEqual(100);
-
-    API.executeAction(actionAlignVerticallyCentered);
-
-    expect(API.getSelectedElements()[0].y).toEqual(50);
-    expect(API.getSelectedElements()[1].y).toEqual(50);
-  });
-  it("aligns elements within a single-selected group correctly to the horizontal center", () => {
-    createAndSelectSingleGroup();
-
-    expect(API.getSelectedElements()[0].x).toEqual(0);
-    expect(API.getSelectedElements()[1].x).toEqual(100);
-
-    API.executeAction(actionAlignHorizontallyCentered);
-
-    expect(API.getSelectedElements()[0].x).toEqual(50);
-    expect(API.getSelectedElements()[1].x).toEqual(50);
-  });
-
-  const createAndSelectSingleGroupWithNestedGroup = () => {
-    UI.clickTool("rectangle");
-    mouse.down();
-    mouse.up(100, 100);
-
-    UI.clickTool("rectangle");
-    mouse.down(0, 0);
-    mouse.up(100, 100);
-
-    // Select the first element.
-    // The second rectangle is already reselected because it was the last element created
-    mouse.reset();
-    Keyboard.withModifierKeys({ shift: true }, () => {
-      mouse.moveTo(10, 0);
-      mouse.click();
-    });
-
-    API.executeAction(actionGroup);
-
-    mouse.reset();
-    UI.clickTool("rectangle");
-    mouse.down(200, 200);
-    mouse.up(100, 100);
-
-    // Add group to current selection
-    mouse.restorePosition(10, 0);
-    Keyboard.withModifierKeys({ shift: true }, () => {
-      mouse.click();
-    });
-
-    // Create the nested group
-    API.executeAction(actionGroup);
-  };
-  it("aligns elements within a single-selected group containing a nested group correctly to the top", () => {
-    createAndSelectSingleGroupWithNestedGroup();
-
-    expect(API.getSelectedElements()[0].y).toEqual(0);
-    expect(API.getSelectedElements()[1].y).toEqual(100);
-    expect(API.getSelectedElements()[2].y).toEqual(200);
-
-    API.executeAction(actionAlignTop);
-
-    expect(API.getSelectedElements()[0].y).toEqual(0);
-    expect(API.getSelectedElements()[1].y).toEqual(100);
-    expect(API.getSelectedElements()[2].y).toEqual(0);
-  });
-  it("aligns elements within a single-selected group containing a nested group correctly to the bottom", () => {
-    createAndSelectSingleGroupWithNestedGroup();
-
-    expect(API.getSelectedElements()[0].y).toEqual(0);
-    expect(API.getSelectedElements()[1].y).toEqual(100);
-    expect(API.getSelectedElements()[2].y).toEqual(200);
-
-    API.executeAction(actionAlignBottom);
-
-    expect(API.getSelectedElements()[0].y).toEqual(100);
-    expect(API.getSelectedElements()[1].y).toEqual(200);
-    expect(API.getSelectedElements()[2].y).toEqual(200);
-  });
-  it("aligns elements within a single-selected group containing a nested group correctly to the left", () => {
-    createAndSelectSingleGroupWithNestedGroup();
-
-    expect(API.getSelectedElements()[0].x).toEqual(0);
-    expect(API.getSelectedElements()[1].x).toEqual(100);
-    expect(API.getSelectedElements()[2].x).toEqual(200);
-
-    API.executeAction(actionAlignLeft);
-
-    expect(API.getSelectedElements()[0].x).toEqual(0);
-    expect(API.getSelectedElements()[1].x).toEqual(100);
-    expect(API.getSelectedElements()[2].x).toEqual(0);
-  });
-  it("aligns elements within a single-selected group containing a nested group correctly to the right", () => {
-    createAndSelectSingleGroupWithNestedGroup();
-
-    expect(API.getSelectedElements()[0].x).toEqual(0);
-    expect(API.getSelectedElements()[1].x).toEqual(100);
-    expect(API.getSelectedElements()[2].x).toEqual(200);
-
-    API.executeAction(actionAlignRight);
-
-    expect(API.getSelectedElements()[0].x).toEqual(100);
-    expect(API.getSelectedElements()[1].x).toEqual(200);
-    expect(API.getSelectedElements()[2].x).toEqual(200);
-  });
-  it("aligns elements within a single-selected group containing a nested group correctly to the vertical center", () => {
-    createAndSelectSingleGroupWithNestedGroup();
-
-    expect(API.getSelectedElements()[0].y).toEqual(0);
-    expect(API.getSelectedElements()[1].y).toEqual(100);
-    expect(API.getSelectedElements()[2].y).toEqual(200);
-
-    API.executeAction(actionAlignVerticallyCentered);
-
-    expect(API.getSelectedElements()[0].y).toEqual(50);
-    expect(API.getSelectedElements()[1].y).toEqual(150);
-    expect(API.getSelectedElements()[2].y).toEqual(100);
-  });
-  it("aligns elements within a single-selected group containing a nested group correctly to the horizontal center", () => {
-    createAndSelectSingleGroupWithNestedGroup();
-
-    expect(API.getSelectedElements()[0].x).toEqual(0);
-    expect(API.getSelectedElements()[1].x).toEqual(100);
-    expect(API.getSelectedElements()[2].x).toEqual(200);
-
-    API.executeAction(actionAlignHorizontallyCentered);
-
-    expect(API.getSelectedElements()[0].x).toEqual(50);
-    expect(API.getSelectedElements()[1].x).toEqual(150);
-    expect(API.getSelectedElements()[2].x).toEqual(100);
-  });
 });

packages/element/tests/binding.test.tsx

@@ -10,13 +10,7 @@ import { API } from "@excalidraw/excalidraw/tests/helpers/api";
 import { UI, Pointer, Keyboard } from "@excalidraw/excalidraw/tests/helpers/ui";
 import { fireEvent, render } from "@excalidraw/excalidraw/tests/test-utils";
 
-import { LinearElementEditor } from "@excalidraw/element";
-
 import { getTransformHandles } from "../src/transformHandles";
-import {
-  getTextEditor,
-  TEXT_EDITOR_SELECTOR,
-} from "../../excalidraw/tests/queries/dom";
 
 const { h } = window;
 
@@ -157,10 +151,10 @@ describe("element binding", () => {
       // NOTE this mouse down/up + await needs to be done in order to repro
       // the issue, due to https://github.com/excalidraw/excalidraw/blob/46bff3daceb602accf60c40a84610797260fca94/src/components/App.tsx#L740
       mouse.reset();
-      expect(h.state.selectedLinearElement?.isEditing).toBe(true);
+      expect(h.state.editingLinearElement).not.toBe(null);
       mouse.down(0, 0);
       await new Promise((r) => setTimeout(r, 100));
-      expect(h.state.selectedLinearElement?.isEditing).toBe(false);
+      expect(h.state.editingLinearElement).toBe(null);
       expect(API.getSelectedElement().type).toBe("rectangle");
       mouse.up();
       expect(API.getSelectedElement().type).toBe("rectangle");
@@ -178,12 +172,12 @@ describe("element binding", () => {
     const arrow = UI.createElement("arrow", {
       x: 0,
       y: 0,
-      size: 49,
+      size: 50,
     });
 
     expect(arrow.endBinding).toBe(null);
 
-    mouse.downAt(49, 49);
+    mouse.downAt(50, 50);
     mouse.moveTo(51, 0);
     mouse.up(0, 0);
 
@@ -250,12 +244,18 @@ describe("element binding", () => {
 
     mouse.clickAt(text.x + 50, text.y + 50);
 
-    const editor = await getTextEditor();
+    const editor = document.querySelector(
+      ".excalidraw-textEditorContainer > textarea",
+    ) as HTMLTextAreaElement;
+
+    expect(editor).not.toBe(null);
 
     fireEvent.change(editor, { target: { value: "" } });
     fireEvent.keyDown(editor, { key: KEYS.ESCAPE });
 
-    expect(document.querySelector(TEXT_EDITOR_SELECTOR)).toBe(null);
+    expect(
+      document.querySelector(".excalidraw-textEditorContainer > textarea"),
+    ).toBe(null);
     expect(arrow.endBinding).toBe(null);
   });
 
@@ -285,14 +285,18 @@ describe("element binding", () => {
     UI.clickTool("text");
 
     mouse.clickAt(text.x + 50, text.y + 50);
-    const editor = await getTextEditor();
+    const editor = document.querySelector(
+      ".excalidraw-textEditorContainer > textarea",
+    ) as HTMLTextAreaElement;
 
     expect(editor).not.toBe(null);
 
     fireEvent.change(editor, { target: { value: "asdasdasdasdas" } });
     fireEvent.keyDown(editor, { key: KEYS.ESCAPE });
 
-    expect(document.querySelector(TEXT_EDITOR_SELECTOR)).toBe(null);
+    expect(
+      document.querySelector(".excalidraw-textEditorContainer > textarea"),
+    ).toBe(null);
     expect(arrow.endBinding?.elementId).toBe(text.id);
   });
 
@@ -415,12 +419,16 @@ describe("element binding", () => {
     expect(arrow.endBinding?.elementId).toBe(rectRight.id);
 
     // Drag arrow off of bound rectangle range
-    const [elX, elY] = LinearElementEditor.getPointAtIndexGlobalCoordinates(
+    const handles = getTransformHandles(
       arrow,
-      -1,
+      h.state.zoom,
-      h.scene.getNonDeletedElementsMap(),
+      arrayToMap(h.elements),
-    );
+      "mouse",
+    ).se!;
+
     Keyboard.keyDown(KEYS.CTRL_OR_CMD);
+    const elX = handles[0] + handles[2] / 2;
+    const elY = handles[1] + handles[3] / 2;
     mouse.downAt(elX, elY);
     mouse.moveTo(300, 400);
     mouse.up();

packages/element/tests/collision.test.tsx

@@ -1,38 +0,0 @@
-import { type GlobalPoint, type LocalPoint, pointFrom } from "@excalidraw/math";
-import { Excalidraw } from "@excalidraw/excalidraw";
-import { UI } from "@excalidraw/excalidraw/tests/helpers/ui";
-import "@excalidraw/utils/test-utils";
-import { render } from "@excalidraw/excalidraw/tests/test-utils";
-
-import { hitElementItself } from "../src/collision";
-
-describe("check rotated elements can be hit:", () => {
-  beforeEach(async () => {
-    localStorage.clear();
-    await render(<Excalidraw handleKeyboardGlobally={true} />);
-  });
-
-  it("arrow", () => {
-    UI.createElement("arrow", {
-      x: 0,
-      y: 0,
-      width: 124,
-      height: 302,
-      angle: 1.8700426423973724,
-      points: [
-        [0, 0],
-        [120, -198],
-        [-4, -302],
-      ] as LocalPoint[],
-    });
-    //const p = [120, -211];
-    //const p = [0, 13];
-    const hit = hitElementItself({
-      point: pointFrom<GlobalPoint>(88, -68),
-      element: window.h.elements[0],
-      threshold: 10,
-      elementsMap: window.h.scene.getNonDeletedElementsMap(),
-    });
-    expect(hit).toBe(true);
-  });
-});

packages/element/tests/delta.test.tsx

@@ -1,345 +1,13 @@
-import { API } from "@excalidraw/excalidraw/tests/helpers/api";
-
 import type { ObservedAppState } from "@excalidraw/excalidraw/types";
 import type { LinearElementEditor } from "@excalidraw/element";
-import type { SceneElementsMap } from "@excalidraw/element/types";
 
-import { AppStateDelta, Delta, ElementsDelta } from "../src/delta";
+import { AppStateDelta } from "../src/delta";
-
-describe("ElementsDelta", () => {
-  describe("elements delta calculation", () => {
-    it("should not throw when element gets removed but was already deleted", () => {
-      const element = API.createElement({
-        type: "rectangle",
-        x: 100,
-        y: 100,
-        isDeleted: true,
-      });
-
-      const prevElements = new Map([[element.id, element]]);
-      const nextElements = new Map();
-
-      expect(() =>
-        ElementsDelta.calculate(prevElements, nextElements),
-      ).not.toThrow();
-    });
-
-    it("should not throw when adding element as already deleted", () => {
-      const element = API.createElement({
-        type: "rectangle",
-        x: 100,
-        y: 100,
-        isDeleted: true,
-      });
-
-      const prevElements = new Map();
-      const nextElements = new Map([[element.id, element]]);
-
-      expect(() =>
-        ElementsDelta.calculate(prevElements, nextElements),
-      ).not.toThrow();
-    });
-
-    it("should create updated delta even when there is only version and versionNonce change", () => {
-      const baseElement = API.createElement({
-        type: "rectangle",
-        x: 100,
-        y: 100,
-        strokeColor: "#000000",
-        backgroundColor: "#ffffff",
-      });
-
-      const modifiedElement = {
-        ...baseElement,
-        version: baseElement.version + 1,
-        versionNonce: baseElement.versionNonce + 1,
-      };
-
-      // Create maps for the delta calculation
-      const prevElements = new Map([[baseElement.id, baseElement]]);
-      const nextElements = new Map([[modifiedElement.id, modifiedElement]]);
-
-      // Calculate the delta
-      const delta = ElementsDelta.calculate(
-        prevElements as SceneElementsMap,
-        nextElements as SceneElementsMap,
-      );
-
-      expect(delta).toEqual(
-        ElementsDelta.create(
-          {},
-          {},
-          {
-            [baseElement.id]: Delta.create(
-              {
-                version: baseElement.version,
-                versionNonce: baseElement.versionNonce,
-              },
-              {
-                version: baseElement.version + 1,
-                versionNonce: baseElement.versionNonce + 1,
-              },
-            ),
-          },
-        ),
-      );
-    });
-  });
-
-  describe("squash", () => {
-    it("should not squash when second delta is empty", () => {
-      const updatedDelta = Delta.create(
-        { x: 100, version: 1, versionNonce: 1 },
-        { x: 200, version: 2, versionNonce: 2 },
-      );
-
-      const elementsDelta1 = ElementsDelta.create(
-        {},
-        {},
-        { id1: updatedDelta },
-      );
-      const elementsDelta2 = ElementsDelta.empty();
-      const elementsDelta = elementsDelta1.squash(elementsDelta2);
-
-      expect(elementsDelta.isEmpty()).toBeFalsy();
-      expect(elementsDelta).toBe(elementsDelta1);
-      expect(elementsDelta.updated.id1).toBe(updatedDelta);
-    });
-
-    it("should squash mutually exclusive delta types", () => {
-      const addedDelta = Delta.create(
-        { x: 100, version: 1, versionNonce: 1, isDeleted: true },
-        { x: 200, version: 2, versionNonce: 2, isDeleted: false },
-      );
-
-      const removedDelta = Delta.create(
-        { x: 100, version: 1, versionNonce: 1, isDeleted: false },
-        { x: 200, version: 2, versionNonce: 2, isDeleted: true },
-      );
-
-      const updatedDelta = Delta.create(
-        { x: 100, version: 1, versionNonce: 1 },
-        { x: 200, version: 2, versionNonce: 2 },
-      );
-
-      const elementsDelta1 = ElementsDelta.create(
-        { id1: addedDelta },
-        { id2: removedDelta },
-        {},
-      );
-
-      const elementsDelta2 = ElementsDelta.create(
-        {},
-        {},
-        { id3: updatedDelta },
-      );
-
-      const elementsDelta = elementsDelta1.squash(elementsDelta2);
-
-      expect(elementsDelta.isEmpty()).toBeFalsy();
-      expect(elementsDelta).toBe(elementsDelta1);
-      expect(elementsDelta.added.id1).toBe(addedDelta);
-      expect(elementsDelta.removed.id2).toBe(removedDelta);
-      expect(elementsDelta.updated.id3).toBe(updatedDelta);
-    });
-
-    it("should squash the same delta types", () => {
-      const elementsDelta1 = ElementsDelta.create(
-        {
-          id1: Delta.create(
-            { x: 100, version: 1, versionNonce: 1, isDeleted: true },
-            { x: 200, version: 2, versionNonce: 2, isDeleted: false },
-          ),
-        },
-        {
-          id2: Delta.create(
-            { x: 100, version: 1, versionNonce: 1, isDeleted: false },
-            { x: 200, version: 2, versionNonce: 2, isDeleted: true },
-          ),
-        },
-        {
-          id3: Delta.create(
-            { x: 100, version: 1, versionNonce: 1 },
-            { x: 200, version: 2, versionNonce: 2 },
-          ),
-        },
-      );
-
-      const elementsDelta2 = ElementsDelta.create(
-        {
-          id1: Delta.create(
-            { y: 100, version: 2, versionNonce: 2, isDeleted: true },
-            { y: 200, version: 3, versionNonce: 3, isDeleted: false },
-          ),
-        },
-        {
-          id2: Delta.create(
-            { y: 100, version: 2, versionNonce: 2, isDeleted: false },
-            { y: 200, version: 3, versionNonce: 3, isDeleted: true },
-          ),
-        },
-        {
-          id3: Delta.create(
-            { y: 100, version: 2, versionNonce: 2 },
-            { y: 200, version: 3, versionNonce: 3 },
-          ),
-        },
-      );
-
-      const elementsDelta = elementsDelta1.squash(elementsDelta2);
-
-      expect(elementsDelta.isEmpty()).toBeFalsy();
-      expect(elementsDelta).toBe(elementsDelta1);
-      expect(elementsDelta.added.id1).toEqual(
-        Delta.create(
-          { x: 100, y: 100, version: 2, versionNonce: 2, isDeleted: true },
-          { x: 200, y: 200, version: 3, versionNonce: 3, isDeleted: false },
-        ),
-      );
-      expect(elementsDelta.removed.id2).toEqual(
-        Delta.create(
-          { x: 100, y: 100, version: 2, versionNonce: 2, isDeleted: false },
-          { x: 200, y: 200, version: 3, versionNonce: 3, isDeleted: true },
-        ),
-      );
-      expect(elementsDelta.updated.id3).toEqual(
-        Delta.create(
-          { x: 100, y: 100, version: 2, versionNonce: 2 },
-          { x: 200, y: 200, version: 3, versionNonce: 3 },
-        ),
-      );
-    });
-
-    it("should squash different delta types ", () => {
-      // id1: added   -> updated => added
-      // id2: removed -> added   => added
-      // id3: updated -> removed => removed
-      const elementsDelta1 = ElementsDelta.create(
-        {
-          id1: Delta.create(
-            { x: 100, version: 1, versionNonce: 1, isDeleted: true },
-            { x: 101, version: 2, versionNonce: 2, isDeleted: false },
-          ),
-        },
-        {
-          id2: Delta.create(
-            { x: 200, version: 1, versionNonce: 1, isDeleted: false },
-            { x: 201, version: 2, versionNonce: 2, isDeleted: true },
-          ),
-        },
-        {
-          id3: Delta.create(
-            { x: 300, version: 1, versionNonce: 1 },
-            { x: 301, version: 2, versionNonce: 2 },
-          ),
-        },
-      );
-
-      const elementsDelta2 = ElementsDelta.create(
-        {
-          id2: Delta.create(
-            { y: 200, version: 2, versionNonce: 2, isDeleted: true },
-            { y: 201, version: 3, versionNonce: 3, isDeleted: false },
-          ),
-        },
-        {
-          id3: Delta.create(
-            { y: 300, version: 2, versionNonce: 2, isDeleted: false },
-            { y: 301, version: 3, versionNonce: 3, isDeleted: true },
-          ),
-        },
-        {
-          id1: Delta.create(
-            { y: 100, version: 2, versionNonce: 2 },
-            { y: 101, version: 3, versionNonce: 3 },
-          ),
-        },
-      );
-
-      const elementsDelta = elementsDelta1.squash(elementsDelta2);
-
-      expect(elementsDelta.isEmpty()).toBeFalsy();
-      expect(elementsDelta).toBe(elementsDelta1);
-      expect(elementsDelta.added).toEqual({
-        id1: Delta.create(
-          { x: 100, y: 100, version: 2, versionNonce: 2, isDeleted: true },
-          { x: 101, y: 101, version: 3, versionNonce: 3, isDeleted: false },
-        ),
-        id2: Delta.create(
-          { x: 200, y: 200, version: 2, versionNonce: 2, isDeleted: true },
-          { x: 201, y: 201, version: 3, versionNonce: 3, isDeleted: false },
-        ),
-      });
-      expect(elementsDelta.removed).toEqual({
-        id3: Delta.create(
-          { x: 300, y: 300, version: 2, versionNonce: 2, isDeleted: false },
-          { x: 301, y: 301, version: 3, versionNonce: 3, isDeleted: true },
-        ),
-      });
-      expect(elementsDelta.updated).toEqual({});
-    });
-
-    it("should squash bound elements", () => {
-      const elementsDelta1 = ElementsDelta.create(
-        {},
-        {},
-        {
-          id1: Delta.create(
-            {
-              version: 1,
-              versionNonce: 1,
-              boundElements: [{ id: "t1", type: "text" }],
-            },
-            {
-              version: 2,
-              versionNonce: 2,
-              boundElements: [{ id: "t2", type: "text" }],
-            },
-          ),
-        },
-      );
-
-      const elementsDelta2 = ElementsDelta.create(
-        {},
-        {},
-        {
-          id1: Delta.create(
-            {
-              version: 2,
-              versionNonce: 2,
-              boundElements: [{ id: "a1", type: "arrow" }],
-            },
-            {
-              version: 3,
-              versionNonce: 3,
-              boundElements: [{ id: "a2", type: "arrow" }],
-            },
-          ),
-        },
-      );
-
-      const elementsDelta = elementsDelta1.squash(elementsDelta2);
-
-      expect(elementsDelta.updated.id1.deleted.boundElements).toEqual([
-        { id: "t1", type: "text" },
-        { id: "a1", type: "arrow" },
-      ]);
-      expect(elementsDelta.updated.id1.inserted.boundElements).toEqual([
-        { id: "t2", type: "text" },
-        { id: "a2", type: "arrow" },
-      ]);
-    });
-  });
-});
 
 describe("AppStateDelta", () => {
   describe("ensure stable delta properties order", () => {
     it("should maintain stable order for root properties", () => {
       const name = "untitled scene";
-      const selectedLinearElement = {
+      const selectedLinearElementId = "id1" as LinearElementEditor["elementId"];
-        elementId: "id1" as LinearElementEditor["elementId"],
-        isEditing: false,
-      };
 
       const commonAppState = {
         viewBackgroundColor: "#ffffff",
@@ -348,7 +16,6 @@ describe("AppStateDelta", () => {
         editingGroupId: null,
         croppingElementId: null,
         editingLinearElementId: null,
-        selectedLinearElementIsEditing: null,
         lockedMultiSelections: {},
         activeLockedId: null,
       };
@@ -356,23 +23,23 @@ describe("AppStateDelta", () => {
       const prevAppState1: ObservedAppState = {
         ...commonAppState,
         name: "",
-        selectedLinearElement: null,
+        selectedLinearElementId: null,
       };
 
       const nextAppState1: ObservedAppState = {
         ...commonAppState,
         name,
-        selectedLinearElement,
+        selectedLinearElementId,
       };
 
       const prevAppState2: ObservedAppState = {
-        selectedLinearElement: null,
+        selectedLinearElementId: null,
         name: "",
         ...commonAppState,
       };
 
       const nextAppState2: ObservedAppState = {
-        selectedLinearElement,
+        selectedLinearElementId,
         name,
         ...commonAppState,
       };
@@ -390,7 +57,8 @@ describe("AppStateDelta", () => {
         selectedGroupIds: {},
         editingGroupId: null,
         croppingElementId: null,
-        selectedLinearElement: null,
+        selectedLinearElementId: null,
+        editingLinearElementId: null,
         activeLockedId: null,
         lockedMultiSelections: {},
       };
@@ -436,7 +104,8 @@ describe("AppStateDelta", () => {
         selectedElementIds: {},
         editingGroupId: null,
         croppingElementId: null,
-        selectedLinearElement: null,
+        selectedLinearElementId: null,
+        editingLinearElementId: null,
         activeLockedId: null,
         lockedMultiSelections: {},
       };
@@ -477,97 +146,4 @@ describe("AppStateDelta", () => {
       expect(JSON.stringify(delta1)).toBe(JSON.stringify(delta2));
     });
   });
-
-  describe("squash", () => {
-    it("should not squash when second delta is empty", () => {
-      const delta = Delta.create(
-        { name: "untitled scene" },
-        { name: "titled scene" },
-      );
-
-      const appStateDelta1 = AppStateDelta.create(delta);
-      const appStateDelta2 = AppStateDelta.empty();
-      const appStateDelta = appStateDelta1.squash(appStateDelta2);
-
-      expect(appStateDelta.isEmpty()).toBeFalsy();
-      expect(appStateDelta).toBe(appStateDelta1);
-      expect(appStateDelta.delta).toBe(delta);
-    });
-
-    it("should squash exclusive properties", () => {
-      const delta1 = Delta.create(
-        { name: "untitled scene" },
-        { name: "titled scene" },
-      );
-      const delta2 = Delta.create(
-        { viewBackgroundColor: "#ffffff" },
-        { viewBackgroundColor: "#000000" },
-      );
-
-      const appStateDelta1 = AppStateDelta.create(delta1);
-      const appStateDelta2 = AppStateDelta.create(delta2);
-      const appStateDelta = appStateDelta1.squash(appStateDelta2);
-
-      expect(appStateDelta.isEmpty()).toBeFalsy();
-      expect(appStateDelta).toBe(appStateDelta1);
-      expect(appStateDelta.delta).toEqual(
-        Delta.create(
-          { name: "untitled scene", viewBackgroundColor: "#ffffff" },
-          { name: "titled scene", viewBackgroundColor: "#000000" },
-        ),
-      );
-    });
-
-    it("should squash selectedElementIds, selectedGroupIds and lockedMultiSelections", () => {
-      const delta1 = Delta.create<Partial<ObservedAppState>>(
-        {
-          name: "untitled scene",
-          selectedElementIds: { id1: true },
-          selectedGroupIds: {},
-          lockedMultiSelections: { g1: true },
-        },
-        {
-          name: "titled scene",
-          selectedElementIds: { id2: true },
-          selectedGroupIds: { g1: true },
-          lockedMultiSelections: {},
-        },
-      );
-      const delta2 = Delta.create<Partial<ObservedAppState>>(
-        {
-          selectedElementIds: { id3: true },
-          selectedGroupIds: { g1: true },
-          lockedMultiSelections: {},
-        },
-        {
-          selectedElementIds: { id2: true },
-          selectedGroupIds: { g2: true, g3: true },
-          lockedMultiSelections: { g3: true },
-        },
-      );
-
-      const appStateDelta1 = AppStateDelta.create(delta1);
-      const appStateDelta2 = AppStateDelta.create(delta2);
-      const appStateDelta = appStateDelta1.squash(appStateDelta2);
-
-      expect(appStateDelta.isEmpty()).toBeFalsy();
-      expect(appStateDelta).toBe(appStateDelta1);
-      expect(appStateDelta.delta).toEqual(
-        Delta.create<Partial<ObservedAppState>>(
-          {
-            name: "untitled scene",
-            selectedElementIds: { id1: true, id3: true },
-            selectedGroupIds: { g1: true },
-            lockedMultiSelections: { g1: true },
-          },
-          {
-            name: "titled scene",
-            selectedElementIds: { id2: true },
-            selectedGroupIds: { g1: true, g2: true, g3: true },
-            lockedMultiSelections: { g3: true },
-          },
-        ),
-      );
-    });
-  });
 });

packages/element/tests/distribute.test.tsx

@@ -1,128 +0,0 @@
-import {
-  distributeHorizontally,
-  distributeVertically,
-} from "@excalidraw/excalidraw/actions";
-import { defaultLang, setLanguage } from "@excalidraw/excalidraw/i18n";
-import { Excalidraw } from "@excalidraw/excalidraw";
-
-import { API } from "@excalidraw/excalidraw/tests/helpers/api";
-import { UI, Pointer, Keyboard } from "@excalidraw/excalidraw/tests/helpers/ui";
-import {
-  act,
-  unmountComponent,
-  render,
-} from "@excalidraw/excalidraw/tests/test-utils";
-
-const mouse = new Pointer("mouse");
-
-// Scenario: three rectangles that will be distributed with gaps
-const createAndSelectThreeRectanglesWithGap = () => {
-  UI.clickTool("rectangle");
-  mouse.down();
-  mouse.up(100, 100);
-  mouse.reset();
-
-  UI.clickTool("rectangle");
-  mouse.down(10, 10);
-  mouse.up(100, 100);
-  mouse.reset();
-
-  UI.clickTool("rectangle");
-  mouse.down(300, 300);
-  mouse.up(100, 100);
-  mouse.reset();
-
-  // Last rectangle is selected by default
-  Keyboard.withModifierKeys({ shift: true }, () => {
-    mouse.click(0, 10);
-    mouse.click(10, 0);
-  });
-};
-
-// Scenario: three rectangles that will be distributed by their centers
-const createAndSelectThreeRectanglesWithoutGap = () => {
-  UI.clickTool("rectangle");
-  mouse.down();
-  mouse.up(100, 100);
-  mouse.reset();
-
-  UI.clickTool("rectangle");
-  mouse.down(10, 10);
-  mouse.up(200, 200);
-  mouse.reset();
-
-  UI.clickTool("rectangle");
-  mouse.down(200, 200);
-  mouse.up(100, 100);
-  mouse.reset();
-
-  // Last rectangle is selected by default
-  Keyboard.withModifierKeys({ shift: true }, () => {
-    mouse.click(0, 10);
-    mouse.click(10, 0);
-  });
-};
-
-describe("distributing", () => {
-  beforeEach(async () => {
-    unmountComponent();
-    mouse.reset();
-
-    await act(() => {
-      return setLanguage(defaultLang);
-    });
-    await render(<Excalidraw handleKeyboardGlobally={true} />);
-  });
-
-  it("should distribute selected elements horizontally", async () => {
-    createAndSelectThreeRectanglesWithGap();
-    expect(API.getSelectedElements()[0].x).toEqual(0);
-    expect(API.getSelectedElements()[1].x).toEqual(10);
-    expect(API.getSelectedElements()[2].x).toEqual(300);
-
-    API.executeAction(distributeHorizontally);
-
-    expect(API.getSelectedElements()[0].x).toEqual(0);
-    expect(API.getSelectedElements()[1].x).toEqual(150);
-    expect(API.getSelectedElements()[2].x).toEqual(300);
-  });
-
-  it("should distribute selected elements vertically", async () => {
-    createAndSelectThreeRectanglesWithGap();
-    expect(API.getSelectedElements()[0].y).toEqual(0);
-    expect(API.getSelectedElements()[1].y).toEqual(10);
-    expect(API.getSelectedElements()[2].y).toEqual(300);
-
-    API.executeAction(distributeVertically);
-
-    expect(API.getSelectedElements()[0].y).toEqual(0);
-    expect(API.getSelectedElements()[1].y).toEqual(150);
-    expect(API.getSelectedElements()[2].y).toEqual(300);
-  });
-
-  it("should distribute selected elements horizontally based on their centers", async () => {
-    createAndSelectThreeRectanglesWithoutGap();
-    expect(API.getSelectedElements()[0].x).toEqual(0);
-    expect(API.getSelectedElements()[1].x).toEqual(10);
-    expect(API.getSelectedElements()[2].x).toEqual(200);
-
-    API.executeAction(distributeHorizontally);
-
-    expect(API.getSelectedElements()[0].x).toEqual(0);
-    expect(API.getSelectedElements()[1].x).toEqual(50);
-    expect(API.getSelectedElements()[2].x).toEqual(200);
-  });
-
-  it("should distribute selected elements vertically with based on their centers", async () => {
-    createAndSelectThreeRectanglesWithoutGap();
-    expect(API.getSelectedElements()[0].y).toEqual(0);
-    expect(API.getSelectedElements()[1].y).toEqual(10);
-    expect(API.getSelectedElements()[2].y).toEqual(200);
-
-    API.executeAction(distributeVertically);
-
-    expect(API.getSelectedElements()[0].y).toEqual(0);
-    expect(API.getSelectedElements()[1].y).toEqual(50);
-    expect(API.getSelectedElements()[2].y).toEqual(200);
-  });
-});

packages/element/tests/duplicate.test.tsx

@@ -505,6 +505,8 @@ describe("group-related duplication", () => {
       mouse.up(frame.x + frame.width + 50, frame.y + frame.height + 50);
     });
 
+    // console.log(h.elements);
+
     assertElements(h.elements, [
       { id: frame.id },
       { id: rectangle1.id, frameId: frame.id },

packages/element/tests/embeddable.test.ts

@@ -1,153 +0,0 @@
-import { getEmbedLink } from "../src/embeddable";
-
-describe("YouTube timestamp parsing", () => {
-  it("should parse YouTube URLs with timestamp in seconds", () => {
-    const testCases = [
-      {
-        url: "https://www.youtube.com/watch?v=dQw4w9WgXcQ&t=90",
-        expectedStart: 90,
-      },
-      {
-        url: "https://youtu.be/dQw4w9WgXcQ?t=120",
-        expectedStart: 120,
-      },
-      {
-        url: "https://www.youtube.com/watch?v=dQw4w9WgXcQ&start=150",
-        expectedStart: 150,
-      },
-    ];
-
-    testCases.forEach(({ url, expectedStart }) => {
-      const result = getEmbedLink(url);
-      expect(result).toBeTruthy();
-      expect(result?.type).toBe("video");
-      if (result?.type === "video" || result?.type === "generic") {
-        expect(result.link).toContain(`start=${expectedStart}`);
-      }
-    });
-  });
-
-  it("should parse YouTube URLs with timestamp in time format", () => {
-    const testCases = [
-      {
-        url: "https://www.youtube.com/watch?v=dQw4w9WgXcQ&t=1m30s",
-        expectedStart: 90, // 1*60 + 30
-      },
-      {
-        url: "https://youtu.be/dQw4w9WgXcQ?t=2m45s",
-        expectedStart: 165, // 2*60 + 45
-      },
-      {
-        url: "https://www.youtube.com/watch?v=dQw4w9WgXcQ&t=1h2m3s",
-        expectedStart: 3723, // 1*3600 + 2*60 + 3
-      },
-      {
-        url: "https://www.youtube.com/watch?v=dQw4w9WgXcQ&t=45s",
-        expectedStart: 45,
-      },
-      {
-        url: "https://www.youtube.com/watch?v=dQw4w9WgXcQ&t=5m",
-        expectedStart: 300, // 5*60
-      },
-      {
-        url: "https://www.youtube.com/watch?v=dQw4w9WgXcQ&t=2h",
-        expectedStart: 7200, // 2*3600
-      },
-    ];
-
-    testCases.forEach(({ url, expectedStart }) => {
-      const result = getEmbedLink(url);
-      expect(result).toBeTruthy();
-      expect(result?.type).toBe("video");
-      if (result?.type === "video" || result?.type === "generic") {
-        expect(result.link).toContain(`start=${expectedStart}`);
-      }
-    });
-  });
-
-  it("should handle YouTube URLs without timestamps", () => {
-    const testCases = [
-      "https://www.youtube.com/watch?v=dQw4w9WgXcQ",
-      "https://youtu.be/dQw4w9WgXcQ",
-      "https://www.youtube.com/embed/dQw4w9WgXcQ",
-    ];
-
-    testCases.forEach((url) => {
-      const result = getEmbedLink(url);
-      expect(result).toBeTruthy();
-      expect(result?.type).toBe("video");
-      if (result?.type === "video" || result?.type === "generic") {
-        expect(result.link).not.toContain("start=");
-      }
-    });
-  });
-
-  it("should handle YouTube shorts URLs with timestamps", () => {
-    const url = "https://www.youtube.com/shorts/dQw4w9WgXcQ?t=30";
-    const result = getEmbedLink(url);
-
-    expect(result).toBeTruthy();
-    expect(result?.type).toBe("video");
-    if (result?.type === "video" || result?.type === "generic") {
-      expect(result.link).toContain("start=30");
-    }
-    // Shorts should have portrait aspect ratio
-    expect(result?.intrinsicSize).toEqual({ w: 315, h: 560 });
-  });
-
-  it("should handle playlist URLs with timestamps", () => {
-    const url =
-      "https://www.youtube.com/playlist?list=PLrAXtmRdnEQy1KbG5lbfgQ0-PKQY6FKYZ&t=60";
-    const result = getEmbedLink(url);
-
-    expect(result).toBeTruthy();
-    expect(result?.type).toBe("video");
-    if (result?.type === "video" || result?.type === "generic") {
-      expect(result.link).toContain("start=60");
-      expect(result.link).toContain("list=PLrAXtmRdnEQy1KbG5lbfgQ0-PKQY6FKYZ");
-    }
-  });
-
-  it("should handle malformed or edge case timestamps", () => {
-    const testCases = [
-      {
-        url: "https://www.youtube.com/watch?v=dQw4w9WgXcQ&t=abc",
-        expectedStart: 0, // Invalid timestamp should default to 0
-      },
-      {
-        url: "https://www.youtube.com/watch?v=dQw4w9WgXcQ&t=",
-        expectedStart: 0, // Empty timestamp should default to 0
-      },
-      {
-        url: "https://www.youtube.com/watch?v=dQw4w9WgXcQ&t=0",
-        expectedStart: 0, // Zero timestamp should be handled
-      },
-    ];
-
-    testCases.forEach(({ url, expectedStart }) => {
-      const result = getEmbedLink(url);
-      expect(result).toBeTruthy();
-      expect(result?.type).toBe("video");
-      if (result?.type === "video" || result?.type === "generic") {
-        if (expectedStart === 0) {
-          expect(result.link).not.toContain("start=");
-        } else {
-          expect(result.link).toContain(`start=${expectedStart}`);
-        }
-      }
-    });
-  });
-
-  it("should preserve other URL parameters", () => {
-    const url =
-      "https://www.youtube.com/watch?v=dQw4w9WgXcQ&t=90&feature=youtu.be&list=PLtest";
-    const result = getEmbedLink(url);
-
-    expect(result).toBeTruthy();
-    expect(result?.type).toBe("video");
-    if (result?.type === "video" || result?.type === "generic") {
-      expect(result.link).toContain("start=90");
-      expect(result.link).toContain("enablejsapi=1");
-    }
-  });
-});

packages/element/tests/linearElementEditor.test.tsx

@@ -1,5 +1,6 @@
 import { pointCenter, pointFrom } from "@excalidraw/math";
 import { act, queryByTestId, queryByText } from "@testing-library/react";
+import React from "react";
 import { vi } from "vitest";
 
 import {
@@ -32,11 +33,6 @@ import { getBoundTextElementPosition, getBoundTextMaxWidth } from "../src";
 import { LinearElementEditor } from "../src";
 import { newArrowElement } from "../src";
 
-import {
-  getTextEditor,
-  TEXT_EDITOR_SELECTOR,
-} from "../../excalidraw/tests/queries/dom";
-
 import type {
   ExcalidrawElement,
   ExcalidrawLinearElement,
@@ -136,8 +132,7 @@ describe("Test Linear Elements", () => {
     Keyboard.withModifierKeys({ ctrl: true }, () => {
       Keyboard.keyPress(KEYS.ENTER);
     });
-    expect(h.state.selectedLinearElement?.isEditing).toBe(true);
+    expect(h.state.editingLinearElement?.elementId).toEqual(line.id);
-    expect(h.state.selectedLinearElement?.elementId).toEqual(line.id);
   };
 
   const drag = (startPoint: GlobalPoint, endPoint: GlobalPoint) => {
@@ -254,99 +249,17 @@ describe("Test Linear Elements", () => {
     });
     fireEvent.click(queryByText(contextMenu as HTMLElement, "Edit line")!);
 
-    expect(h.state.selectedLinearElement?.isEditing).toBe(true);
+    expect(h.state.editingLinearElement?.elementId).toEqual(h.elements[0].id);
-    expect(h.state.selectedLinearElement?.elementId).toEqual(h.elements[0].id);
   });
 
-  it("should enter line editor via enter (line)", () => {
+  it("should enter line editor when using double clicked with ctrl key", () => {
     createTwoPointerLinearElement("line");
-    expect(h.state.selectedLinearElement?.isEditing).toBe(false);
+    expect(h.state.editingLinearElement?.elementId).toBeUndefined();
-
-    mouse.clickAt(midpoint[0], midpoint[1]);
-    Keyboard.keyPress(KEYS.ENTER);
-    expect(h.state.selectedLinearElement?.isEditing).toBe(true);
-    expect(h.state.selectedLinearElement?.elementId).toEqual(h.elements[0].id);
-  });
-
-  // ctrl+enter alias (to align with arrows)
-  it("should enter line editor via ctrl+enter (line)", () => {
-    createTwoPointerLinearElement("line");
-    expect(h.state.selectedLinearElement?.isEditing).toBe(false);
-
-    mouse.clickAt(midpoint[0], midpoint[1]);
-    Keyboard.withModifierKeys({ ctrl: true }, () => {
-      Keyboard.keyPress(KEYS.ENTER);
-    });
-    expect(h.state.selectedLinearElement?.isEditing).toBe(true);
-    expect(h.state.selectedLinearElement?.elementId).toEqual(h.elements[0].id);
-  });
-
-  it("should enter line editor via ctrl+enter (arrow)", () => {
-    createTwoPointerLinearElement("arrow");
-    expect(h.state.selectedLinearElement?.isEditing).toBe(false);
-
-    mouse.clickAt(midpoint[0], midpoint[1]);
-    Keyboard.withModifierKeys({ ctrl: true }, () => {
-      Keyboard.keyPress(KEYS.ENTER);
-    });
-    expect(h.state.selectedLinearElement?.isEditing).toBe(true);
-    expect(h.state.selectedLinearElement?.elementId).toEqual(h.elements[0].id);
-  });
-
-  it("should enter line editor on ctrl+dblclick (simple arrow)", () => {
-    createTwoPointerLinearElement("arrow");
-    expect(h.state.selectedLinearElement?.isEditing).toBe(false);
 
     Keyboard.withModifierKeys({ ctrl: true }, () => {
       mouse.doubleClick();
     });
-    expect(h.state.selectedLinearElement?.isEditing).toBe(true);
+    expect(h.state.editingLinearElement?.elementId).toEqual(h.elements[0].id);
-    expect(h.state.selectedLinearElement?.elementId).toEqual(h.elements[0].id);
-  });
-
-  it("should enter line editor on ctrl+dblclick (line)", () => {
-    createTwoPointerLinearElement("line");
-    expect(h.state.selectedLinearElement?.isEditing).toBe(false);
-
-    Keyboard.withModifierKeys({ ctrl: true }, () => {
-      mouse.doubleClick();
-    });
-    expect(h.state.selectedLinearElement?.isEditing).toBe(true);
-    expect(h.state.selectedLinearElement?.elementId).toEqual(h.elements[0].id);
-  });
-
-  it("should enter line editor on dblclick (line)", () => {
-    createTwoPointerLinearElement("line");
-    expect(h.state.selectedLinearElement?.isEditing).toBe(false);
-
-    mouse.doubleClick();
-    expect(h.state.selectedLinearElement?.isEditing).toBe(true);
-    expect(h.state.selectedLinearElement?.elementId).toEqual(h.elements[0].id);
-  });
-
-  it("should not enter line editor on dblclick (arrow)", async () => {
-    createTwoPointerLinearElement("arrow");
-    expect(h.state.selectedLinearElement?.isEditing).toBe(false);
-
-    mouse.doubleClick();
-    expect(h.state.selectedLinearElement).toBe(null);
-    await getTextEditor();
-  });
-
-  it("shouldn't create text element on double click in line editor (arrow)", async () => {
-    createTwoPointerLinearElement("arrow");
-    const arrow = h.elements[0] as ExcalidrawLinearElement;
-    enterLineEditingMode(arrow);
-
-    expect(h.state.selectedLinearElement?.isEditing).toBe(true);
-    expect(h.state.selectedLinearElement?.elementId).toEqual(arrow.id);
-
-    mouse.doubleClick();
-    expect(h.state.selectedLinearElement?.isEditing).toBe(true);
-    expect(h.state.selectedLinearElement?.elementId).toEqual(arrow.id);
-    expect(h.elements.length).toEqual(1);
-
-    expect(document.querySelector(TEXT_EDITOR_SELECTOR)).toBe(null);
   });
 
   describe("Inside editor", () => {
@@ -377,7 +290,7 @@ describe("Test Linear Elements", () => {
       // drag line from midpoint
       drag(midpoint, pointFrom(midpoint[0] + delta, midpoint[1] + delta));
       expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(
-        `11`,
+        `12`,
       );
       expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`6`);
 
@@ -433,12 +346,12 @@ describe("Test Linear Elements", () => {
       expect(midPointsWithRoundEdge).toMatchInlineSnapshot(`
         [
           [
-            "54.27552",
+            "55.96978",
-            "46.16120",
+            "47.44233",
           ],
           [
-            "76.95494",
+            "76.08587",
-            "44.56052",
+            "43.29417",
           ],
         ]
       `);
@@ -479,7 +392,7 @@ describe("Test Linear Elements", () => {
       drag(startPoint, endPoint);
 
       expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(
-        `11`,
+        `12`,
       );
       expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`7`);
 
@@ -498,12 +411,12 @@ describe("Test Linear Elements", () => {
       expect(newMidPoints).toMatchInlineSnapshot(`
         [
           [
-            "104.27552",
+            "105.96978",
-            "66.16120",
+            "67.44233",
           ],
           [
-            "126.95494",
+            "126.08587",
-            "64.56052",
+            "63.29417",
           ],
         ]
       `);
@@ -547,7 +460,7 @@ describe("Test Linear Elements", () => {
         );
 
         expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(
-          `14`,
+          `16`,
         );
         expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`7`);
 
@@ -598,7 +511,7 @@ describe("Test Linear Elements", () => {
         drag(hitCoords, pointFrom(hitCoords[0] - delta, hitCoords[1] - delta));
 
         expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(
-          `11`,
+          `12`,
         );
         expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`6`);
 
@@ -639,7 +552,7 @@ describe("Test Linear Elements", () => {
         drag(hitCoords, pointFrom(hitCoords[0] + delta, hitCoords[1] + delta));
 
         expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(
-          `11`,
+          `12`,
         );
         expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`6`);
 
@@ -687,7 +600,7 @@ describe("Test Linear Elements", () => {
         deletePoint(points[2]);
         expect(line.points.length).toEqual(3);
         expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(
-          `17`,
+          `18`,
         );
         expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`7`);
 
@@ -745,7 +658,7 @@ describe("Test Linear Elements", () => {
           ),
         );
         expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(
-          `14`,
+          `16`,
         );
         expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`7`);
         expect(line.points.length).toEqual(5);
@@ -814,12 +727,12 @@ describe("Test Linear Elements", () => {
         expect(newMidPoints).toMatchInlineSnapshot(`
           [
             [
-              "29.28349",
+              "31.88408",
-              "20.91105",
+              "23.13276",
             ],
             [
-              "78.86048",
+              "77.74793",
-              "46.12277",
+              "44.57841",
             ],
           ]
         `);
@@ -843,7 +756,7 @@ describe("Test Linear Elements", () => {
         drag(hitCoords, pointFrom(hitCoords[0] + delta, hitCoords[1] + delta));
 
         expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(
-          `11`,
+          `12`,
         );
         expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`6`);
 
@@ -903,12 +816,12 @@ describe("Test Linear Elements", () => {
         expect(newMidPoints).toMatchInlineSnapshot(`
           [
             [
-              "54.27552",
+              "55.96978",
-              "46.16120",
+              "47.44233",
             ],
             [
-              "76.95494",
+              "76.08587",
-              "44.56052",
+              "43.29417",
             ],
           ]
         `);
@@ -1070,17 +983,19 @@ describe("Test Linear Elements", () => {
         );
         expect(position).toMatchInlineSnapshot(`
           {
-            "x": "86.17305",
+            "x": "85.82202",
-            "y": "76.11251",
+            "y": "75.63461",
           }
         `);
       });
     });
 
-    it("should match styles for text editor", async () => {
+    it("should match styles for text editor", () => {
       createTwoPointerLinearElement("arrow");
       Keyboard.keyPress(KEYS.ENTER);
-      const editor = await getTextEditor();
+      const editor = document.querySelector(
+        ".excalidraw-textEditorContainer > textarea",
+      ) as HTMLTextAreaElement;
       expect(editor).toMatchSnapshot();
     });
 
@@ -1097,7 +1012,9 @@ describe("Test Linear Elements", () => {
       expect(text.type).toBe("text");
       expect(text.containerId).toBe(arrow.id);
       mouse.down();
-      const editor = await getTextEditor();
+      const editor = document.querySelector(
+        ".excalidraw-textEditorContainer > textarea",
+      ) as HTMLTextAreaElement;
 
       fireEvent.change(editor, {
         target: { value: DEFAULT_TEXT },
@@ -1125,7 +1042,9 @@ describe("Test Linear Elements", () => {
       const textElement = h.elements[1] as ExcalidrawTextElementWithContainer;
       expect(textElement.type).toBe("text");
       expect(textElement.containerId).toBe(arrow.id);
-      const editor = await getTextEditor();
+      const editor = document.querySelector(
+        ".excalidraw-textEditorContainer > textarea",
+      ) as HTMLTextAreaElement;
 
       fireEvent.change(editor, {
         target: { value: DEFAULT_TEXT },
@@ -1144,7 +1063,13 @@ describe("Test Linear Elements", () => {
 
       expect(h.elements.length).toBe(1);
       mouse.doubleClickAt(line.x, line.y);
-      expect(h.elements.length).toBe(1);
+
+      expect(h.elements.length).toBe(2);
+
+      const text = h.elements[1] as ExcalidrawTextElementWithContainer;
+      expect(text.type).toBe("text");
+      expect(text.containerId).toBeNull();
+      expect(line.boundElements).toBeNull();
     });
 
     // TODO fix #7029 and rewrite this test
@@ -1309,7 +1234,9 @@ describe("Test Linear Elements", () => {
 
       mouse.select(arrow);
       Keyboard.keyPress(KEYS.ENTER);
-      const editor = await getTextEditor();
+      const editor = document.querySelector(
+        ".excalidraw-textEditorContainer > textarea",
+      ) as HTMLTextAreaElement;
       fireEvent.change(editor, { target: { value: DEFAULT_TEXT } });
       Keyboard.exitTextEditor(editor);
 
@@ -1335,7 +1262,7 @@ describe("Test Linear Elements", () => {
       mouse.downAt(rect.x, rect.y);
       mouse.moveTo(200, 0);
       mouse.upAt(200, 0);
-      expect(arrow.width).toBeCloseTo(200, 0);
+      expect(arrow.width).toBeCloseTo(204, 0);
       expect(rect.x).toBe(200);
       expect(rect.y).toBe(0);
       expect(handleBindTextResizeSpy).toHaveBeenCalledWith(
@@ -1484,55 +1411,5 @@ describe("Test Linear Elements", () => {
       expect(line.points[line.points.length - 1][0]).toBe(20);
       expect(line.points[line.points.length - 1][1]).toBe(-20);
     });
-
-    it("should preserve original angle when dragging endpoint with SHIFT key", () => {
-      createTwoPointerLinearElement("line");
-      const line = h.elements[0] as ExcalidrawLinearElement;
-      enterLineEditingMode(line);
-
-      const elementsMap = arrayToMap(h.elements);
-      const points = LinearElementEditor.getPointsGlobalCoordinates(
-        line,
-        elementsMap,
-      );
-
-      // Calculate original angle between first and last point
-      const originalAngle = Math.atan2(
-        points[1][1] - points[0][1],
-        points[1][0] - points[0][0],
-      );
-
-      // Drag the second point (endpoint) with SHIFT key pressed
-      const startPoint = pointFrom<GlobalPoint>(points[1][0], points[1][1]);
-      const endPoint = pointFrom<GlobalPoint>(
-        startPoint[0] + 4,
-        startPoint[1] + 4,
-      );
-
-      // Perform drag with SHIFT key modifier
-      Keyboard.withModifierKeys({ shift: true }, () => {
-        mouse.downAt(startPoint[0], startPoint[1]);
-        mouse.moveTo(endPoint[0], endPoint[1]);
-        mouse.upAt(endPoint[0], endPoint[1]);
-      });
-
-      // Get updated points after drag
-      const updatedPoints = LinearElementEditor.getPointsGlobalCoordinates(
-        line,
-        elementsMap,
-      );
-
-      // Calculate new angle
-      const newAngle = Math.atan2(
-        updatedPoints[1][1] - updatedPoints[0][1],
-        updatedPoints[1][0] - updatedPoints[0][0],
-      );
-
-      // The angle should be preserved (within a small tolerance for floating point precision)
-      const angleDifference = Math.abs(newAngle - originalAngle);
-      const tolerance = 0.01; // Small tolerance for floating point precision
-
-      expect(angleDifference).toBeLessThan(tolerance);
-    });
   });
 });

packages/element/tests/resize.test.tsx

@@ -510,12 +510,12 @@ describe("arrow element", () => {
       h.state,
     )[0] as ExcalidrawElbowArrowElement;
 
-    expect(arrow.startBinding?.fixedPoint?.[0]).toBeCloseTo(1.05);
+    expect(arrow.startBinding?.fixedPoint?.[0]).toBeCloseTo(1);
     expect(arrow.startBinding?.fixedPoint?.[1]).toBeCloseTo(0.75);
 
     UI.resize(rectangle, "se", [-200, -150]);
 
-    expect(arrow.startBinding?.fixedPoint?.[0]).toBeCloseTo(1.05);
+    expect(arrow.startBinding?.fixedPoint?.[0]).toBeCloseTo(1);
     expect(arrow.startBinding?.fixedPoint?.[1]).toBeCloseTo(0.75);
   });
 
@@ -538,11 +538,11 @@ describe("arrow element", () => {
       h.state,
     )[0] as ExcalidrawElbowArrowElement;
 
-    expect(arrow.startBinding?.fixedPoint?.[0]).toBeCloseTo(1.05);
+    expect(arrow.startBinding?.fixedPoint?.[0]).toBeCloseTo(1);
     expect(arrow.startBinding?.fixedPoint?.[1]).toBeCloseTo(0.75);
 
     UI.resize([rectangle, arrow], "nw", [300, 350]);
-    expect(arrow.startBinding?.fixedPoint?.[0]).toBeCloseTo(-0.05);
+    expect(arrow.startBinding?.fixedPoint?.[0]).toBeCloseTo(0);
     expect(arrow.startBinding?.fixedPoint?.[1]).toBeCloseTo(0.25);
   });
 });
@@ -819,7 +819,7 @@ describe("image element", () => {
 
     UI.resize(image, "ne", [40, 0]);
 
-    expect(arrow.width + arrow.endBinding!.gap).toBeCloseTo(30, 0);
+    expect(arrow.width + arrow.endBinding!.gap).toBeCloseTo(31, 0);
 
     const imageWidth = image.width;
     const scale = 20 / image.height;
@@ -1033,7 +1033,7 @@ describe("multiple selection", () => {
 
     expect(leftBoundArrow.x).toBeCloseTo(-110);
     expect(leftBoundArrow.y).toBeCloseTo(50);
-    expect(leftBoundArrow.width).toBeCloseTo(140, 0);
+    expect(leftBoundArrow.width).toBeCloseTo(143, 0);
     expect(leftBoundArrow.height).toBeCloseTo(7, 0);
     expect(leftBoundArrow.angle).toEqual(0);
     expect(leftBoundArrow.startBinding).toBeNull();

packages/element/tests/sizeHelpers.test.ts

@@ -1,5 +1,7 @@
 import { vi } from "vitest";
 
+import * as constants from "@excalidraw/common";
+
 import { getPerfectElementSize } from "../src/sizeHelpers";
 
 const EPSILON_DIGITS = 3;
@@ -55,4 +57,13 @@ describe("getPerfectElementSize", () => {
     expect(width).toBeCloseTo(0, EPSILON_DIGITS);
     expect(height).toBeCloseTo(0, EPSILON_DIGITS);
   });
+
+  describe("should respond to SHIFT_LOCKING_ANGLE constant", () => {
+    it("should have only 2 locking angles per section if SHIFT_LOCKING_ANGLE = 45 deg (Math.PI/4)", () => {
+      (constants as any).SHIFT_LOCKING_ANGLE = Math.PI / 4;
+      const { height, width } = getPerfectElementSize("arrow", 120, 185);
+      expect(width).toBeCloseTo(120, EPSILON_DIGITS);
+      expect(height).toBeCloseTo(120, EPSILON_DIGITS);
+    });
+  });
 });

packages/element/tests/textElement.test.ts

@@ -1,14 +1,13 @@
 import { getLineHeight } from "@excalidraw/common";
 import { API } from "@excalidraw/excalidraw/tests/helpers/api";
 
-import { FONT_FAMILY, TEXT_ALIGN, VERTICAL_ALIGN } from "@excalidraw/common";
+import { FONT_FAMILY } from "@excalidraw/common";
 
 import {
   computeContainerDimensionForBoundText,
   getContainerCoords,
   getBoundTextMaxWidth,
   getBoundTextMaxHeight,
-  computeBoundTextPosition,
 } from "../src/textElement";
 import { detectLineHeight, getLineHeightInPx } from "../src/textMeasurements";
 
@@ -208,172 +207,3 @@ describe("Test getDefaultLineHeight", () => {
     expect(getLineHeight(FONT_FAMILY.Cascadia)).toBe(1.2);
   });
 });
-
-describe("Test computeBoundTextPosition", () => {
-  const createMockElementsMap = () => new Map();
-
-  // Helper function to create rectangle test case with 90-degree rotation
-  const createRotatedRectangleTestCase = (
-    textAlign: string,
-    verticalAlign: string,
-  ) => {
-    const container = API.createElement({
-      type: "rectangle",
-      x: 100,
-      y: 100,
-      width: 200,
-      height: 100,
-      angle: (Math.PI / 2) as any, // 90 degrees
-    });
-
-    const boundTextElement = API.createElement({
-      type: "text",
-      width: 80,
-      height: 40,
-      text: "hello darkness my old friend",
-      textAlign: textAlign as any,
-      verticalAlign: verticalAlign as any,
-      containerId: container.id,
-    }) as ExcalidrawTextElementWithContainer;
-
-    const elementsMap = createMockElementsMap();
-
-    return { container, boundTextElement, elementsMap };
-  };
-
-  describe("90-degree rotation with all alignment combinations", () => {
-    // Test all 9 combinations of horizontal (left, center, right) and vertical (top, middle, bottom) alignment
-
-    it("should position text with LEFT + TOP alignment at 90-degree rotation", () => {
-      const { container, boundTextElement, elementsMap } =
-        createRotatedRectangleTestCase(TEXT_ALIGN.LEFT, VERTICAL_ALIGN.TOP);
-
-      const result = computeBoundTextPosition(
-        container,
-        boundTextElement,
-        elementsMap,
-      );
-
-      expect(result.x).toBeCloseTo(185, 1);
-      expect(result.y).toBeCloseTo(75, 1);
-    });
-
-    it("should position text with LEFT + MIDDLE alignment at 90-degree rotation", () => {
-      const { container, boundTextElement, elementsMap } =
-        createRotatedRectangleTestCase(TEXT_ALIGN.LEFT, VERTICAL_ALIGN.MIDDLE);
-
-      const result = computeBoundTextPosition(
-        container,
-        boundTextElement,
-        elementsMap,
-      );
-
-      expect(result.x).toBeCloseTo(160, 1);
-      expect(result.y).toBeCloseTo(75, 1);
-    });
-
-    it("should position text with LEFT + BOTTOM alignment at 90-degree rotation", () => {
-      const { container, boundTextElement, elementsMap } =
-        createRotatedRectangleTestCase(TEXT_ALIGN.LEFT, VERTICAL_ALIGN.BOTTOM);
-
-      const result = computeBoundTextPosition(
-        container,
-        boundTextElement,
-        elementsMap,
-      );
-
-      expect(result.x).toBeCloseTo(135, 1);
-      expect(result.y).toBeCloseTo(75, 1);
-    });
-
-    it("should position text with CENTER + TOP alignment at 90-degree rotation", () => {
-      const { container, boundTextElement, elementsMap } =
-        createRotatedRectangleTestCase(TEXT_ALIGN.CENTER, VERTICAL_ALIGN.TOP);
-
-      const result = computeBoundTextPosition(
-        container,
-        boundTextElement,
-        elementsMap,
-      );
-
-      expect(result.x).toBeCloseTo(185, 1);
-      expect(result.y).toBeCloseTo(130, 1);
-    });
-
-    it("should position text with CENTER + MIDDLE alignment at 90-degree rotation", () => {
-      const { container, boundTextElement, elementsMap } =
-        createRotatedRectangleTestCase(
-          TEXT_ALIGN.CENTER,
-          VERTICAL_ALIGN.MIDDLE,
-        );
-
-      const result = computeBoundTextPosition(
-        container,
-        boundTextElement,
-        elementsMap,
-      );
-
-      expect(result.x).toBeCloseTo(160, 1);
-      expect(result.y).toBeCloseTo(130, 1);
-    });
-
-    it("should position text with CENTER + BOTTOM alignment at 90-degree rotation", () => {
-      const { container, boundTextElement, elementsMap } =
-        createRotatedRectangleTestCase(
-          TEXT_ALIGN.CENTER,
-          VERTICAL_ALIGN.BOTTOM,
-        );
-
-      const result = computeBoundTextPosition(
-        container,
-        boundTextElement,
-        elementsMap,
-      );
-
-      expect(result.x).toBeCloseTo(135, 1);
-      expect(result.y).toBeCloseTo(130, 1);
-    });
-
-    it("should position text with RIGHT + TOP alignment at 90-degree rotation", () => {
-      const { container, boundTextElement, elementsMap } =
-        createRotatedRectangleTestCase(TEXT_ALIGN.RIGHT, VERTICAL_ALIGN.TOP);
-
-      const result = computeBoundTextPosition(
-        container,
-        boundTextElement,
-        elementsMap,
-      );
-
-      expect(result.x).toBeCloseTo(185, 1);
-      expect(result.y).toBeCloseTo(185, 1);
-    });
-
-    it("should position text with RIGHT + MIDDLE alignment at 90-degree rotation", () => {
-      const { container, boundTextElement, elementsMap } =
-        createRotatedRectangleTestCase(TEXT_ALIGN.RIGHT, VERTICAL_ALIGN.MIDDLE);
-
-      const result = computeBoundTextPosition(
-        container,
-        boundTextElement,
-        elementsMap,
-      );
-
-      expect(result.x).toBeCloseTo(160, 1);
-      expect(result.y).toBeCloseTo(185, 1);
-    });
-
-    it("should position text with RIGHT + BOTTOM alignment at 90-degree rotation", () => {
-      const { container, boundTextElement, elementsMap } =
-        createRotatedRectangleTestCase(TEXT_ALIGN.RIGHT, VERTICAL_ALIGN.BOTTOM);
-
-      const result = computeBoundTextPosition(
-        container,
-        boundTextElement,
-        elementsMap,
-      );
-
-      expect(result.x).toBeCloseTo(135, 1);
-      expect(result.y).toBeCloseTo(185, 1);
-    });
-  });
-});

packages/excalidraw/actions/actionAlign.tsx

@@ -4,14 +4,12 @@ import { isFrameLikeElement } from "@excalidraw/element";
 
 import { updateFrameMembershipOfSelectedElements } from "@excalidraw/element";
 
-import { KEYS, arrayToMap } from "@excalidraw/common";
+import { KEYS, arrayToMap, getShortcutKey } from "@excalidraw/common";
 
 import { alignElements } from "@excalidraw/element";
 
 import { CaptureUpdateAction } from "@excalidraw/element";
 
-import { getSelectedElementsByGroup } from "@excalidraw/element";
-
 import type { ExcalidrawElement } from "@excalidraw/element/types";
 
 import type { Alignment } from "@excalidraw/element";
@@ -30,8 +28,6 @@ import { t } from "../i18n";
 
 import { isSomeElementSelected } from "../scene";
 
-import { getShortcutKey } from "../shortcut";
-
 import { register } from "./register";
 
 import type { AppClassProperties, AppState, UIAppState } from "../types";
@@ -42,11 +38,7 @@ export const alignActionsPredicate = (
 ) => {
   const selectedElements = app.scene.getSelectedElements(appState);
   return (
-    getSelectedElementsByGroup(
+    selectedElements.length > 1 &&
-      selectedElements,
-      app.scene.getNonDeletedElementsMap(),
-      appState as Readonly<AppState>,
-    ).length > 1 &&
     // TODO enable aligning frames when implemented properly
     !selectedElements.some((el) => isFrameLikeElement(el))
   );
@@ -60,12 +52,7 @@ const alignSelectedElements = (
 ) => {
   const selectedElements = app.scene.getSelectedElements(appState);
 
-  const updatedElements = alignElements(
+  const updatedElements = alignElements(selectedElements, alignment, app.scene);
-    selectedElements,
-    alignment,
-    app.scene,
-    appState,
-  );
 
   const updatedElementsMap = arrayToMap(updatedElements);
 

packages/excalidraw/actions/actionBoundText.tsx

@@ -8,7 +8,6 @@ import {
 } from "@excalidraw/common";
 import {
   getOriginalContainerHeightFromCache,
-  isBoundToContainer,
   resetOriginalContainerCache,
   updateOriginalContainerCache,
 } from "@excalidraw/element";
@@ -226,9 +225,7 @@ export const actionWrapTextInContainer = register({
   trackEvent: { category: "element" },
   predicate: (elements, appState, _, app) => {
     const selectedElements = app.scene.getSelectedElements(appState);
-    const someTextElements = selectedElements.some(
+    const someTextElements = selectedElements.some((el) => isTextElement(el));
-      (el) => isTextElement(el) && !isBoundToContainer(el),
-    );
     return selectedElements.length > 0 && someTextElements;
   },
   perform: (elements, appState, _, app) => {
@@ -237,7 +234,7 @@ export const actionWrapTextInContainer = register({
     const containerIds: Mutable<AppState["selectedElementIds"]> = {};
 
     for (const textElement of selectedElements) {
-      if (isTextElement(textElement) && !isBoundToContainer(textElement)) {
+      if (isTextElement(textElement)) {
         const container = newElement({
           type: "rectangle",
           backgroundColor: appState.currentItemBackgroundColor,

packages/excalidraw/actions/actionCanvas.tsx

@@ -7,6 +7,7 @@ import {
   MIN_ZOOM,
   THEME,
   ZOOM_STEP,
+  getShortcutKey,
   updateActiveTool,
   CODES,
   KEYS,
@@ -40,13 +41,11 @@ import {
   ZoomResetIcon,
 } from "../components/icons";
 import { setCursor } from "../cursor";
-import { constrainScrollState } from "../scene/scrollConstraints";
 
 import { t } from "../i18n";
 import { getNormalizedZoom } from "../scene";
 import { centerScrollOn } from "../scene/scroll";
 import { getStateForZoom } from "../scene/zoom";
-import { getShortcutKey } from "../shortcut";
 
 import { register } from "./register";
 
@@ -70,7 +69,7 @@ export const actionChangeViewBackgroundColor = register({
         : CaptureUpdateAction.EVENTUALLY,
     };
   },
-  PanelComponent: ({ elements, appState, updateData, appProps, data }) => {
+  PanelComponent: ({ elements, appState, updateData, appProps }) => {
     // FIXME move me to src/components/mainMenu/DefaultItems.tsx
     return (
       <ColorPicker
@@ -122,10 +121,7 @@ export const actionClearCanvas = register({
         pasteDialog: appState.pasteDialog,
         activeTool:
           appState.activeTool.type === "image"
-            ? {
+            ? { ...appState.activeTool, type: "selection" }
-                ...appState.activeTool,
-                type: app.state.preferredSelectionTool.type,
-              }
             : appState.activeTool,
       },
       captureUpdate: CaptureUpdateAction.IMMEDIATELY,
@@ -141,7 +137,7 @@ export const actionZoomIn = register({
   trackEvent: { category: "canvas" },
   perform: (_elements, appState, _, app) => {
     return {
-      appState: constrainScrollState({
+      appState: {
         ...appState,
         ...getStateForZoom(
           {
@@ -152,7 +148,7 @@ export const actionZoomIn = register({
           appState,
         ),
         userToFollow: null,
-      }),
+      },
       captureUpdate: CaptureUpdateAction.EVENTUALLY,
     };
   },
@@ -182,7 +178,7 @@ export const actionZoomOut = register({
   trackEvent: { category: "canvas" },
   perform: (_elements, appState, _, app) => {
     return {
-      appState: constrainScrollState({
+      appState: {
         ...appState,
         ...getStateForZoom(
           {
@@ -193,7 +189,7 @@ export const actionZoomOut = register({
           appState,
         ),
         userToFollow: null,
-      }),
+      },
       captureUpdate: CaptureUpdateAction.EVENTUALLY,
     };
   },
@@ -498,13 +494,13 @@ export const actionToggleEraserTool = register({
   name: "toggleEraserTool",
   label: "toolBar.eraser",
   trackEvent: { category: "toolbar" },
-  perform: (elements, appState, _, app) => {
+  perform: (elements, appState) => {
     let activeTool: AppState["activeTool"];
 
     if (isEraserActive(appState)) {
       activeTool = updateActiveTool(appState, {
         ...(appState.activeTool.lastActiveTool || {
-          type: app.state.preferredSelectionTool.type,
+          type: "selection",
         }),
         lastActiveToolBeforeEraser: null,
       });
@@ -534,9 +530,6 @@ export const actionToggleLassoTool = register({
   label: "toolBar.lasso",
   icon: LassoIcon,
   trackEvent: { category: "toolbar" },
-  predicate: (elements, appState, props, app) => {
-    return app.state.preferredSelectionTool.type !== "lasso";
-  },
   perform: (elements, appState, _, app) => {
     let activeTool: AppState["activeTool"];
 

packages/excalidraw/actions/actionDeleteSelected.tsx

@@ -1,8 +1,4 @@
-import {
+import { KEYS, updateActiveTool } from "@excalidraw/common";
-  KEYS,
-  MOBILE_ACTION_BUTTON_BG,
-  updateActiveTool,
-} from "@excalidraw/common";
 
 import { getNonDeletedElements } from "@excalidraw/element";
 import { fixBindingsAfterDeletion } from "@excalidraw/element";
@@ -30,8 +26,6 @@ import { getSelectedElements, isSomeElementSelected } from "../scene";
 import { TrashIcon } from "../components/icons";
 import { ToolButton } from "../components/ToolButton";
 
-import { useStylesPanelMode } from "..";
-
 import { register } from "./register";
 
 import type { AppClassProperties, AppState } from "../types";
@@ -211,19 +205,16 @@ export const actionDeleteSelected = register({
   icon: TrashIcon,
   trackEvent: { category: "element", action: "delete" },
   perform: (elements, appState, formData, app) => {
-    if (appState.selectedLinearElement?.isEditing) {
+    if (appState.editingLinearElement) {
       const {
         elementId,
         selectedPointsIndices,
         startBindingElement,
         endBindingElement,
-      } = appState.selectedLinearElement;
+      } = appState.editingLinearElement;
       const elementsMap = app.scene.getNonDeletedElementsMap();
-      const linearElement = LinearElementEditor.getElement(
+      const element = LinearElementEditor.getElement(elementId, elementsMap);
-        elementId,
+      if (!element) {
-        elementsMap,
-      );
-      if (!linearElement) {
         return false;
       }
       // case: no point selected → do nothing, as deleting the whole element
@@ -234,10 +225,10 @@ export const actionDeleteSelected = register({
         return false;
       }
 
-      // case: deleting all points
+      // case: deleting last remaining point
-      if (selectedPointsIndices.length >= linearElement.points.length) {
+      if (element.points.length < 2) {
         const nextElements = elements.map((el) => {
-          if (el.id === linearElement.id) {
+          if (el.id === element.id) {
             return newElementWith(el, { isDeleted: true });
           }
           return el;
@@ -248,7 +239,7 @@ export const actionDeleteSelected = register({
           elements: nextElements,
           appState: {
             ...nextAppState,
-            selectedLinearElement: null,
+            editingLinearElement: null,
           },
           captureUpdate: CaptureUpdateAction.IMMEDIATELY,
         };
@@ -261,15 +252,15 @@ export const actionDeleteSelected = register({
           ? null
           : startBindingElement,
         endBindingElement: selectedPointsIndices?.includes(
-          linearElement.points.length - 1,
+          element.points.length - 1,
         )
           ? null
           : endBindingElement,
       };
 
       LinearElementEditor.deletePoints(
-        linearElement,
+        element,
-        app,
+        app.scene,
         selectedPointsIndices,
       );
 
@@ -277,8 +268,8 @@ export const actionDeleteSelected = register({
         elements,
         appState: {
           ...appState,
-          selectedLinearElement: {
+          editingLinearElement: {
-            ...appState.selectedLinearElement,
+            ...appState.editingLinearElement,
             ...binding,
             selectedPointsIndices:
               selectedPointsIndices?.[0] > 0
@@ -304,9 +295,7 @@ export const actionDeleteSelected = register({
       elements: nextElements,
       appState: {
         ...nextAppState,
-        activeTool: updateActiveTool(appState, {
+        activeTool: updateActiveTool(appState, { type: "selection" }),
-          type: app.state.preferredSelectionTool.type,
-        }),
         multiElement: null,
         activeEmbeddable: null,
         selectedLinearElement: null,
@@ -322,25 +311,14 @@ export const actionDeleteSelected = register({
   keyTest: (event, appState, elements) =>
     (event.key === KEYS.BACKSPACE || event.key === KEYS.DELETE) &&
     !event[KEYS.CTRL_OR_CMD],
-  PanelComponent: ({ elements, appState, updateData, app }) => {
+  PanelComponent: ({ elements, appState, updateData }) => (
-    const isMobile = useStylesPanelMode() === "mobile";
+    <ToolButton
-
+      type="button"
-    return (
+      icon={TrashIcon}
-      <ToolButton
+      title={t("labels.delete")}
-        type="button"
+      aria-label={t("labels.delete")}
-        icon={TrashIcon}
+      onClick={() => updateData(null)}
-        title={t("labels.delete")}
+      visible={isSomeElementSelected(getNonDeletedElements(elements), appState)}
-        aria-label={t("labels.delete")}
+    />
-        onClick={() => updateData(null)}
+  ),
-        disabled={
-          !isSomeElementSelected(getNonDeletedElements(elements), appState)
-        }
-        style={{
-          ...(isMobile && appState.openPopup !== "compactOtherProperties"
-            ? MOBILE_ACTION_BUTTON_BG
-            : {}),
-        }}
-      />
-    );
-  },
 });

packages/excalidraw/actions/actionDistribute.tsx

@@ -2,7 +2,7 @@ import { getNonDeletedElements } from "@excalidraw/element";
 
 import { isFrameLikeElement } from "@excalidraw/element";
 
-import { CODES, KEYS, arrayToMap } from "@excalidraw/common";
+import { CODES, KEYS, arrayToMap, getShortcutKey } from "@excalidraw/common";
 
 import { updateFrameMembershipOfSelectedElements } from "@excalidraw/element";
 
@@ -10,8 +10,6 @@ import { distributeElements } from "@excalidraw/element";
 
 import { CaptureUpdateAction } from "@excalidraw/element";
 
-import { getSelectedElementsByGroup } from "@excalidraw/element";
-
 import type { ExcalidrawElement } from "@excalidraw/element/types";
 
 import type { Distribution } from "@excalidraw/element";
@@ -26,8 +24,6 @@ import { t } from "../i18n";
 
 import { isSomeElementSelected } from "../scene";
 
-import { getShortcutKey } from "../shortcut";
-
 import { register } from "./register";
 
 import type { AppClassProperties, AppState } from "../types";
@@ -35,11 +31,7 @@ import type { AppClassProperties, AppState } from "../types";
 const enableActionGroup = (appState: AppState, app: AppClassProperties) => {
   const selectedElements = app.scene.getSelectedElements(appState);
   return (
-    getSelectedElementsByGroup(
+    selectedElements.length > 1 &&
-      selectedElements,
-      app.scene.getNonDeletedElementsMap(),
-      appState as Readonly<AppState>,
-    ).length > 2 &&
     // TODO enable distributing frames when implemented properly
     !selectedElements.some((el) => isFrameLikeElement(el))
   );
@@ -57,7 +49,6 @@ const distributeSelectedElements = (
     selectedElements,
     app.scene.getNonDeletedElementsMap(),
     distribution,
-    appState,
   );
 
   const updatedElementsMap = arrayToMap(updatedElements);

packages/excalidraw/actions/actionDuplicateSelection.tsx

@@ -1,8 +1,8 @@
 import {
   DEFAULT_GRID_SIZE,
   KEYS,
-  MOBILE_ACTION_BUTTON_BG,
   arrayToMap,
+  getShortcutKey,
 } from "@excalidraw/common";
 
 import { getNonDeletedElements } from "@excalidraw/element";
@@ -25,9 +25,6 @@ import { DuplicateIcon } from "../components/icons";
 
 import { t } from "../i18n";
 import { isSomeElementSelected } from "../scene";
-import { getShortcutKey } from "../shortcut";
-
-import { useStylesPanelMode } from "..";
 
 import { register } from "./register";
 
@@ -42,7 +39,7 @@ export const actionDuplicateSelection = register({
     }
 
     // duplicate selected point(s) if editing a line
-    if (appState.selectedLinearElement?.isEditing) {
+    if (appState.editingLinearElement) {
       // TODO: Invariants should be checked here instead of duplicateSelectedPoints()
       try {
         const newAppState = LinearElementEditor.duplicateSelectedPoints(
@@ -109,27 +106,16 @@ export const actionDuplicateSelection = register({
     };
   },
   keyTest: (event) => event[KEYS.CTRL_OR_CMD] && event.key === KEYS.D,
-  PanelComponent: ({ elements, appState, updateData, app }) => {
+  PanelComponent: ({ elements, appState, updateData }) => (
-    const isMobile = useStylesPanelMode() === "mobile";
+    <ToolButton
-
+      type="button"
-    return (
+      icon={DuplicateIcon}
-      <ToolButton
+      title={`${t("labels.duplicateSelection")} — ${getShortcutKey(
-        type="button"
+        "CtrlOrCmd+D",
-        icon={DuplicateIcon}
+      )}`}
-        title={`${t("labels.duplicateSelection")} — ${getShortcutKey(
+      aria-label={t("labels.duplicateSelection")}
-          "CtrlOrCmd+D",
+      onClick={() => updateData(null)}
-        )}`}
+      visible={isSomeElementSelected(getNonDeletedElements(elements), appState)}
-        aria-label={t("labels.duplicateSelection")}
+    />
-        onClick={() => updateData(null)}
+  ),
-        disabled={
-          !isSomeElementSelected(getNonDeletedElements(elements), appState)
-        }
-        style={{
-          ...(isMobile && appState.openPopup !== "compactOtherProperties"
-            ? MOBILE_ACTION_BUTTON_BG
-            : {}),
-        }}
-      />
-    );
-  },
 });

packages/excalidraw/actions/actionExport.tsx

@@ -11,7 +11,7 @@ import { CaptureUpdateAction } from "@excalidraw/element";
 
 import type { Theme } from "@excalidraw/element/types";
 
-import { useEditorInterface } from "../components/App";
+import { useDevice } from "../components/App";
 import { CheckboxItem } from "../components/CheckboxItem";
 import { DarkModeToggle } from "../components/DarkModeToggle";
 import { ProjectName } from "../components/ProjectName";
@@ -242,7 +242,7 @@ export const actionSaveFileToDisk = register({
       icon={saveAs}
       title={t("buttons.saveAs")}
       aria-label={t("buttons.saveAs")}
-      showAriaLabel={useEditorInterface().formFactor === "phone"}
+      showAriaLabel={useDevice().editor.isMobile}
       hidden={!nativeFileSystemSupported}
       onClick={() => updateData(null)}
       data-testid="save-as-button"