Virtual whiteboard for sketching hand-drawn like diagrams
feat: support pen erasing (#7496)
David Luzare6c3c06c2eb5
diff --git a/packages/excalidraw/components/App.tsx b/packages/excalidraw/components/App.tsxindex 9ff1516755..e1f480fa84 100644--- a/packages/excalidraw/components/App.tsx+++ b/packages/excalidraw/components/App.tsx@@ -245,6 +245,7 @@ import {CollaboratorPointer,ToolType,OnUserFollowedPayload,+ UnsubscribeCallback,} from "../types";import {debounce,@@ -488,7 +489,7 @@ let IS_PLAIN_PASTE = false;let IS_PLAIN_PASTE_TIMER = 0;let PLAIN_PASTE_TOAST_SHOWN = false;-let lastPointerUp: ((event: any) => void) | null = null;+let lastPointerUp: (() => void) | null = null;const gesture: Gesture = {pointers: new Map(),lastCenter: null,@@ -528,6 +529,7 @@ class App extends React.Component<AppProps, AppState> {lastPointerDownEvent: React.PointerEvent<HTMLElement> | null = null;lastPointerUpEvent: React.PointerEvent<HTMLElement> | PointerEvent | null =null;+ lastPointerMoveEvent: PointerEvent | null = null;lastViewportPosition = { x: 0, y: 0 };laserPathManager: LaserPathManager = new LaserPathManager(this);@@ -560,6 +562,9 @@ class App extends React.Component<AppProps, AppState> {[scrollX: number, scrollY: number, zoom: AppState["zoom"]]>();+ missingPointerEventCleanupEmitter = new Emitter<+ [event: PointerEvent | null]+ >();onRemoveEventListenersEmitter = new Emitter<[]>();constructor(props: AppProps) {@@ -2372,7 +2377,7 @@ class App extends React.Component<AppProps, AppState> {this.scene.destroy();this.library.destroy();this.laserPathManager.destroy();- this.onChangeEmitter.destroy();+ this.onChangeEmitter.clear();ShapeCache.destroy();SnapCache.destroy();clearTimeout(touchTimeout);@@ -2464,6 +2469,9 @@ class App extends React.Component<AppProps, AppState> {this.onGestureEnd as any,false,),+ addEventListener(window, EVENT.FOCUS, () => {+ this.maybeCleanupAfterMissingPointerUp(null);+ }),);if (this.state.viewModeEnabled) {@@ -4616,6 +4624,7 @@ class App extends React.Component<AppProps, AppState> {event: React.PointerEvent<HTMLCanvasElement>,) => {this.savePointer(event.clientX, event.clientY, this.state.cursorButton);+ this.lastPointerMoveEvent = event.nativeEvent;if (gesture.pointers.has(event.pointerId)) {gesture.pointers.set(event.pointerId, {@@ -5203,6 +5212,7 @@ class App extends React.Component<AppProps, AppState> {private handleCanvasPointerDown = (event: React.PointerEvent<HTMLElement>,) => {+ this.maybeCleanupAfterMissingPointerUp(event.nativeEvent);this.maybeUnfollowRemoteUser();// since contextMenu options are potentially evaluated on each render,@@ -5265,7 +5275,6 @@ class App extends React.Component<AppProps, AppState> {selection.removeAllRanges();}this.maybeOpenContextMenuAfterPointerDownOnTouchDevices(event);- this.maybeCleanupAfterMissingPointerUp(event);//fires only once, if pen is detected, penMode is enabled//the user can disable this by toggling the penMode button@@ -5304,10 +5313,60 @@ class App extends React.Component<AppProps, AppState> {});this.savePointer(event.clientX, event.clientY, "down");+ if (+ event.button === POINTER_BUTTON.ERASER &&+ this.state.activeTool.type !== TOOL_TYPE.eraser+ ) {+ this.setState(+ {+ activeTool: updateActiveTool(this.state, {+ type: TOOL_TYPE.eraser,+ lastActiveToolBeforeEraser: this.state.activeTool,+ }),+ },+ () => {+ this.handleCanvasPointerDown(event);+ const onPointerUp = () => {+ unsubPointerUp();+ unsubCleanup?.();+ if (isEraserActive(this.state)) {+ this.setState({+ activeTool: updateActiveTool(this.state, {+ ...(this.state.activeTool.lastActiveTool || {+ type: TOOL_TYPE.selection,+ }),+ lastActiveToolBeforeEraser: null,+ }),+ });+ }+ };++ const unsubPointerUp = addEventListener(+ window,+ EVENT.POINTER_UP,+ onPointerUp,+ {+ once: true,+ },+ );+ let unsubCleanup: UnsubscribeCallback | undefined;+ // subscribe inside rAF lest it'd be triggered on the same pointerdown+ // if we start erasing while coming from blurred document since+ // we cleanup pointer events on focus+ requestAnimationFrame(() => {+ unsubCleanup =+ this.missingPointerEventCleanupEmitter.once(onPointerUp);+ });+ },+ );+ return;+ }+// only handle left mouse button or touchif (event.button !== POINTER_BUTTON.MAIN &&- event.button !== POINTER_BUTTON.TOUCH+ event.button !== POINTER_BUTTON.TOUCH &&+ event.button !== POINTER_BUTTON.ERASER) {return;}@@ -5435,7 +5494,9 @@ class App extends React.Component<AppProps, AppState> {const onKeyDown = this.onKeyDownFromPointerDownHandler(pointerDownState);const onKeyUp = this.onKeyUpFromPointerDownHandler(pointerDownState);- lastPointerUp = onPointerUp;+ this.missingPointerEventCleanupEmitter.once((_event) =>+ onPointerUp(_event || event.nativeEvent),+ );if (!this.state.viewModeEnabled || this.state.activeTool.type === "laser") {window.addEventListener(EVENT.POINTER_MOVE, onPointerMove);@@ -5546,16 +5607,15 @@ class App extends React.Component<AppProps, AppState> {invalidateContextMenu = false;};- private maybeCleanupAfterMissingPointerUp(- event: React.PointerEvent<HTMLElement>,- ): void {- if (lastPointerUp !== null) {- // Unfortunately, sometimes we don't get a pointerup after a pointerdown,- // this can happen when a contextual menu or alert is triggered. In order to avoid- // being in a weird state, we clean up on the next pointerdown- lastPointerUp(event);- }- }+ /**+ * pointerup may not fire in certian cases (user tabs away...), so in order+ * to properly cleanup pointerdown state, we need to fire any hanging+ * pointerup handlers manually+ */+ private maybeCleanupAfterMissingPointerUp = (event: PointerEvent | null) => {+ lastPointerUp?.();+ this.missingPointerEventCleanupEmitter.trigger(event).clear();+ };// Returns whether the event is a panningprivate handleCanvasPanUsingWheelOrSpaceDrag = (@@ -5758,11 +5818,10 @@ class App extends React.Component<AppProps, AppState> {this.handlePointerMoveOverScrollbars(event, pointerDownState);});-const onPointerUp = withBatchedUpdates(() => {+ lastPointerUp = null;isDraggingScrollBar = false;setCursorForShape(this.interactiveCanvas, this.state);- lastPointerUp = null;this.setState({cursorButton: "up",});@@ -7208,6 +7267,7 @@ class App extends React.Component<AppProps, AppState> {pointerDownState: PointerDownState,): (event: PointerEvent) => void {return withBatchedUpdates((childEvent: PointerEvent) => {+ this.removePointer(childEvent);if (pointerDownState.eventListeners.onMove) {pointerDownState.eventListeners.onMove.flush();}@@ -7310,7 +7370,7 @@ class App extends React.Component<AppProps, AppState> {}}- lastPointerUp = null;+ this.missingPointerEventCleanupEmitter.clear();window.removeEventListener(EVENT.POINTER_MOVE,@@ -7693,19 +7753,23 @@ class App extends React.Component<AppProps, AppState> {});}}- if (isEraserActive(this.state)) {++ const pointerStart = this.lastPointerDownEvent;+ const pointerEnd = this.lastPointerUpEvent || this.lastPointerMoveEvent;++ if (isEraserActive(this.state) && pointerStart && pointerEnd) {const draggedDistance = distance2d(- this.lastPointerDownEvent!.clientX,- this.lastPointerDownEvent!.clientY,- this.lastPointerUpEvent!.clientX,- this.lastPointerUpEvent!.clientY,+ pointerStart.clientX,+ pointerStart.clientY,+ pointerEnd.clientX,+ pointerEnd.clientY,);if (draggedDistance === 0) {const scenePointer = viewportCoordsToSceneCoords({- clientX: this.lastPointerUpEvent!.clientX,- clientY: this.lastPointerUpEvent!.clientY,+ clientX: pointerEnd.clientX,+ clientY: pointerEnd.clientY,},this.state,);diff --git a/packages/excalidraw/constants.ts b/packages/excalidraw/constants.tsindex ff1fdabb72..72286e6986 100644--- a/packages/excalidraw/constants.ts+++ b/packages/excalidraw/constants.ts@@ -43,6 +43,7 @@ export const POINTER_BUTTON = {WHEEL: 1,SECONDARY: 2,TOUCH: -1,+ ERASER: 5,} as const;export const POINTER_EVENTS = {diff --git a/packages/excalidraw/emitter.ts b/packages/excalidraw/emitter.tsindex cb86670be6..98e97ad463 100644--- a/packages/excalidraw/emitter.ts+++ b/packages/excalidraw/emitter.ts@@ -4,13 +4,6 @@ type Subscriber<T extends any[]> = (...payload: T) => void;export class Emitter<T extends any[] = []> {public subscribers: Subscriber<T>[] = [];- public value: T | undefined;- private updateOnChangeOnly: boolean;-- constructor(opts?: { initialState?: T; updateOnChangeOnly?: boolean }) {- this.updateOnChangeOnly = opts?.updateOnChangeOnly ?? false;- this.value = opts?.initialState;- }/*** Attaches subscriber@@ -45,16 +38,14 @@ export class Emitter<T extends any[] = []> {);}- trigger(...payload: T): any[] {- if (this.updateOnChangeOnly && this.value === payload) {- return [];+ trigger(...payload: T) {+ for (const handler of this.subscribers) {+ handler(...payload);}- this.value = payload;- return this.subscribers.map((handler) => handler(...payload));+ return this;}- destroy() {+ clear() {this.subscribers = [];- this.value = undefined;}}diff --git a/packages/excalidraw/tests/__snapshots__/contextmenu.test.tsx.snap b/packages/excalidraw/tests/__snapshots__/contextmenu.test.tsx.snapindex d672a25429..b14000c2c0 100644--- a/packages/excalidraw/tests/__snapshots__/contextmenu.test.tsx.snap+++ b/packages/excalidraw/tests/__snapshots__/contextmenu.test.tsx.snap@@ -604,7 +604,7 @@ exports[`contextMenu element > selecting 'Add to library' in context menu adds e"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 401146281,+ "versionNonce": 2019559783,"width": 20,"x": -10,"y": 0,@@ -663,7 +663,7 @@ exports[`contextMenu element > selecting 'Add to library' in context menu adds e"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 401146281,+ "versionNonce": 2019559783,"width": 20,"x": -10,"y": 0,@@ -799,14 +799,14 @@ exports[`contextMenu element > selecting 'Bring forward' in context menu brings"roundness": {"type": 3,},- "seed": 1150084233,+ "seed": 1116226695,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 1014066025,+ "versionNonce": 238820263,"width": 20,"x": 20,"y": 30,@@ -838,7 +838,7 @@ exports[`contextMenu element > selecting 'Bring forward' in context menu brings"type": "rectangle","updated": 1,"version": 3,- "versionNonce": 400692809,+ "versionNonce": 1604849351,"width": 20,"x": -10,"y": 0,@@ -897,7 +897,7 @@ exports[`contextMenu element > selecting 'Bring forward' in context menu brings"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 401146281,+ "versionNonce": 2019559783,"width": 20,"x": -10,"y": 0,@@ -940,7 +940,7 @@ exports[`contextMenu element > selecting 'Bring forward' in context menu brings"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 401146281,+ "versionNonce": 2019559783,"width": 20,"x": -10,"y": 0,@@ -962,14 +962,14 @@ exports[`contextMenu element > selecting 'Bring forward' in context menu brings"roundness": {"type": 3,},- "seed": 1150084233,+ "seed": 1116226695,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 1014066025,+ "versionNonce": 238820263,"width": 20,"x": 20,"y": 30,@@ -1005,14 +1005,14 @@ exports[`contextMenu element > selecting 'Bring forward' in context menu brings"roundness": {"type": 3,},- "seed": 1150084233,+ "seed": 1116226695,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 1014066025,+ "versionNonce": 238820263,"width": 20,"x": 20,"y": 30,@@ -1041,7 +1041,7 @@ exports[`contextMenu element > selecting 'Bring forward' in context menu brings"type": "rectangle","updated": 1,"version": 3,- "versionNonce": 400692809,+ "versionNonce": 1604849351,"width": 20,"x": -10,"y": 0,@@ -1177,14 +1177,14 @@ exports[`contextMenu element > selecting 'Bring to front' in context menu brings"roundness": {"type": 3,},- "seed": 1150084233,+ "seed": 1116226695,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 1014066025,+ "versionNonce": 238820263,"width": 20,"x": 20,"y": 30,@@ -1216,7 +1216,7 @@ exports[`contextMenu element > selecting 'Bring to front' in context menu brings"type": "rectangle","updated": 1,"version": 3,- "versionNonce": 400692809,+ "versionNonce": 1604849351,"width": 20,"x": -10,"y": 0,@@ -1275,7 +1275,7 @@ exports[`contextMenu element > selecting 'Bring to front' in context menu brings"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 401146281,+ "versionNonce": 2019559783,"width": 20,"x": -10,"y": 0,@@ -1318,7 +1318,7 @@ exports[`contextMenu element > selecting 'Bring to front' in context menu brings"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 401146281,+ "versionNonce": 2019559783,"width": 20,"x": -10,"y": 0,@@ -1340,14 +1340,14 @@ exports[`contextMenu element > selecting 'Bring to front' in context menu brings"roundness": {"type": 3,},- "seed": 1150084233,+ "seed": 1116226695,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 1014066025,+ "versionNonce": 238820263,"width": 20,"x": 20,"y": 30,@@ -1383,14 +1383,14 @@ exports[`contextMenu element > selecting 'Bring to front' in context menu brings"roundness": {"type": 3,},- "seed": 1150084233,+ "seed": 1116226695,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 1014066025,+ "versionNonce": 238820263,"width": 20,"x": 20,"y": 30,@@ -1419,7 +1419,7 @@ exports[`contextMenu element > selecting 'Bring to front' in context menu brings"type": "rectangle","updated": 1,"version": 3,- "versionNonce": 400692809,+ "versionNonce": 1604849351,"width": 20,"x": -10,"y": 0,@@ -1557,7 +1557,7 @@ exports[`contextMenu element > selecting 'Copy styles' in context menu copies st"roundness": {"type": 3,},- "seed": 453191,+ "seed": 449462985,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,@@ -1616,7 +1616,7 @@ exports[`contextMenu element > selecting 'Copy styles' in context menu copies st"roundness": {"type": 3,},- "seed": 453191,+ "seed": 449462985,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,@@ -1764,7 +1764,7 @@ exports[`contextMenu element > selecting 'Delete' in context menu deletes elemen"type": "rectangle","updated": 1,"version": 3,- "versionNonce": 1150084233,+ "versionNonce": 1116226695,"width": 20,"x": -10,"y": 0,@@ -1823,7 +1823,7 @@ exports[`contextMenu element > selecting 'Delete' in context menu deletes elemen"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 401146281,+ "versionNonce": 2019559783,"width": 20,"x": -10,"y": 0,@@ -1864,7 +1864,7 @@ exports[`contextMenu element > selecting 'Delete' in context menu deletes elemen"type": "rectangle","updated": 1,"version": 3,- "versionNonce": 1150084233,+ "versionNonce": 1116226695,"width": 20,"x": -10,"y": 0,@@ -2007,7 +2007,7 @@ exports[`contextMenu element > selecting 'Duplicate' in context menu duplicates"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 401146281,+ "versionNonce": 2019559783,"width": 20,"x": -10,"y": 0,@@ -2032,14 +2032,14 @@ exports[`contextMenu element > selecting 'Duplicate' in context menu duplicates"roundness": {"type": 3,},- "seed": 1150084233,+ "seed": 1116226695,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 401146281,+ "versionNonce": 2019559783,"width": 20,"x": 0,"y": 10,@@ -2098,7 +2098,7 @@ exports[`contextMenu element > selecting 'Duplicate' in context menu duplicates"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 401146281,+ "versionNonce": 2019559783,"width": 20,"x": -10,"y": 0,@@ -2141,7 +2141,7 @@ exports[`contextMenu element > selecting 'Duplicate' in context menu duplicates"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 401146281,+ "versionNonce": 2019559783,"width": 20,"x": -10,"y": 0,@@ -2163,14 +2163,14 @@ exports[`contextMenu element > selecting 'Duplicate' in context menu duplicates"roundness": {"type": 3,},- "seed": 1150084233,+ "seed": 1116226695,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 401146281,+ "versionNonce": 2019559783,"width": 20,"x": 0,"y": 10,@@ -2320,7 +2320,7 @@ exports[`contextMenu element > selecting 'Group selection' in context menu group"type": "rectangle","updated": 1,"version": 3,- "versionNonce": 1604849351,+ "versionNonce": 1505387817,"width": 20,"x": -10,"y": 0,@@ -2347,14 +2347,14 @@ exports[`contextMenu element > selecting 'Group selection' in context menu group"roundness": {"type": 3,},- "seed": 1150084233,+ "seed": 1116226695,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 3,- "versionNonce": 1505387817,+ "versionNonce": 23633383,"width": 20,"x": 20,"y": 30,@@ -2413,7 +2413,7 @@ exports[`contextMenu element > selecting 'Group selection' in context menu group"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 401146281,+ "versionNonce": 2019559783,"width": 20,"x": -10,"y": 0,@@ -2456,7 +2456,7 @@ exports[`contextMenu element > selecting 'Group selection' in context menu group"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 401146281,+ "versionNonce": 2019559783,"width": 20,"x": -10,"y": 0,@@ -2478,14 +2478,14 @@ exports[`contextMenu element > selecting 'Group selection' in context menu group"roundness": {"type": 3,},- "seed": 1150084233,+ "seed": 1116226695,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 1014066025,+ "versionNonce": 238820263,"width": 20,"x": 20,"y": 30,@@ -2533,7 +2533,7 @@ exports[`contextMenu element > selecting 'Group selection' in context menu group"type": "rectangle","updated": 1,"version": 3,- "versionNonce": 1604849351,+ "versionNonce": 1505387817,"width": 20,"x": -10,"y": 0,@@ -2557,14 +2557,14 @@ exports[`contextMenu element > selecting 'Group selection' in context menu group"roundness": {"type": 3,},- "seed": 1150084233,+ "seed": 1116226695,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 3,- "versionNonce": 1505387817,+ "versionNonce": 23633383,"width": 20,"x": 20,"y": 30,@@ -2709,7 +2709,7 @@ exports[`contextMenu element > selecting 'Paste styles' in context menu pastes s"type": "rectangle","updated": 1,"version": 3,- "versionNonce": 1898319239,+ "versionNonce": 640725609,"width": 20,"x": -10,"y": 0,@@ -2734,14 +2734,14 @@ exports[`contextMenu element > selecting 'Paste styles' in context menu pastes s"roundness": {"type": 3,},- "seed": 1723083209,+ "seed": 760410951,"strokeColor": "#e03131","strokeStyle": "dotted","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 8,- "versionNonce": 289600103,+ "versionNonce": 1315507081,"width": 20,"x": 20,"y": 30,@@ -2800,7 +2800,7 @@ exports[`contextMenu element > selecting 'Paste styles' in context menu pastes s"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 401146281,+ "versionNonce": 2019559783,"width": 20,"x": -10,"y": 0,@@ -2843,7 +2843,7 @@ exports[`contextMenu element > selecting 'Paste styles' in context menu pastes s"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 401146281,+ "versionNonce": 2019559783,"width": 20,"x": -10,"y": 0,@@ -2865,14 +2865,14 @@ exports[`contextMenu element > selecting 'Paste styles' in context menu pastes s"roundness": {"type": 3,},- "seed": 1150084233,+ "seed": 1116226695,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 1014066025,+ "versionNonce": 238820263,"width": 20,"x": 20,"y": 30,@@ -2915,7 +2915,7 @@ exports[`contextMenu element > selecting 'Paste styles' in context menu pastes s"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 401146281,+ "versionNonce": 2019559783,"width": 20,"x": -10,"y": 0,@@ -2937,14 +2937,14 @@ exports[`contextMenu element > selecting 'Paste styles' in context menu pastes s"roundness": {"type": 3,},- "seed": 1150084233,+ "seed": 1116226695,"strokeColor": "#e03131","strokeStyle": "solid","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 3,- "versionNonce": 400692809,+ "versionNonce": 1604849351,"width": 20,"x": 20,"y": 30,@@ -2987,7 +2987,7 @@ exports[`contextMenu element > selecting 'Paste styles' in context menu pastes s"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 401146281,+ "versionNonce": 2019559783,"width": 20,"x": -10,"y": 0,@@ -3009,14 +3009,14 @@ exports[`contextMenu element > selecting 'Paste styles' in context menu pastes s"roundness": {"type": 3,},- "seed": 1150084233,+ "seed": 1116226695,"strokeColor": "#e03131","strokeStyle": "solid","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 4,- "versionNonce": 1505387817,+ "versionNonce": 23633383,"width": 20,"x": 20,"y": 30,@@ -3059,7 +3059,7 @@ exports[`contextMenu element > selecting 'Paste styles' in context menu pastes s"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 401146281,+ "versionNonce": 2019559783,"width": 20,"x": -10,"y": 0,@@ -3081,14 +3081,14 @@ exports[`contextMenu element > selecting 'Paste styles' in context menu pastes s"roundness": {"type": 3,},- "seed": 1150084233,+ "seed": 1116226695,"strokeColor": "#e03131","strokeStyle": "solid","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 5,- "versionNonce": 493213705,+ "versionNonce": 915032327,"width": 20,"x": 20,"y": 30,@@ -3131,7 +3131,7 @@ exports[`contextMenu element > selecting 'Paste styles' in context menu pastes s"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 401146281,+ "versionNonce": 2019559783,"width": 20,"x": -10,"y": 0,@@ -3153,14 +3153,14 @@ exports[`contextMenu element > selecting 'Paste styles' in context menu pastes s"roundness": {"type": 3,},- "seed": 1150084233,+ "seed": 1116226695,"strokeColor": "#e03131","strokeStyle": "dotted","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 6,- "versionNonce": 81784553,+ "versionNonce": 747212839,"width": 20,"x": 20,"y": 30,@@ -3203,7 +3203,7 @@ exports[`contextMenu element > selecting 'Paste styles' in context menu pastes s"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 401146281,+ "versionNonce": 2019559783,"width": 20,"x": -10,"y": 0,@@ -3225,14 +3225,14 @@ exports[`contextMenu element > selecting 'Paste styles' in context menu pastes s"roundness": {"type": 3,},- "seed": 1723083209,+ "seed": 760410951,"strokeColor": "#e03131","strokeStyle": "dotted","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 7,- "versionNonce": 760410951,+ "versionNonce": 1006504105,"width": 20,"x": 20,"y": 30,@@ -3275,7 +3275,7 @@ exports[`contextMenu element > selecting 'Paste styles' in context menu pastes s"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 401146281,+ "versionNonce": 2019559783,"width": 20,"x": -10,"y": 0,@@ -3297,14 +3297,14 @@ exports[`contextMenu element > selecting 'Paste styles' in context menu pastes s"roundness": {"type": 3,},- "seed": 1723083209,+ "seed": 760410951,"strokeColor": "#e03131","strokeStyle": "dotted","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 8,- "versionNonce": 289600103,+ "versionNonce": 1315507081,"width": 20,"x": 20,"y": 30,@@ -3347,7 +3347,7 @@ exports[`contextMenu element > selecting 'Paste styles' in context menu pastes s"type": "rectangle","updated": 1,"version": 3,- "versionNonce": 1898319239,+ "versionNonce": 640725609,"width": 20,"x": -10,"y": 0,@@ -3369,14 +3369,14 @@ exports[`contextMenu element > selecting 'Paste styles' in context menu pastes s"roundness": {"type": 3,},- "seed": 1723083209,+ "seed": 760410951,"strokeColor": "#e03131","strokeStyle": "dotted","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 8,- "versionNonce": 289600103,+ "versionNonce": 1315507081,"width": 20,"x": 20,"y": 30,@@ -3512,14 +3512,14 @@ exports[`contextMenu element > selecting 'Send backward' in context menu sends e"roundness": {"type": 3,},- "seed": 1150084233,+ "seed": 1116226695,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 3,- "versionNonce": 400692809,+ "versionNonce": 1604849351,"width": 20,"x": 20,"y": 30,@@ -3551,7 +3551,7 @@ exports[`contextMenu element > selecting 'Send backward' in context menu sends e"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 401146281,+ "versionNonce": 2019559783,"width": 20,"x": -10,"y": 0,@@ -3610,7 +3610,7 @@ exports[`contextMenu element > selecting 'Send backward' in context menu sends e"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 401146281,+ "versionNonce": 2019559783,"width": 20,"x": -10,"y": 0,@@ -3653,7 +3653,7 @@ exports[`contextMenu element > selecting 'Send backward' in context menu sends e"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 401146281,+ "versionNonce": 2019559783,"width": 20,"x": -10,"y": 0,@@ -3675,14 +3675,14 @@ exports[`contextMenu element > selecting 'Send backward' in context menu sends e"roundness": {"type": 3,},- "seed": 1150084233,+ "seed": 1116226695,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 1014066025,+ "versionNonce": 238820263,"width": 20,"x": 20,"y": 30,@@ -3718,14 +3718,14 @@ exports[`contextMenu element > selecting 'Send backward' in context menu sends e"roundness": {"type": 3,},- "seed": 1150084233,+ "seed": 1116226695,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 3,- "versionNonce": 400692809,+ "versionNonce": 1604849351,"width": 20,"x": 20,"y": 30,@@ -3754,7 +3754,7 @@ exports[`contextMenu element > selecting 'Send backward' in context menu sends e"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 401146281,+ "versionNonce": 2019559783,"width": 20,"x": -10,"y": 0,@@ -3890,14 +3890,14 @@ exports[`contextMenu element > selecting 'Send to back' in context menu sends el"roundness": {"type": 3,},- "seed": 1150084233,+ "seed": 1116226695,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 3,- "versionNonce": 400692809,+ "versionNonce": 1604849351,"width": 20,"x": 20,"y": 30,@@ -3929,7 +3929,7 @@ exports[`contextMenu element > selecting 'Send to back' in context menu sends el"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 401146281,+ "versionNonce": 2019559783,"width": 20,"x": -10,"y": 0,@@ -3988,7 +3988,7 @@ exports[`contextMenu element > selecting 'Send to back' in context menu sends el"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 401146281,+ "versionNonce": 2019559783,"width": 20,"x": -10,"y": 0,@@ -4031,7 +4031,7 @@ exports[`contextMenu element > selecting 'Send to back' in context menu sends el"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 401146281,+ "versionNonce": 2019559783,"width": 20,"x": -10,"y": 0,@@ -4053,14 +4053,14 @@ exports[`contextMenu element > selecting 'Send to back' in context menu sends el"roundness": {"type": 3,},- "seed": 1150084233,+ "seed": 1116226695,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 1014066025,+ "versionNonce": 238820263,"width": 20,"x": 20,"y": 30,@@ -4096,14 +4096,14 @@ exports[`contextMenu element > selecting 'Send to back' in context menu sends el"roundness": {"type": 3,},- "seed": 1150084233,+ "seed": 1116226695,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 3,- "versionNonce": 400692809,+ "versionNonce": 1604849351,"width": 20,"x": 20,"y": 30,@@ -4132,7 +4132,7 @@ exports[`contextMenu element > selecting 'Send to back' in context menu sends el"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 401146281,+ "versionNonce": 2019559783,"width": 20,"x": -10,"y": 0,@@ -4271,14 +4271,14 @@ exports[`contextMenu element > selecting 'Ungroup selection' in context menu ung"roundness": {"type": 3,},- "seed": 453191,+ "seed": 449462985,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 4,- "versionNonce": 915032327,+ "versionNonce": 81784553,"width": 20,"x": -10,"y": 0,@@ -4303,14 +4303,14 @@ exports[`contextMenu element > selecting 'Ungroup selection' in context menu ung"roundness": {"type": 3,},- "seed": 1116226695,+ "seed": 1014066025,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 4,- "versionNonce": 81784553,+ "versionNonce": 747212839,"width": 20,"x": 20,"y": 30,@@ -4362,7 +4362,7 @@ exports[`contextMenu element > selecting 'Ungroup selection' in context menu ung"roundness": {"type": 3,},- "seed": 453191,+ "seed": 449462985,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,@@ -4405,7 +4405,7 @@ exports[`contextMenu element > selecting 'Ungroup selection' in context menu ung"roundness": {"type": 3,},- "seed": 453191,+ "seed": 449462985,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,@@ -4434,14 +4434,14 @@ exports[`contextMenu element > selecting 'Ungroup selection' in context menu ung"roundness": {"type": 3,},- "seed": 1116226695,+ "seed": 1014066025,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 238820263,+ "versionNonce": 400692809,"width": 20,"x": 20,"y": 30,@@ -4482,14 +4482,14 @@ exports[`contextMenu element > selecting 'Ungroup selection' in context menu ung"roundness": {"type": 3,},- "seed": 453191,+ "seed": 449462985,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 3,- "versionNonce": 1505387817,+ "versionNonce": 23633383,"width": 20,"x": -10,"y": 0,@@ -4513,14 +4513,14 @@ exports[`contextMenu element > selecting 'Ungroup selection' in context menu ung"roundness": {"type": 3,},- "seed": 1116226695,+ "seed": 1014066025,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 3,- "versionNonce": 23633383,+ "versionNonce": 493213705,"width": 20,"x": 20,"y": 30,@@ -4557,14 +4557,14 @@ exports[`contextMenu element > selecting 'Ungroup selection' in context menu ung"roundness": {"type": 3,},- "seed": 453191,+ "seed": 449462985,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 4,- "versionNonce": 915032327,+ "versionNonce": 81784553,"width": 20,"x": -10,"y": 0,@@ -4586,14 +4586,14 @@ exports[`contextMenu element > selecting 'Ungroup selection' in context menu ung"roundness": {"type": 3,},- "seed": 1116226695,+ "seed": 1014066025,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 4,- "versionNonce": 81784553,+ "versionNonce": 747212839,"width": 20,"x": 20,"y": 30,@@ -5005,14 +5005,14 @@ exports[`contextMenu element > shows 'Group selection' in context menu for multi"roundness": {"type": 3,},- "seed": 449462985,+ "seed": 453191,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 401146281,+ "versionNonce": 1116226695,"width": 10,"x": -10,"y": 0,@@ -5037,14 +5037,14 @@ exports[`contextMenu element > shows 'Group selection' in context menu for multi"roundness": {"type": 3,},- "seed": 1150084233,+ "seed": 238820263,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 1014066025,+ "versionNonce": 1604849351,"width": 10,"x": 10,"y": 0,@@ -5096,14 +5096,14 @@ exports[`contextMenu element > shows 'Group selection' in context menu for multi"roundness": {"type": 3,},- "seed": 449462985,+ "seed": 453191,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 401146281,+ "versionNonce": 1116226695,"width": 10,"x": -10,"y": 0,@@ -5139,14 +5139,14 @@ exports[`contextMenu element > shows 'Group selection' in context menu for multi"roundness": {"type": 3,},- "seed": 449462985,+ "seed": 453191,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 401146281,+ "versionNonce": 1116226695,"width": 10,"x": -10,"y": 0,@@ -5168,14 +5168,14 @@ exports[`contextMenu element > shows 'Group selection' in context menu for multi"roundness": {"type": 3,},- "seed": 1150084233,+ "seed": 238820263,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 1014066025,+ "versionNonce": 1604849351,"width": 10,"x": 10,"y": 0,@@ -5591,14 +5591,14 @@ exports[`contextMenu element > shows 'Ungroup selection' in context menu for gro"roundness": {"type": 3,},- "seed": 453191,+ "seed": 449462985,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 3,- "versionNonce": 23633383,+ "versionNonce": 493213705,"width": 10,"x": -10,"y": 0,@@ -5625,14 +5625,14 @@ exports[`contextMenu element > shows 'Ungroup selection' in context menu for gro"roundness": {"type": 3,},- "seed": 1116226695,+ "seed": 1014066025,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 3,- "versionNonce": 493213705,+ "versionNonce": 915032327,"width": 10,"x": 10,"y": 0,@@ -5684,7 +5684,7 @@ exports[`contextMenu element > shows 'Ungroup selection' in context menu for gro"roundness": {"type": 3,},- "seed": 453191,+ "seed": 449462985,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,@@ -5727,7 +5727,7 @@ exports[`contextMenu element > shows 'Ungroup selection' in context menu for gro"roundness": {"type": 3,},- "seed": 453191,+ "seed": 449462985,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,@@ -5756,14 +5756,14 @@ exports[`contextMenu element > shows 'Ungroup selection' in context menu for gro"roundness": {"type": 3,},- "seed": 1116226695,+ "seed": 1014066025,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 238820263,+ "versionNonce": 400692809,"width": 10,"x": 10,"y": 0,@@ -5804,14 +5804,14 @@ exports[`contextMenu element > shows 'Ungroup selection' in context menu for gro"roundness": {"type": 3,},- "seed": 453191,+ "seed": 449462985,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 3,- "versionNonce": 23633383,+ "versionNonce": 493213705,"width": 10,"x": -10,"y": 0,@@ -5835,14 +5835,14 @@ exports[`contextMenu element > shows 'Ungroup selection' in context menu for gro"roundness": {"type": 3,},- "seed": 1116226695,+ "seed": 1014066025,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,"type": "rectangle","updated": 1,"version": 3,- "versionNonce": 493213705,+ "versionNonce": 915032327,"width": 10,"x": 10,"y": 0,@@ -6892,7 +6892,7 @@ exports[`contextMenu element > shows context menu for element > [end of test] el"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 401146281,+ "versionNonce": 2019559783,"width": 20,"x": -10,"y": 0,@@ -7015,7 +7015,7 @@ exports[`contextMenu element > shows context menu for element > [end of test] hi"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 401146281,+ "versionNonce": 2019559783,"width": 20,"x": -10,"y": 0,diff --git a/packages/excalidraw/tests/__snapshots__/regressionTests.test.tsx.snap b/packages/excalidraw/tests/__snapshots__/regressionTests.test.tsx.snapindex 452f9242c2..65fa168996 100644--- a/packages/excalidraw/tests/__snapshots__/regressionTests.test.tsx.snap+++ b/packages/excalidraw/tests/__snapshots__/regressionTests.test.tsx.snap@@ -1908,7 +1908,7 @@ exports[`regression tests > Drags selected element when hitting only bounding bo"type": "ellipse","updated": 1,"version": 2,- "versionNonce": 453191,+ "versionNonce": 401146281,"width": 10,"x": 0,"y": 0,@@ -1951,7 +1951,7 @@ exports[`regression tests > Drags selected element when hitting only bounding bo"type": "ellipse","updated": 1,"version": 3,- "versionNonce": 1150084233,+ "versionNonce": 1116226695,"width": 10,"x": 25,"y": 25,@@ -16160,7 +16160,7 @@ exports[`regression tests > switches from group of selected elements to another"roundness": {"type": 2,},- "seed": 493213705,+ "seed": 915032327,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,@@ -16246,7 +16246,7 @@ exports[`regression tests > switches from group of selected elements to another"roundness": {"type": 2,},- "seed": 493213705,+ "seed": 915032327,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,@@ -16330,7 +16330,7 @@ exports[`regression tests > switches from group of selected elements to another"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 453191,+ "versionNonce": 401146281,"width": 10,"x": 0,"y": 0,@@ -16373,7 +16373,7 @@ exports[`regression tests > switches from group of selected elements to another"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 453191,+ "versionNonce": 401146281,"width": 10,"x": 0,"y": 0,@@ -16395,14 +16395,14 @@ exports[`regression tests > switches from group of selected elements to another"roundness": {"type": 2,},- "seed": 2019559783,+ "seed": 1150084233,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,"type": "ellipse","updated": 1,"version": 2,- "versionNonce": 1116226695,+ "versionNonce": 1014066025,"width": 100,"x": 110,"y": 110,@@ -16445,7 +16445,7 @@ exports[`regression tests > switches from group of selected elements to another"type": "rectangle","updated": 1,"version": 2,- "versionNonce": 453191,+ "versionNonce": 401146281,"width": 10,"x": 0,"y": 0,@@ -16467,14 +16467,14 @@ exports[`regression tests > switches from group of selected elements to another"roundness": {"type": 2,},- "seed": 2019559783,+ "seed": 1150084233,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,"type": "ellipse","updated": 1,"version": 2,- "versionNonce": 1116226695,+ "versionNonce": 1014066025,"width": 100,"x": 110,"y": 110,@@ -16496,14 +16496,14 @@ exports[`regression tests > switches from group of selected elements to another"roundness": {"type": 2,},- "seed": 238820263,+ "seed": 400692809,"strokeColor": "#1e1e1e","strokeStyle": "solid","strokeWidth": 2,"type": "diamond","updated": 1,"version": 2,- "versionNonce": 1604849351,+ "versionNonce": 1505387817,"width": 100,"x": 310,"y": 310,