From a376bd949537f93b1f0cae2ca696cfe44065b226 Mon Sep 17 00:00:00 2001 From: Marcel Mraz Date: Sat, 12 Aug 2023 22:56:59 +0200 Subject: [PATCH] feat: partition main canvas vertically (#6759) Co-authored-by: Marcel Mraz Co-authored-by: dwelle --- package.json | 2 +- src/actions/actionCanvas.tsx | 2 +- src/actions/actionDuplicateSelection.tsx | 38 +- src/actions/actionFinalize.tsx | 9 +- src/actions/actionFrame.ts | 2 +- src/actions/actionGroup.tsx | 17 +- src/actions/actionSelectAll.ts | 34 +- src/components/Actions.tsx | 6 +- src/components/App.test.tsx | 4 +- src/components/App.tsx | 732 ++++--- src/components/EyeDropper.tsx | 4 +- src/components/JSONExportDialog.tsx | 4 +- src/components/LayerUI.tsx | 24 +- src/components/MobileMenu.tsx | 8 +- src/components/canvases/InteractiveCanvas.tsx | 222 +++ src/components/canvases/StaticCanvas.tsx | 113 ++ src/components/canvases/index.tsx | 4 + src/css/styles.scss | 14 +- src/data/blob.ts | 6 +- src/element/Hyperlink.tsx | 12 +- src/element/binding.ts | 1 + src/element/bounds.ts | 8 +- src/element/collision.ts | 8 +- src/element/linearElementEditor.ts | 17 +- src/element/mutateElement.ts | 4 +- src/element/sizeHelpers.ts | 40 +- src/element/textWysiwyg.test.tsx | 10 +- src/element/textWysiwyg.tsx | 2 +- src/element/transformHandles.ts | 6 +- src/excalidraw-app/data/tabSync.ts | 22 +- src/excalidraw-app/index.tsx | 2 +- src/frame.ts | 20 +- src/groups.ts | 246 ++- src/math.ts | 4 +- src/renderer/renderElement.ts | 234 +-- src/renderer/renderScene.ts | 1341 ++++++------- src/scene/Fonts.ts | 4 +- src/scene/Renderer.ts | 131 ++ src/scene/Scene.ts | 8 + src/scene/ShapeCache.ts | 61 + src/scene/export.ts | 23 +- src/scene/scroll.ts | 9 +- src/scene/scrollbars.ts | 22 +- src/scene/selection.ts | 4 +- src/scene/types.ts | 76 +- .../__snapshots__/contextmenu.test.tsx.snap | 1228 ++++++------ .../__snapshots__/dragCreate.test.tsx.snap | 20 +- .../linearElementEditor.test.tsx.snap | 2 +- src/tests/__snapshots__/move.test.tsx.snap | 24 +- .../multiPointCreate.test.tsx.snap | 8 +- .../regressionTests.test.tsx.snap | 1674 +++++++++++------ .../__snapshots__/selection.test.tsx.snap | 20 +- src/tests/contextmenu.test.tsx | 44 +- src/tests/dragCreate.test.tsx | 58 +- src/tests/helpers/api.ts | 4 +- src/tests/helpers/ui.ts | 27 +- src/tests/linearElementEditor.test.tsx | 95 +- src/tests/move.test.tsx | 38 +- src/tests/multiPointCreate.test.tsx | 32 +- src/tests/packages/excalidraw.test.tsx | 12 +- src/tests/regressionTests.test.tsx | 28 +- src/tests/resize.test.tsx | 5 +- src/tests/selection.test.tsx | 49 +- src/tests/test-utils.ts | 27 +- src/tests/viewMode.test.tsx | 20 +- src/tests/zindex.test.tsx | 2 +- src/types.ts | 53 +- src/utils.ts | 103 +- yarn.lock | 185 +- 69 files changed, 4348 insertions(+), 2970 deletions(-) create mode 100644 src/components/canvases/InteractiveCanvas.tsx create mode 100644 src/components/canvases/StaticCanvas.tsx create mode 100644 src/components/canvases/index.tsx create mode 100644 src/scene/Renderer.ts create mode 100644 src/scene/ShapeCache.ts diff --git a/package.json b/package.json index 89299056..a2a66b5c 100644 --- a/package.json +++ b/package.json @@ -90,7 +90,7 @@ "vite-plugin-ejs": "1.6.4", "vite-plugin-pwa": "0.16.4", "vite-plugin-svgr": "2.4.0", - "vitest": "0.32.2", + "vitest": "0.34.1", "vitest-canvas-mock": "0.3.2" }, "engines": { diff --git a/src/actions/actionCanvas.tsx b/src/actions/actionCanvas.tsx index d5ecfcfe..6531203e 100644 --- a/src/actions/actionCanvas.tsx +++ b/src/actions/actionCanvas.tsx @@ -423,7 +423,7 @@ export const actionToggleHandTool = register({ type: "hand", lastActiveToolBeforeEraser: appState.activeTool, }); - setCursor(app.canvas, CURSOR_TYPE.GRAB); + setCursor(app.interactiveCanvas, CURSOR_TYPE.GRAB); } return { diff --git a/src/actions/actionDuplicateSelection.tsx b/src/actions/actionDuplicateSelection.tsx index 81dea88f..a21260d5 100644 --- a/src/actions/actionDuplicateSelection.tsx +++ b/src/actions/actionDuplicateSelection.tsx @@ -259,23 +259,25 @@ const duplicateElements = ( return { elements: finalElements, - appState: selectGroupsForSelectedElements( - { - ...appState, - selectedGroupIds: {}, - selectedElementIds: nextElementsToSelect.reduce( - (acc: Record, element) => { - if (!isBoundToContainer(element)) { - acc[element.id] = true; - } - return acc; - }, - {}, - ), - }, - getNonDeletedElements(finalElements), - appState, - null, - ), + appState: { + ...appState, + ...selectGroupsForSelectedElements( + { + editingGroupId: appState.editingGroupId, + selectedElementIds: nextElementsToSelect.reduce( + (acc: Record, element) => { + if (!isBoundToContainer(element)) { + acc[element.id] = true; + } + return acc; + }, + {}, + ), + }, + getNonDeletedElements(finalElements), + appState, + null, + ), + }, }; }; diff --git a/src/actions/actionFinalize.tsx b/src/actions/actionFinalize.tsx index 44f14d70..c25e2ef4 100644 --- a/src/actions/actionFinalize.tsx +++ b/src/actions/actionFinalize.tsx @@ -19,7 +19,12 @@ import { AppState } from "../types"; export const actionFinalize = register({ name: "finalize", trackEvent: false, - perform: (elements, appState, _, { canvas, focusContainer, scene }) => { + perform: ( + elements, + appState, + _, + { interactiveCanvas, focusContainer, scene }, + ) => { if (appState.editingLinearElement) { const { elementId, startBindingElement, endBindingElement } = appState.editingLinearElement; @@ -132,7 +137,7 @@ export const actionFinalize = register({ appState.activeTool.type !== "freedraw") || !multiPointElement ) { - resetCursor(canvas); + resetCursor(interactiveCanvas); } let activeTool: AppState["activeTool"]; diff --git a/src/actions/actionFrame.ts b/src/actions/actionFrame.ts index 7cf6ea4e..339545f8 100644 --- a/src/actions/actionFrame.ts +++ b/src/actions/actionFrame.ts @@ -108,7 +108,7 @@ export const actionSetFrameAsActiveTool = register({ type: "frame", }); - setCursorForShape(app.canvas, { + setCursorForShape(app.interactiveCanvas, { ...appState, activeTool: nextActiveTool, }); diff --git a/src/actions/actionGroup.tsx b/src/actions/actionGroup.tsx index 82293d7d..8ee84ac7 100644 --- a/src/actions/actionGroup.tsx +++ b/src/actions/actionGroup.tsx @@ -149,11 +149,14 @@ export const actionGroup = register({ ]; return { - appState: selectGroup( - newGroupId, - { ...appState, selectedGroupIds: {} }, - getNonDeletedElements(nextElements), - ), + appState: { + ...appState, + ...selectGroup( + newGroupId, + { ...appState, selectedGroupIds: {} }, + getNonDeletedElements(nextElements), + ), + }, elements: nextElements, commitToHistory: true, }; @@ -212,7 +215,7 @@ export const actionUngroup = register({ }); const updateAppState = selectGroupsForSelectedElements( - { ...appState, selectedGroupIds: {} }, + appState, getNonDeletedElements(nextElements), appState, null, @@ -243,7 +246,7 @@ export const actionUngroup = register({ ); return { - appState: updateAppState, + appState: { ...appState, ...updateAppState }, elements: nextElements, commitToHistory: true, }; diff --git a/src/actions/actionSelectAll.ts b/src/actions/actionSelectAll.ts index eeadf2dc..49f5072c 100644 --- a/src/actions/actionSelectAll.ts +++ b/src/actions/actionSelectAll.ts @@ -28,22 +28,24 @@ export const actionSelectAll = register({ }, {}); return { - appState: selectGroupsForSelectedElements( - { - ...appState, - selectedLinearElement: - // single linear element selected - Object.keys(selectedElementIds).length === 1 && - isLinearElement(elements[0]) - ? new LinearElementEditor(elements[0], app.scene) - : null, - editingGroupId: null, - selectedElementIds, - }, - getNonDeletedElements(elements), - appState, - app, - ), + appState: { + ...appState, + ...selectGroupsForSelectedElements( + { + editingGroupId: null, + selectedElementIds, + }, + getNonDeletedElements(elements), + appState, + app, + ), + selectedLinearElement: + // single linear element selected + Object.keys(selectedElementIds).length === 1 && + isLinearElement(elements[0]) + ? new LinearElementEditor(elements[0], app.scene) + : null, + }, commitToHistory: true, }; }, diff --git a/src/components/Actions.tsx b/src/components/Actions.tsx index 86381572..e9483eac 100644 --- a/src/components/Actions.tsx +++ b/src/components/Actions.tsx @@ -213,13 +213,13 @@ export const SelectedShapeActions = ({ }; export const ShapesSwitcher = ({ - canvas, + interactiveCanvas, activeTool, setAppState, onImageAction, appState, }: { - canvas: HTMLCanvasElement | null; + interactiveCanvas: HTMLCanvasElement | null; activeTool: UIAppState["activeTool"]; setAppState: React.Component["setState"]; onImageAction: (data: { pointerType: PointerType | null }) => void; @@ -270,7 +270,7 @@ export const ShapesSwitcher = ({ multiElement: null, selectedElementIds: {}, }); - setCursorForShape(canvas, { + setCursorForShape(interactiveCanvas, { ...appState, activeTool: nextActiveTool, }); diff --git a/src/components/App.test.tsx b/src/components/App.test.tsx index 32f62f7a..19f98730 100644 --- a/src/components/App.test.tsx +++ b/src/components/App.test.tsx @@ -6,14 +6,14 @@ import { render, queryByTestId } from "../tests/test-utils"; import ExcalidrawApp from "../excalidraw-app"; import { vi } from "vitest"; -const renderScene = vi.spyOn(Renderer, "renderScene"); +const renderStaticScene = vi.spyOn(Renderer, "renderStaticScene"); describe("Test ", () => { beforeEach(async () => { // Unmount ReactDOM from root ReactDOM.unmountComponentAtNode(document.getElementById("root")!); localStorage.clear(); - renderScene.mockClear(); + renderStaticScene.mockClear(); reseed(7); }); diff --git a/src/components/App.tsx b/src/components/App.tsx index 901b9836..2a39bc6b 100644 --- a/src/components/App.tsx +++ b/src/components/App.tsx @@ -189,15 +189,13 @@ import { isArrowKey, KEYS, } from "../keys"; - +import { isElementInViewport } from "../element/sizeHelpers"; import { distance2d, getCornerRadius, getGridPoint, isPathALoop, } from "../math"; -import { isVisibleElement, renderScene } from "../renderer/renderScene"; -import { invalidateShapeForElement } from "../renderer/renderElement"; import { calculateScrollCenter, getElementsAtPosition, @@ -209,7 +207,7 @@ import { isSomeElementSelected, } from "../scene"; import Scene from "../scene/Scene"; -import { RenderConfig, ScrollBars } from "../scene/types"; +import { RenderInteractiveSceneCallback, ScrollBars } from "../scene/types"; import { getStateForZoom } from "../scene/zoom"; import { findShapeByKey, SHAPES } from "../shapes"; import { @@ -352,6 +350,9 @@ import { } from "../data/transform"; import { ValueOf } from "../utility-types"; import { isSidebarDockedAtom } from "./Sidebar/Sidebar"; +import { StaticCanvas, InteractiveCanvas } from "./canvases"; +import { Renderer } from "../scene/Renderer"; +import { ShapeCache } from "../scene/ShapeCache"; const AppContext = React.createContext(null!); const AppPropsContext = React.createContext(null!); @@ -429,10 +430,6 @@ const YOUTUBE_VIDEO_STATES = new Map< ValueOf >(); -// remove this hack when we can sync render & resizeObserver (state update) -// to rAF. See #5439 -let THROTTLE_NEXT_RENDER = true; - let IS_PLAIN_PASTE = false; let IS_PLAIN_PASTE_TIMER = 0; let PLAIN_PASTE_TOAST_SHOWN = false; @@ -446,8 +443,9 @@ const gesture: Gesture = { }; class App extends React.Component { - canvas: AppClassProperties["canvas"] = null; - rc: RoughCanvas | null = null; + canvas: AppClassProperties["canvas"]; + interactiveCanvas: AppClassProperties["interactiveCanvas"] = null; + rc: RoughCanvas; unmounted: boolean = false; actionManager: ActionManager; device: Device = deviceContextInitialValue; @@ -461,6 +459,7 @@ class App extends React.Component { }; public scene: Scene; + public renderer: Renderer; private fonts: Fonts; private resizeObserver: ResizeObserver | undefined; private nearestScrollableContainer: HTMLElement | Document | undefined; @@ -505,8 +504,16 @@ class App extends React.Component { width: window.innerWidth, height: window.innerHeight, }; + this.id = nanoid(); + this.library = new Library(this); + this.scene = new Scene(); + + this.canvas = document.createElement("canvas"); + this.rc = rough.canvas(this.canvas); + this.renderer = new Renderer(this.scene); + if (excalidrawRef) { const readyPromise = ("current" in excalidrawRef && excalidrawRef.current?.readyPromise) || @@ -549,7 +556,6 @@ class App extends React.Component { id: this.id, }; - this.scene = new Scene(); this.fonts = new Fonts({ scene: this.scene, onSceneUpdated: this.onSceneUpdated, @@ -567,65 +573,6 @@ class App extends React.Component { this.actionManager.registerAction(createRedoAction(this.history)); } - private renderCanvas() { - const canvasScale = window.devicePixelRatio; - const { - width: canvasDOMWidth, - height: canvasDOMHeight, - viewModeEnabled, - } = this.state; - const canvasWidth = canvasDOMWidth * canvasScale; - const canvasHeight = canvasDOMHeight * canvasScale; - if (viewModeEnabled) { - return ( - ) => - this.handleCanvasContextMenu(event) - } - onPointerMove={this.handleCanvasPointerMove} - onPointerUp={this.handleCanvasPointerUp} - onPointerCancel={this.removePointer} - onTouchMove={this.handleTouchMove} - onPointerDown={this.handleCanvasPointerDown} - > - {t("labels.drawingCanvas")} - - ); - } - return ( - ) => - this.handleCanvasContextMenu(event) - } - onPointerDown={this.handleCanvasPointerDown} - onDoubleClick={this.handleCanvasDoubleClick} - onPointerMove={this.handleCanvasPointerMove} - onPointerUp={this.handleCanvasPointerUp} - onPointerCancel={this.removePointer} - onTouchMove={this.handleTouchMove} - > - {t("labels.drawingCanvas")} - - ); - } - private onWindowMessage(event: MessageEvent) { if ( event.origin !== "https://player.vimeo.com" && @@ -817,7 +764,7 @@ class App extends React.Component { ); mutateElement(element, { validated }, false); - invalidateShapeForElement(element); + ShapeCache.delete(element); } } return false; @@ -855,7 +802,7 @@ class App extends React.Component { this.state, ); const embedLink = getEmbedLink(toValidURL(el.link || "")); - const isVisible = isVisibleElement( + const isVisible = isElementInViewport( el, normalizedWidth, normalizedHeight, @@ -1017,8 +964,7 @@ class App extends React.Component { return this.scene.getNonDeletedFrames().map((f, index) => { if ( - !this.canvas || - !isVisibleElement( + !isElementInViewport( f, this.canvas.width / window.devicePixelRatio, this.canvas.height / window.devicePixelRatio, @@ -1141,9 +1087,7 @@ class App extends React.Component { }} onPointerDown={(event) => this.handleCanvasPointerDown(event)} onWheel={(event) => this.handleWheel(event)} - onContextMenu={(event: React.PointerEvent) => { - this.handleCanvasContextMenu(event); - }} + onContextMenu={this.handleCanvasContextMenu} onDoubleClick={() => { this.setState({ editingFrame: f.id, @@ -1157,9 +1101,24 @@ class App extends React.Component { }; public render() { - const selectedElement = this.scene.getSelectedElements(this.state); + const selectedElements = this.scene.getSelectedElements(this.state); const { renderTopRightUI, renderCustomStats } = this.props; + const versionNonce = this.scene.getVersionNonce(); + const { canvasElements, visibleElements } = + this.renderer.getRenderableElements({ + versionNonce, + zoom: this.state.zoom, + offsetLeft: this.state.offsetLeft, + offsetTop: this.state.offsetTop, + scrollX: this.state.scrollX, + scrollY: this.state.scrollY, + height: this.state.height, + width: this.state.width, + editingElement: this.state.editingElement, + pendingImageElementId: this.state.pendingImageElementId, + }); + return (
{ > {
- {selectedElement.length === 1 && + {selectedElements.length === 1 && !this.state.contextMenu && this.state.showHyperlinkPopup && ( { actionManager={this.actionManager} /> )} -
{this.renderCanvas()}
+ + {this.renderFrameNames()} {this.renderEmbeddables()} @@ -1552,17 +1551,13 @@ class App extends React.Component { if (initialData?.scrollToContent) { scene.appState = { ...scene.appState, - ...calculateScrollCenter( - scene.elements, - { - ...scene.appState, - width: this.state.width, - height: this.state.height, - offsetTop: this.state.offsetTop, - offsetLeft: this.state.offsetLeft, - }, - null, - ), + ...calculateScrollCenter(scene.elements, { + ...scene.appState, + width: this.state.width, + height: this.state.height, + offsetTop: this.state.offsetTop, + offsetLeft: this.state.offsetLeft, + }), }; } // FontFaceSet loadingdone event we listen on may not always fire @@ -1644,7 +1639,6 @@ class App extends React.Component { if ("ResizeObserver" in window && this.excalidrawContainerRef?.current) { this.resizeObserver = new ResizeObserver(() => { - THROTTLE_NEXT_RENDER = false; // recompute device dimensions state // --------------------------------------------------------------------- this.refreshDeviceState(this.excalidrawContainerRef.current!); @@ -1700,6 +1694,9 @@ class App extends React.Component { } public componentWillUnmount() { + this.renderer.destroy(); + this.scene = new Scene(); + this.renderer = new Renderer(this.scene); this.files = {}; this.imageCache.clear(); this.resizeObserver?.disconnect(); @@ -1707,15 +1704,17 @@ class App extends React.Component { this.removeEventListeners(); this.scene.destroy(); this.library.destroy(); + ShapeCache.destroy(); clearTimeout(touchTimeout); isSomeElementSelected.clearCache(); + selectGroupsForSelectedElements.clearCache(); touchTimeout = 0; } private onResize = withBatchedUpdates(() => { this.scene .getElementsIncludingDeleted() - .forEach((element) => invalidateShapeForElement(element)); + .forEach((element) => ShapeCache.delete(element)); this.setState({}); }); @@ -1880,7 +1879,7 @@ class App extends React.Component { this.state.activeTool.type === "eraser" && prevState.theme !== this.state.theme ) { - setEraserCursor(this.canvas, this.state.theme); + setEraserCursor(this.interactiveCanvas, this.state.theme); } // Hide hyperlink popup if shown when element type is not selection if ( @@ -1976,7 +1975,6 @@ class App extends React.Component { ), ); } - this.renderScene(); this.history.record(this.state, this.scene.getElementsIncludingDeleted()); // Do not notify consumers if we're still loading the scene. Among other @@ -1992,114 +1990,24 @@ class App extends React.Component { } } - private renderScene = () => { - const cursorButton: { - [id: string]: string | undefined; - } = {}; - const pointerViewportCoords: RenderConfig["remotePointerViewportCoords"] = - {}; - const remoteSelectedElementIds: RenderConfig["remoteSelectedElementIds"] = - {}; - const pointerUsernames: { [id: string]: string } = {}; - const pointerUserStates: { [id: string]: string } = {}; - this.state.collaborators.forEach((user, socketId) => { - if (user.selectedElementIds) { - for (const id of Object.keys(user.selectedElementIds)) { - if (!(id in remoteSelectedElementIds)) { - remoteSelectedElementIds[id] = []; - } - remoteSelectedElementIds[id].push(socketId); - } - } - if (!user.pointer) { - return; - } - if (user.username) { - pointerUsernames[socketId] = user.username; - } - if (user.userState) { - pointerUserStates[socketId] = user.userState; - } - pointerViewportCoords[socketId] = sceneCoordsToViewportCoords( - { - sceneX: user.pointer.x, - sceneY: user.pointer.y, - }, - this.state, - ); - cursorButton[socketId] = user.button; - }); - - const renderingElements = this.scene - .getNonDeletedElements() - .filter((element) => { - if (isImageElement(element)) { - if ( - // not placed on canvas yet (but in elements array) - this.state.pendingImageElementId === element.id - ) { - return false; - } - } - // don't render text element that's being currently edited (it's - // rendered on remote only) - return ( - !this.state.editingElement || - this.state.editingElement.type !== "text" || - element.id !== this.state.editingElement.id - ); - }); - - const selectionColor = getComputedStyle( - document.querySelector(".excalidraw")!, - ).getPropertyValue("--color-selection"); - - renderScene( - { - elements: renderingElements, - appState: this.state, - scale: window.devicePixelRatio, - rc: this.rc!, - canvas: this.canvas!, - renderConfig: { - selectionColor, - scrollX: this.state.scrollX, - scrollY: this.state.scrollY, - viewBackgroundColor: this.state.viewBackgroundColor, - zoom: this.state.zoom, - remotePointerViewportCoords: pointerViewportCoords, - remotePointerButton: cursorButton, - remoteSelectedElementIds, - remotePointerUsernames: pointerUsernames, - remotePointerUserStates: pointerUserStates, - shouldCacheIgnoreZoom: this.state.shouldCacheIgnoreZoom, - theme: this.state.theme, - imageCache: this.imageCache, - isExporting: false, - renderScrollbars: false, - }, - callback: ({ atLeastOneVisibleElement, scrollBars }) => { - if (scrollBars) { - currentScrollBars = scrollBars; - } - const scrolledOutside = - // hide when editing text - isTextElement(this.state.editingElement) - ? false - : !atLeastOneVisibleElement && renderingElements.length > 0; - if (this.state.scrolledOutside !== scrolledOutside) { - this.setState({ scrolledOutside }); - } - - this.scheduleImageRefresh(); - }, - }, - THROTTLE_NEXT_RENDER && window.EXCALIDRAW_THROTTLE_RENDER === true, - ); - - if (!THROTTLE_NEXT_RENDER) { - THROTTLE_NEXT_RENDER = true; + private renderInteractiveSceneCallback = ({ + atLeastOneVisibleElement, + scrollBars, + elements, + }: RenderInteractiveSceneCallback) => { + if (scrollBars) { + currentScrollBars = scrollBars; } + const scrolledOutside = + // hide when editing text + isTextElement(this.state.editingElement) + ? false + : !atLeastOneVisibleElement && elements.length > 0; + if (this.state.scrolledOutside !== scrolledOutside) { + this.setState({ scrolledOutside }); + } + + this.scheduleImageRefresh(); }; private onScroll = debounce(() => { @@ -2150,7 +2058,7 @@ class App extends React.Component { didTapTwice = false; } - private onTapStart = (event: TouchEvent) => { + private onTouchStart = (event: TouchEvent) => { // fix for Apple Pencil Scribble // On Android, preventing the event would disable contextMenu on tap-hold if (!isAndroid) { @@ -2169,7 +2077,7 @@ class App extends React.Component { // insert text only if we tapped twice with a single finger // event.touches.length === 1 will also prevent inserting text when user's zooming if (didTapTwice && event.touches.length === 1) { - const [touch] = event.touches; + const touch = event.touches[0]; // @ts-ignore this.handleCanvasDoubleClick({ clientX: touch.clientX, @@ -2190,7 +2098,7 @@ class App extends React.Component { } }; - private onTapEnd = (event: TouchEvent) => { + private onTouchEnd = (event: TouchEvent) => { this.resetContextMenuTimer(); if (event.touches.length > 0) { this.setState({ @@ -2399,35 +2307,37 @@ class App extends React.Component { excludeElementsInFramesFromSelection(newElements); this.setState( - selectGroupsForSelectedElements( - { - ...this.state, - // keep sidebar (presumably the library) open if it's docked and - // can fit. - // - // Note, we should close the sidebar only if we're dropping items - // from library, not when pasting from clipboard. Alas. - openSidebar: - this.state.openSidebar && - this.device.canDeviceFitSidebar && - jotaiStore.get(isSidebarDockedAtom) - ? this.state.openSidebar - : null, - selectedElementIds: nextElementsToSelect.reduce( - (acc: Record, element) => { - if (!isBoundToContainer(element)) { - acc[element.id] = true; - } - return acc; - }, - {}, - ), - selectedGroupIds: {}, - }, - this.scene.getNonDeletedElements(), - this.state, - this, - ), + { + ...this.state, + // keep sidebar (presumably the library) open if it's docked and + // can fit. + // + // Note, we should close the sidebar only if we're dropping items + // from library, not when pasting from clipboard. Alas. + openSidebar: + this.state.openSidebar && + this.device.canDeviceFitSidebar && + jotaiStore.get(isSidebarDockedAtom) + ? this.state.openSidebar + : null, + ...selectGroupsForSelectedElements( + { + editingGroupId: null, + selectedElementIds: nextElementsToSelect.reduce( + (acc: Record, element) => { + if (!isBoundToContainer(element)) { + acc[element.id] = true; + } + return acc; + }, + {}, + ), + }, + this.scene.getNonDeletedElements(), + this.state, + this, + ), + }, () => { if (opts.files) { this.addNewImagesToImageCache(); @@ -2686,11 +2596,7 @@ class App extends React.Component { scrollY = appState.scrollY; } else { // compute only the viewport location, without any zoom adjustment - const scroll = calculateScrollCenter( - targetElements, - this.state, - this.canvas, - ); + const scroll = calculateScrollCenter(targetElements, this.state); scrollX = scroll.scrollX; scrollY = scroll.scrollY; } @@ -2796,7 +2702,7 @@ class App extends React.Component { filesMap.has(element.fileId) ) { this.imageCache.delete(element.fileId); - invalidateShapeForElement(element); + ShapeCache.delete(element); } }); this.scene.informMutation(); @@ -3079,7 +2985,7 @@ class App extends React.Component { } if (event.key === KEYS.SPACE && gesture.pointers.size === 0) { isHoldingSpace = true; - setCursor(this.canvas, CURSOR_TYPE.GRAB); + setCursor(this.interactiveCanvas, CURSOR_TYPE.GRAB); event.preventDefault(); } @@ -3143,11 +3049,11 @@ class App extends React.Component { private onKeyUp = withBatchedUpdates((event: KeyboardEvent) => { if (event.key === KEYS.SPACE) { if (this.state.viewModeEnabled) { - setCursor(this.canvas, CURSOR_TYPE.GRAB); + setCursor(this.interactiveCanvas, CURSOR_TYPE.GRAB); } else if (this.state.activeTool.type === "selection") { - resetCursor(this.canvas); + resetCursor(this.interactiveCanvas); } else { - setCursorForShape(this.canvas, this.state); + setCursorForShape(this.interactiveCanvas, this.state); this.setState({ selectedElementIds: makeNextSelectedElementIds({}, this.state), selectedGroupIds: {}, @@ -3183,9 +3089,9 @@ class App extends React.Component { ) => { const nextActiveTool = updateActiveTool(this.state, tool); if (nextActiveTool.type === "hand") { - setCursor(this.canvas, CURSOR_TYPE.GRAB); + setCursor(this.interactiveCanvas, CURSOR_TYPE.GRAB); } else if (!isHoldingSpace) { - setCursorForShape(this.canvas, this.state); + setCursorForShape(this.interactiveCanvas, this.state); } if (isToolIcon(document.activeElement)) { this.focusContainer(); @@ -3210,11 +3116,11 @@ class App extends React.Component { }; private setCursor = (cursor: string) => { - setCursor(this.canvas, cursor); + setCursor(this.interactiveCanvas, cursor); }; private resetCursor = () => { - resetCursor(this.canvas); + resetCursor(this.interactiveCanvas); }; /** * returns whether user is making a gesture with >= 2 fingers (points) @@ -3374,7 +3280,7 @@ class App extends React.Component { editingElement: null, }); if (this.state.activeTool.locked) { - setCursorForShape(this.canvas, this.state); + setCursorForShape(this.interactiveCanvas, this.state); } this.focusContainer(); @@ -3674,7 +3580,7 @@ class App extends React.Component { } } - resetCursor(this.canvas); + resetCursor(this.interactiveCanvas); let { x: sceneX, y: sceneY } = viewportCoordsToSceneCoords( event, @@ -3691,24 +3597,23 @@ class App extends React.Component { getSelectedGroupIdForElement(hitElement, this.state.selectedGroupIds); if (selectedGroupId) { - this.setState((prevState) => - selectGroupsForSelectedElements( + this.setState((prevState) => ({ + ...prevState, + ...selectGroupsForSelectedElements( { - ...prevState, editingGroupId: selectedGroupId, selectedElementIds: { [hitElement!.id]: true }, - selectedGroupIds: {}, }, this.scene.getNonDeletedElements(), prevState, this, ), - ); + })); return; } } - resetCursor(this.canvas); + resetCursor(this.interactiveCanvas); if (!event[KEYS.CTRL_OR_CMD] && !this.state.viewModeEnabled) { const hitElement = this.getElementAtPosition(sceneX, sceneY); @@ -3934,9 +3839,9 @@ class App extends React.Component { const isOverScrollBar = isPointerOverScrollBars.isOverEither; if (!this.state.draggingElement && !this.state.multiElement) { if (isOverScrollBar) { - resetCursor(this.canvas); + resetCursor(this.interactiveCanvas); } else { - setCursorForShape(this.canvas, this.state); + setCursorForShape(this.interactiveCanvas, this.state); } } @@ -3999,7 +3904,7 @@ class App extends React.Component { const { points, lastCommittedPoint } = multiElement; const lastPoint = points[points.length - 1]; - setCursorForShape(this.canvas, this.state); + setCursorForShape(this.interactiveCanvas, this.state); if (lastPoint === lastCommittedPoint) { // if we haven't yet created a temp point and we're beyond commit-zone @@ -4016,7 +3921,7 @@ class App extends React.Component { points: [...points, [scenePointerX - rx, scenePointerY - ry]], }); } else { - setCursor(this.canvas, CURSOR_TYPE.POINTER); + setCursor(this.interactiveCanvas, CURSOR_TYPE.POINTER); // in this branch, we're inside the commit zone, and no uncommitted // point exists. Thus do nothing (don't add/remove points). } @@ -4030,7 +3935,7 @@ class App extends React.Component { lastCommittedPoint[1], ) < LINE_CONFIRM_THRESHOLD ) { - setCursor(this.canvas, CURSOR_TYPE.POINTER); + setCursor(this.interactiveCanvas, CURSOR_TYPE.POINTER); mutateElement(multiElement, { points: points.slice(0, -1), }); @@ -4060,7 +3965,7 @@ class App extends React.Component { } if (isPathALoop(points, this.state.zoom.value)) { - setCursor(this.canvas, CURSOR_TYPE.POINTER); + setCursor(this.interactiveCanvas, CURSOR_TYPE.POINTER); } // update last uncommitted point mutateElement(multiElement, { @@ -4108,7 +4013,7 @@ class App extends React.Component { elementWithTransformHandleType.transformHandleType ) { setCursor( - this.canvas, + this.interactiveCanvas, getCursorForResizingElement(elementWithTransformHandleType), ); return; @@ -4123,7 +4028,7 @@ class App extends React.Component { ); if (transformHandleType) { setCursor( - this.canvas, + this.interactiveCanvas, getCursorForResizingElement({ transformHandleType, }), @@ -4147,7 +4052,7 @@ class App extends React.Component { this.hitLinkElement && !this.state.selectedElementIds[this.hitLinkElement.id] ) { - setCursor(this.canvas, CURSOR_TYPE.POINTER); + setCursor(this.interactiveCanvas, CURSOR_TYPE.POINTER); showHyperlinkTooltip(this.hitLinkElement, this.state); } else { hideHyperlinkToolip(); @@ -4161,13 +4066,13 @@ class App extends React.Component { this.setState({ showHyperlinkPopup: "info" }); } else if (this.state.activeTool.type === "text") { setCursor( - this.canvas, + this.interactiveCanvas, isTextElement(hitElement) ? CURSOR_TYPE.TEXT : CURSOR_TYPE.CROSSHAIR, ); } else if (this.state.viewModeEnabled) { - setCursor(this.canvas, CURSOR_TYPE.GRAB); + setCursor(this.interactiveCanvas, CURSOR_TYPE.GRAB); } else if (isOverScrollBar) { - setCursor(this.canvas, CURSOR_TYPE.AUTO); + setCursor(this.interactiveCanvas, CURSOR_TYPE.AUTO); } else if (this.state.selectedLinearElement) { this.handleHoverSelectedLinearElement( this.state.selectedLinearElement, @@ -4196,19 +4101,19 @@ class App extends React.Component { scenePointerY, ) ) { - setCursor(this.canvas, CURSOR_TYPE.POINTER); + setCursor(this.interactiveCanvas, CURSOR_TYPE.POINTER); this.setState({ activeEmbeddable: { element: hitElement, state: "hover" }, }); } else { - setCursor(this.canvas, CURSOR_TYPE.MOVE); + setCursor(this.interactiveCanvas, CURSOR_TYPE.MOVE); if (this.state.activeEmbeddable?.state === "hover") { this.setState({ activeEmbeddable: null }); } } } } else { - setCursor(this.canvas, CURSOR_TYPE.AUTO); + setCursor(this.interactiveCanvas, CURSOR_TYPE.AUTO); } } }; @@ -4346,9 +4251,9 @@ class App extends React.Component { ); if (hoverPointIndex >= 0 || segmentMidPointHoveredCoords) { - setCursor(this.canvas, CURSOR_TYPE.POINTER); + setCursor(this.interactiveCanvas, CURSOR_TYPE.POINTER); } else { - setCursor(this.canvas, CURSOR_TYPE.MOVE); + setCursor(this.interactiveCanvas, CURSOR_TYPE.MOVE); } } else if ( shouldShowBoundingBox([element], this.state) && @@ -4360,7 +4265,7 @@ class App extends React.Component { scenePointerY, ) ) { - setCursor(this.canvas, CURSOR_TYPE.MOVE); + setCursor(this.interactiveCanvas, CURSOR_TYPE.MOVE); } else if ( boundTextElement && hitTest( @@ -4371,7 +4276,7 @@ class App extends React.Component { scenePointerY, ) ) { - setCursor(this.canvas, CURSOR_TYPE.MOVE); + setCursor(this.interactiveCanvas, CURSOR_TYPE.MOVE); } if ( @@ -4399,7 +4304,7 @@ class App extends React.Component { }); } } else { - setCursor(this.canvas, CURSOR_TYPE.AUTO); + setCursor(this.interactiveCanvas, CURSOR_TYPE.AUTO); } } private handleCanvasPointerDown = ( @@ -4553,7 +4458,7 @@ class App extends React.Component { ); } else if (this.state.activeTool.type === "image") { // reset image preview on pointerdown - setCursor(this.canvas, CURSOR_TYPE.CROSSHAIR); + setCursor(this.interactiveCanvas, CURSOR_TYPE.CROSSHAIR); // retrieve the latest element as the state may be stale const pendingImageElement = @@ -4583,7 +4488,7 @@ class App extends React.Component { pointerDownState, ); } else if (this.state.activeTool.type === "custom") { - setCursor(this.canvas, CURSOR_TYPE.AUTO); + setCursor(this.interactiveCanvas, CURSOR_TYPE.AUTO); } else if (this.state.activeTool.type === "frame") { this.createFrameElementOnPointerDown(pointerDownState); } else if ( @@ -4751,7 +4656,7 @@ class App extends React.Component { let nextPastePrevented = false; const isLinux = /Linux/.test(window.navigator.platform); - setCursor(this.canvas, CURSOR_TYPE.GRABBING); + setCursor(this.interactiveCanvas, CURSOR_TYPE.GRABBING); let { clientX: lastX, clientY: lastY } = event; const onPointerMove = withBatchedUpdatesThrottled((event: PointerEvent) => { const deltaX = lastX - event.clientX; @@ -4804,9 +4709,9 @@ class App extends React.Component { isPanning = false; if (!isHoldingSpace) { if (this.state.viewModeEnabled) { - setCursor(this.canvas, CURSOR_TYPE.GRAB); + setCursor(this.interactiveCanvas, CURSOR_TYPE.GRAB); } else { - setCursorForShape(this.canvas, this.state); + setCursorForShape(this.interactiveCanvas, this.state); } } this.setState({ @@ -4929,7 +4834,7 @@ class App extends React.Component { const onPointerUp = withBatchedUpdates(() => { isDraggingScrollBar = false; - setCursorForShape(this.canvas, this.state); + setCursorForShape(this.interactiveCanvas, this.state); lastPointerUp = null; this.setState({ cursorButton: "up", @@ -5203,19 +5108,21 @@ class App extends React.Component { } } - return selectGroupsForSelectedElements( - { - ...prevState, - selectedElementIds: nextSelectedElementIds, - showHyperlinkPopup: - hitElement.link || isEmbeddableElement(hitElement) - ? "info" - : false, - }, - this.scene.getNonDeletedElements(), - prevState, - this, - ); + return { + ...selectGroupsForSelectedElements( + { + editingGroupId: prevState.editingGroupId, + selectedElementIds: nextSelectedElementIds, + }, + this.scene.getNonDeletedElements(), + prevState, + this, + ), + showHyperlinkPopup: + hitElement.link || isEmbeddableElement(hitElement) + ? "info" + : false, + }; }); pointerDownState.hit.wasAddedToSelection = true; } @@ -5290,7 +5197,7 @@ class App extends React.Component { container, }); - resetCursor(this.canvas); + resetCursor(this.interactiveCanvas); if (!this.state.activeTool.locked) { this.setState({ activeTool: updateActiveTool(this.state, { type: "selection" }), @@ -5501,7 +5408,7 @@ class App extends React.Component { mutateElement(multiElement, { lastCommittedPoint: multiElement.points[multiElement.points.length - 1], }); - setCursor(this.canvas, CURSOR_TYPE.POINTER); + setCursor(this.interactiveCanvas, CURSOR_TYPE.POINTER); } else { const [gridX, gridY] = getGridPoint( pointerDownState.origin.x, @@ -6147,34 +6054,36 @@ class App extends React.Component { } } - return selectGroupsForSelectedElements( - { - ...prevState, - ...(!shouldReuseSelection && { - selectedGroupIds: {}, - editingGroupId: null, - }), - selectedElementIds: nextSelectedElementIds, - showHyperlinkPopup: - elementsWithinSelection.length === 1 && - (elementsWithinSelection[0].link || - isEmbeddableElement(elementsWithinSelection[0])) - ? "info" - : false, - // select linear element only when we haven't box-selected anything else - selectedLinearElement: - elementsWithinSelection.length === 1 && - isLinearElement(elementsWithinSelection[0]) - ? new LinearElementEditor( - elementsWithinSelection[0], - this.scene, - ) - : null, - }, - this.scene.getNonDeletedElements(), - prevState, - this, - ); + prevState = !shouldReuseSelection + ? { ...prevState, selectedGroupIds: {}, editingGroupId: null } + : prevState; + + return { + ...selectGroupsForSelectedElements( + { + editingGroupId: prevState.editingGroupId, + selectedElementIds: nextSelectedElementIds, + }, + this.scene.getNonDeletedElements(), + prevState, + this, + ), + // select linear element only when we haven't box-selected anything else + selectedLinearElement: + elementsWithinSelection.length === 1 && + isLinearElement(elementsWithinSelection[0]) + ? new LinearElementEditor( + elementsWithinSelection[0], + this.scene, + ) + : null, + showHyperlinkPopup: + elementsWithinSelection.length === 1 && + (elementsWithinSelection[0].link || + isEmbeddableElement(elementsWithinSelection[0])) + ? "info" + : false, + }; }); } } @@ -6428,7 +6337,7 @@ class App extends React.Component { } this.setState({ suggestedBindings: [], startBoundElement: null }); if (!activeTool.locked) { - resetCursor(this.canvas); + resetCursor(this.interactiveCanvas); this.setState((prevState) => ({ draggingElement: null, activeTool: updateActiveTool(this.state, { @@ -6775,24 +6684,26 @@ class App extends React.Component { { selectedElementIds: newSelectedElementIds }, ); - return selectGroupsForSelectedElements( - { - ...prevState, - selectedElementIds: newSelectedElementIds, - // set selectedLinearElement only if thats the only element selected - selectedLinearElement: - newSelectedElements.length === 1 && - isLinearElement(newSelectedElements[0]) - ? new LinearElementEditor( - newSelectedElements[0], - this.scene, - ) - : prevState.selectedLinearElement, - }, - this.scene.getNonDeletedElements(), - prevState, - this, - ); + return { + ...selectGroupsForSelectedElements( + { + editingGroupId: prevState.editingGroupId, + selectedElementIds: newSelectedElementIds, + }, + this.scene.getNonDeletedElements(), + prevState, + this, + ), + // set selectedLinearElement only if thats the only element selected + selectedLinearElement: + newSelectedElements.length === 1 && + isLinearElement(newSelectedElements[0]) + ? new LinearElementEditor( + newSelectedElements[0], + this.scene, + ) + : prevState.selectedLinearElement, + }; }); } } else if ( @@ -6820,19 +6731,21 @@ class App extends React.Component { delete nextSelectedElementIds[element.id]; }); - return selectGroupsForSelectedElements( - { - ...prevState, - selectedElementIds: nextSelectedElementIds, - showHyperlinkPopup: - hitElement.link || isEmbeddableElement(hitElement) - ? "info" - : false, - }, - this.scene.getNonDeletedElements(), - prevState, - this, - ); + return { + ...selectGroupsForSelectedElements( + { + editingGroupId: prevState.editingGroupId, + selectedElementIds: nextSelectedElementIds, + }, + this.scene.getNonDeletedElements(), + prevState, + this, + ), + showHyperlinkPopup: + hitElement.link || isEmbeddableElement(hitElement) + ? "info" + : false, + }; }); } else { // add element to selection while keeping prev elements selected @@ -6850,20 +6763,20 @@ class App extends React.Component { this.setState((prevState) => ({ ...selectGroupsForSelectedElements( { - ...prevState, + editingGroupId: prevState.editingGroupId, selectedElementIds: { [hitElement.id]: true }, - selectedLinearElement: - isLinearElement(hitElement) && - // Don't set `selectedLinearElement` if its same as the hitElement, this is mainly to prevent resetting the `hoverPointIndex` to -1. - // Future we should update the API to take care of setting the correct `hoverPointIndex` when initialized - prevState.selectedLinearElement?.elementId !== hitElement.id - ? new LinearElementEditor(hitElement, this.scene) - : prevState.selectedLinearElement, }, this.scene.getNonDeletedElements(), prevState, this, ), + selectedLinearElement: + isLinearElement(hitElement) && + // Don't set `selectedLinearElement` if its same as the hitElement, this is mainly to prevent resetting the `hoverPointIndex` to -1. + // Future we should update the API to take care of setting the correct `hoverPointIndex` when initialized + prevState.selectedLinearElement?.elementId !== hitElement.id + ? new LinearElementEditor(hitElement, this.scene) + : prevState.selectedLinearElement, })); } } @@ -6931,7 +6844,7 @@ class App extends React.Component { } if (!activeTool.locked && activeTool.type !== "freedraw") { - resetCursor(this.canvas); + resetCursor(this.interactiveCanvas); this.setState({ draggingElement: null, suggestedBindings: [], @@ -7040,7 +6953,7 @@ class App extends React.Component { } const mimeType = imageFile.type; - setCursor(this.canvas, "wait"); + setCursor(this.interactiveCanvas, "wait"); if (mimeType === MIME_TYPES.svg) { try { @@ -7140,7 +7053,7 @@ class App extends React.Component { reject(new Error(t("errors.imageInsertError"))); } finally { if (!showCursorImagePreview) { - resetCursor(this.canvas); + resetCursor(this.interactiveCanvas); } } }, @@ -7209,7 +7122,7 @@ class App extends React.Component { } if (this.state.pendingImageElementId) { - setCursor(this.canvas, `url(${previewDataURL}) 4 4, auto`); + setCursor(this.interactiveCanvas, `url(${previewDataURL}) 4 4, auto`); } }; @@ -7350,7 +7263,7 @@ class App extends React.Component { if (updatedFiles.size || erroredFiles.size) { for (const element of elements) { if (updatedFiles.has(element.fileId)) { - invalidateShapeForElement(element); + ShapeCache.delete(element); } } } @@ -7491,21 +7404,35 @@ class App extends React.Component { }); } - private handleCanvasRef = (canvas: HTMLCanvasElement) => { + private handleInteractiveCanvasRef = (canvas: HTMLCanvasElement | null) => { // canvas is null when unmounting if (canvas !== null) { - this.canvas = canvas; - this.rc = rough.canvas(this.canvas); + this.interactiveCanvas = canvas; - this.canvas.addEventListener(EVENT.WHEEL, this.handleWheel, { - passive: false, - }); - this.canvas.addEventListener(EVENT.TOUCH_START, this.onTapStart); - this.canvas.addEventListener(EVENT.TOUCH_END, this.onTapEnd); + // ----------------------------------------------------------------------- + // NOTE wheel, touchstart, touchend events must be registered outside + // of react because react binds them them passively (so we can't prevent + // default on them) + this.interactiveCanvas.addEventListener(EVENT.WHEEL, this.handleWheel); + this.interactiveCanvas.addEventListener( + EVENT.TOUCH_START, + this.onTouchStart, + ); + this.interactiveCanvas.addEventListener(EVENT.TOUCH_END, this.onTouchEnd); + // ----------------------------------------------------------------------- } else { - this.canvas?.removeEventListener(EVENT.WHEEL, this.handleWheel); - this.canvas?.removeEventListener(EVENT.TOUCH_START, this.onTapStart); - this.canvas?.removeEventListener(EVENT.TOUCH_END, this.onTapEnd); + this.interactiveCanvas?.removeEventListener( + EVENT.WHEEL, + this.handleWheel, + ); + this.interactiveCanvas?.removeEventListener( + EVENT.TOUCH_START, + this.onTouchStart, + ); + this.interactiveCanvas?.removeEventListener( + EVENT.TOUCH_END, + this.onTouchEnd, + ); } }; @@ -7651,13 +7578,15 @@ class App extends React.Component { }; private handleCanvasContextMenu = ( - event: React.PointerEvent, + event: React.MouseEvent, ) => { event.preventDefault(); if ( - (event.nativeEvent.pointerType === "touch" || - (event.nativeEvent.pointerType === "pen" && + (("pointerType" in event.nativeEvent && + event.nativeEvent.pointerType === "touch") || + ("pointerType" in event.nativeEvent && + event.nativeEvent.pointerType === "pen" && // always allow if user uses a pen secondary button event.button !== POINTER_BUTTON.SECONDARY)) && this.state.activeTool.type !== "selection" @@ -7691,18 +7620,21 @@ class App extends React.Component { this.setState( { ...(element && !this.state.selectedElementIds[element.id] - ? selectGroupsForSelectedElements( - { - ...this.state, - selectedElementIds: { [element.id]: true }, - selectedLinearElement: isLinearElement(element) - ? new LinearElementEditor(element, this.scene) - : null, - }, - this.scene.getNonDeletedElements(), - this.state, - this, - ) + ? { + ...this.state, + ...selectGroupsForSelectedElements( + { + editingGroupId: this.state.editingGroupId, + selectedElementIds: { [element.id]: true }, + }, + this.scene.getNonDeletedElements(), + this.state, + this, + ), + selectedLinearElement: isLinearElement(element) + ? new LinearElementEditor(element, this.scene) + : null, + } : this.state), showHyperlinkPopup: false, }, @@ -7992,7 +7924,9 @@ class App extends React.Component { }; private handleWheel = withBatchedUpdates( - (event: WheelEvent | React.WheelEvent) => { + ( + event: WheelEvent | React.WheelEvent, + ) => { event.preventDefault(); if (isPanning) { return; diff --git a/src/components/EyeDropper.tsx b/src/components/EyeDropper.tsx index 8e3e21ec..5278dfab 100644 --- a/src/components/EyeDropper.tsx +++ b/src/components/EyeDropper.tsx @@ -8,9 +8,9 @@ import { mutateElement } from "../element/mutateElement"; import { useCreatePortalContainer } from "../hooks/useCreatePortalContainer"; import { useOutsideClick } from "../hooks/useOutsideClick"; import { KEYS } from "../keys"; -import { invalidateShapeForElement } from "../renderer/renderElement"; import { getSelectedElements } from "../scene"; import Scene from "../scene/Scene"; +import { ShapeCache } from "../scene/ShapeCache"; import { useApp, useExcalidrawContainer, useExcalidrawElements } from "./App"; import "./EyeDropper.scss"; @@ -98,7 +98,7 @@ export const EyeDropper: React.FC<{ }, false, ); - invalidateShapeForElement(element); + ShapeCache.delete(element); } Scene.getScene( metaStuffRef.current.selectedElements[0], diff --git a/src/components/JSONExportDialog.tsx b/src/components/JSONExportDialog.tsx index f40ebe45..e4d51da4 100644 --- a/src/components/JSONExportDialog.tsx +++ b/src/components/JSONExportDialog.tsx @@ -34,7 +34,7 @@ const JSONExportModal = ({ actionManager: ActionManager; onCloseRequest: () => void; exportOpts: ExportOpts; - canvas: HTMLCanvasElement | null; + canvas: HTMLCanvasElement; }) => { const { onExportToBackend } = exportOpts; return ( @@ -100,7 +100,7 @@ export const JSONExportDialog = ({ files: BinaryFiles; actionManager: ActionManager; exportOpts: ExportOpts; - canvas: HTMLCanvasElement | null; + canvas: HTMLCanvasElement; setAppState: React.Component["setState"]; }) => { const handleClose = React.useCallback(() => { diff --git a/src/components/LayerUI.tsx b/src/components/LayerUI.tsx index 100259a8..26be77ae 100644 --- a/src/components/LayerUI.tsx +++ b/src/components/LayerUI.tsx @@ -57,7 +57,8 @@ interface LayerUIProps { actionManager: ActionManager; appState: UIAppState; files: BinaryFiles; - canvas: HTMLCanvasElement | null; + canvas: HTMLCanvasElement; + interactiveCanvas: HTMLCanvasElement | null; setAppState: React.Component["setState"]; elements: readonly NonDeletedExcalidrawElement[]; onLockToggle: () => void; @@ -117,6 +118,7 @@ const LayerUI = ({ setAppState, elements, canvas, + interactiveCanvas, onLockToggle, onHandToolToggle, onPenModeToggle, @@ -272,7 +274,7 @@ const LayerUI = ({ { @@ -413,7 +415,7 @@ const LayerUI = ({ onLockToggle={onLockToggle} onHandToolToggle={onHandToolToggle} onPenModeToggle={onPenModeToggle} - canvas={canvas} + interactiveCanvas={interactiveCanvas} onImageAction={onImageAction} renderTopRightUI={renderTopRightUI} renderCustomStats={renderCustomStats} @@ -464,7 +466,7 @@ const LayerUI = ({ className="scroll-back-to-content" onClick={() => { setAppState((appState) => ({ - ...calculateScrollCenter(elements, appState, canvas), + ...calculateScrollCenter(elements, appState), })); }} > @@ -507,8 +509,18 @@ const areEqual = (prevProps: LayerUIProps, nextProps: LayerUIProps) => { return false; } - const { canvas: _prevCanvas, appState: prevAppState, ...prev } = prevProps; - const { canvas: _nextCanvas, appState: nextAppState, ...next } = nextProps; + const { + canvas: _pC, + interactiveCanvas: _pIC, + appState: prevAppState, + ...prev + } = prevProps; + const { + canvas: _nC, + interactiveCanvas: _nIC, + appState: nextAppState, + ...next + } = nextProps; return ( isShallowEqual( diff --git a/src/components/MobileMenu.tsx b/src/components/MobileMenu.tsx index 30f431cb..f08b9996 100644 --- a/src/components/MobileMenu.tsx +++ b/src/components/MobileMenu.tsx @@ -36,7 +36,7 @@ type MobileMenuProps = { onLockToggle: () => void; onHandToolToggle: () => void; onPenModeToggle: () => void; - canvas: HTMLCanvasElement | null; + interactiveCanvas: HTMLCanvasElement | null; onImageAction: (data: { insertOnCanvasDirectly: boolean }) => void; renderTopRightUI?: ( @@ -58,7 +58,7 @@ export const MobileMenu = ({ onLockToggle, onHandToolToggle, onPenModeToggle, - canvas, + interactiveCanvas, onImageAction, renderTopRightUI, renderCustomStats, @@ -85,7 +85,7 @@ export const MobileMenu = ({ { @@ -202,7 +202,7 @@ export const MobileMenu = ({ className="scroll-back-to-content" onClick={() => { setAppState((appState) => ({ - ...calculateScrollCenter(elements, appState, canvas), + ...calculateScrollCenter(elements, appState), })); }} > diff --git a/src/components/canvases/InteractiveCanvas.tsx b/src/components/canvases/InteractiveCanvas.tsx new file mode 100644 index 00000000..11bbec24 --- /dev/null +++ b/src/components/canvases/InteractiveCanvas.tsx @@ -0,0 +1,222 @@ +import React, { useEffect, useRef } from "react"; +import { renderInteractiveScene } from "../../renderer/renderScene"; +import { + isRenderThrottlingEnabled, + isShallowEqual, + sceneCoordsToViewportCoords, +} from "../../utils"; +import { CURSOR_TYPE } from "../../constants"; +import { t } from "../../i18n"; +import type { DOMAttributes } from "react"; +import type { AppState, InteractiveCanvasAppState } from "../../types"; +import type { + InteractiveCanvasRenderConfig, + RenderInteractiveSceneCallback, +} from "../../scene/types"; +import type { NonDeletedExcalidrawElement } from "../../element/types"; + +type InteractiveCanvasProps = { + canvas: HTMLCanvasElement | null; + elements: readonly NonDeletedExcalidrawElement[]; + visibleElements: readonly NonDeletedExcalidrawElement[]; + selectedElements: readonly NonDeletedExcalidrawElement[]; + versionNonce: number | undefined; + selectionNonce: number | undefined; + scale: number; + appState: InteractiveCanvasAppState; + renderInteractiveSceneCallback: ( + data: RenderInteractiveSceneCallback, + ) => void; + handleCanvasRef: (canvas: HTMLCanvasElement | null) => void; + onContextMenu: Exclude< + DOMAttributes["onContextMenu"], + undefined + >; + onPointerMove: Exclude< + DOMAttributes["onPointerMove"], + undefined + >; + onPointerUp: Exclude< + DOMAttributes["onPointerUp"], + undefined + >; + onPointerCancel: Exclude< + DOMAttributes["onPointerCancel"], + undefined + >; + onTouchMove: Exclude< + DOMAttributes["onTouchMove"], + undefined + >; + onPointerDown: Exclude< + DOMAttributes["onPointerDown"], + undefined + >; + onDoubleClick: Exclude< + DOMAttributes["onDoubleClick"], + undefined + >; +}; + +const InteractiveCanvas = (props: InteractiveCanvasProps) => { + const isComponentMounted = useRef(false); + + useEffect(() => { + if (!isComponentMounted.current) { + isComponentMounted.current = true; + return; + } + + const cursorButton: { + [id: string]: string | undefined; + } = {}; + const pointerViewportCoords: InteractiveCanvasRenderConfig["remotePointerViewportCoords"] = + {}; + const remoteSelectedElementIds: InteractiveCanvasRenderConfig["remoteSelectedElementIds"] = + {}; + const pointerUsernames: { [id: string]: string } = {}; + const pointerUserStates: { [id: string]: string } = {}; + + props.appState.collaborators.forEach((user, socketId) => { + if (user.selectedElementIds) { + for (const id of Object.keys(user.selectedElementIds)) { + if (!(id in remoteSelectedElementIds)) { + remoteSelectedElementIds[id] = []; + } + remoteSelectedElementIds[id].push(socketId); + } + } + if (!user.pointer) { + return; + } + if (user.username) { + pointerUsernames[socketId] = user.username; + } + if (user.userState) { + pointerUserStates[socketId] = user.userState; + } + pointerViewportCoords[socketId] = sceneCoordsToViewportCoords( + { + sceneX: user.pointer.x, + sceneY: user.pointer.y, + }, + props.appState, + ); + cursorButton[socketId] = user.button; + }); + + const selectionColor = getComputedStyle( + document.querySelector(".excalidraw")!, + ).getPropertyValue("--color-selection"); + + renderInteractiveScene( + { + canvas: props.canvas, + elements: props.elements, + visibleElements: props.visibleElements, + selectedElements: props.selectedElements, + scale: window.devicePixelRatio, + appState: props.appState, + renderConfig: { + remotePointerViewportCoords: pointerViewportCoords, + remotePointerButton: cursorButton, + remoteSelectedElementIds, + remotePointerUsernames: pointerUsernames, + remotePointerUserStates: pointerUserStates, + selectionColor, + renderScrollbars: false, + }, + callback: props.renderInteractiveSceneCallback, + }, + isRenderThrottlingEnabled(), + ); + }); + + return ( + + {t("labels.drawingCanvas")} + + ); +}; + +const getRelevantAppStateProps = ( + appState: AppState, +): Omit => ({ + zoom: appState.zoom, + scrollX: appState.scrollX, + scrollY: appState.scrollY, + width: appState.width, + height: appState.height, + viewModeEnabled: appState.viewModeEnabled, + editingGroupId: appState.editingGroupId, + editingLinearElement: appState.editingLinearElement, + selectedElementIds: appState.selectedElementIds, + frameToHighlight: appState.frameToHighlight, + offsetLeft: appState.offsetLeft, + offsetTop: appState.offsetTop, + theme: appState.theme, + pendingImageElementId: appState.pendingImageElementId, + selectionElement: appState.selectionElement, + selectedGroupIds: appState.selectedGroupIds, + selectedLinearElement: appState.selectedLinearElement, + multiElement: appState.multiElement, + isBindingEnabled: appState.isBindingEnabled, + suggestedBindings: appState.suggestedBindings, + isRotating: appState.isRotating, + elementsToHighlight: appState.elementsToHighlight, + openSidebar: appState.openSidebar, + showHyperlinkPopup: appState.showHyperlinkPopup, + collaborators: appState.collaborators, // Necessary for collab. sessions + activeEmbeddable: appState.activeEmbeddable, +}); + +const areEqual = ( + prevProps: InteractiveCanvasProps, + nextProps: InteractiveCanvasProps, +) => { + // This could be further optimised if needed, as we don't have to render interactive canvas on each scene mutation + if ( + prevProps.selectionNonce !== nextProps.selectionNonce || + prevProps.versionNonce !== nextProps.versionNonce || + prevProps.scale !== nextProps.scale || + // we need to memoize on element arrays because they may have renewed + // even if versionNonce didn't change (e.g. we filter elements out based + // on appState) + prevProps.elements !== nextProps.elements || + prevProps.visibleElements !== nextProps.visibleElements || + prevProps.selectedElements !== nextProps.selectedElements + ) { + return false; + } + + // Comparing the interactive appState for changes in case of some edge cases + return isShallowEqual( + // asserting AppState because we're being passed the whole AppState + // but resolve to only the InteractiveCanvas-relevant props + getRelevantAppStateProps(prevProps.appState as AppState), + getRelevantAppStateProps(nextProps.appState as AppState), + ); +}; + +export default React.memo(InteractiveCanvas, areEqual); diff --git a/src/components/canvases/StaticCanvas.tsx b/src/components/canvases/StaticCanvas.tsx new file mode 100644 index 00000000..8babdb74 --- /dev/null +++ b/src/components/canvases/StaticCanvas.tsx @@ -0,0 +1,113 @@ +import React, { useEffect, useRef } from "react"; +import { RoughCanvas } from "roughjs/bin/canvas"; +import { renderStaticScene } from "../../renderer/renderScene"; +import { isRenderThrottlingEnabled, isShallowEqual } from "../../utils"; +import type { AppState, StaticCanvasAppState } from "../../types"; +import type { StaticCanvasRenderConfig } from "../../scene/types"; +import type { NonDeletedExcalidrawElement } from "../../element/types"; + +type StaticCanvasProps = { + canvas: HTMLCanvasElement; + rc: RoughCanvas; + elements: readonly NonDeletedExcalidrawElement[]; + visibleElements: readonly NonDeletedExcalidrawElement[]; + versionNonce: number | undefined; + selectionNonce: number | undefined; + scale: number; + appState: StaticCanvasAppState; + renderConfig: StaticCanvasRenderConfig; +}; + +const StaticCanvas = (props: StaticCanvasProps) => { + const wrapperRef = useRef(null); + const isComponentMounted = useRef(false); + + useEffect(() => { + const wrapper = wrapperRef.current; + if (!wrapper) { + return; + } + + const canvas = props.canvas; + + if (!isComponentMounted.current) { + isComponentMounted.current = true; + + wrapper.replaceChildren(canvas); + canvas.classList.add("excalidraw__canvas", "static"); + } + + canvas.style.width = `${props.appState.width}px`; + canvas.style.height = `${props.appState.height}px`; + canvas.width = props.appState.width * props.scale; + canvas.height = props.appState.height * props.scale; + + renderStaticScene( + { + canvas, + rc: props.rc, + scale: props.scale, + elements: props.elements, + visibleElements: props.visibleElements, + appState: props.appState, + renderConfig: props.renderConfig, + }, + isRenderThrottlingEnabled(), + ); + }); + + return
; +}; + +const getRelevantAppStateProps = ( + appState: AppState, +): Omit< + StaticCanvasAppState, + | "editingElement" + | "selectedElementIds" + | "editingGroupId" + | "frameToHighlight" +> => ({ + zoom: appState.zoom, + scrollX: appState.scrollX, + scrollY: appState.scrollY, + width: appState.width, + height: appState.height, + viewModeEnabled: appState.viewModeEnabled, + offsetLeft: appState.offsetLeft, + offsetTop: appState.offsetTop, + theme: appState.theme, + pendingImageElementId: appState.pendingImageElementId, + shouldCacheIgnoreZoom: appState.shouldCacheIgnoreZoom, + viewBackgroundColor: appState.viewBackgroundColor, + exportScale: appState.exportScale, + selectedElementsAreBeingDragged: appState.selectedElementsAreBeingDragged, + gridSize: appState.gridSize, + frameRendering: appState.frameRendering, +}); + +const areEqual = ( + prevProps: StaticCanvasProps, + nextProps: StaticCanvasProps, +) => { + if ( + prevProps.versionNonce !== nextProps.versionNonce || + prevProps.scale !== nextProps.scale || + // we need to memoize on element arrays because they may have renewed + // even if versionNonce didn't change (e.g. we filter elements out based + // on appState) + prevProps.elements !== nextProps.elements || + prevProps.visibleElements !== nextProps.visibleElements + ) { + return false; + } + + return isShallowEqual( + // asserting AppState because we're being passed the whole AppState + // but resolve to only the StaticCanvas-relevant props + getRelevantAppStateProps(prevProps.appState as AppState), + getRelevantAppStateProps(nextProps.appState as AppState), + ); +}; + +export default React.memo(StaticCanvas, areEqual); diff --git a/src/components/canvases/index.tsx b/src/components/canvases/index.tsx new file mode 100644 index 00000000..b3956d78 --- /dev/null +++ b/src/components/canvases/index.tsx @@ -0,0 +1,4 @@ +import InteractiveCanvas from "./InteractiveCanvas"; +import StaticCanvas from "./StaticCanvas"; + +export { InteractiveCanvas, StaticCanvas }; diff --git a/src/css/styles.scss b/src/css/styles.scss index a9aebe7d..f1d359d5 100644 --- a/src/css/styles.scss +++ b/src/css/styles.scss @@ -3,8 +3,9 @@ :root { --zIndex-canvas: 1; - --zIndex-wysiwyg: 2; - --zIndex-layerUI: 3; + --zIndex-interactiveCanvas: 2; + --zIndex-wysiwyg: 3; + --zIndex-layerUI: 4; --zIndex-modal: 1000; --zIndex-popup: 1001; @@ -69,10 +70,19 @@ z-index: var(--zIndex-canvas); + &.interactive { + z-index: var(--zIndex-interactiveCanvas); + } + // Remove the main canvas from document flow to avoid resizeObserver // feedback loop (see https://github.com/excalidraw/excalidraw/pull/3379) } + &__canvas-wrapper, + &__canvas.static { + pointer-events: none; + } + &__canvas { position: absolute; } diff --git a/src/data/blob.ts b/src/data/blob.ts index c0aa66ee..92240030 100644 --- a/src/data/blob.ts +++ b/src/data/blob.ts @@ -144,11 +144,7 @@ export const loadSceneOrLibraryFromBlob = async ( fileHandle: fileHandle || blob.handle || null, ...cleanAppStateForExport(data.appState || {}), ...(localAppState - ? calculateScrollCenter( - data.elements || [], - localAppState, - null, - ) + ? calculateScrollCenter(data.elements || [], localAppState) : {}), }, files: data.files, diff --git a/src/element/Hyperlink.tsx b/src/element/Hyperlink.tsx index 9fa760f6..720f1782 100644 --- a/src/element/Hyperlink.tsx +++ b/src/element/Hyperlink.tsx @@ -25,10 +25,7 @@ import { } from "react"; import clsx from "clsx"; import { KEYS } from "../keys"; -import { - DEFAULT_LINK_SIZE, - invalidateShapeForElement, -} from "../renderer/renderElement"; +import { DEFAULT_LINK_SIZE } from "../renderer/renderElement"; import { rotate } from "../math"; import { EVENT, HYPERLINK_TOOLTIP_DELAY, MIME_TYPES } from "../constants"; import { Bounds } from "./bounds"; @@ -42,6 +39,7 @@ import "./Hyperlink.scss"; import { trackEvent } from "../analytics"; import { useAppProps, useExcalidrawAppState } from "../components/App"; import { isEmbeddableElement } from "./typeChecks"; +import { ShapeCache } from "../scene/ShapeCache"; const CONTAINER_WIDTH = 320; const SPACE_BOTTOM = 85; @@ -115,7 +113,7 @@ export const Hyperlink = ({ validated: false, link, }); - invalidateShapeForElement(element); + ShapeCache.delete(element); } else { const { width, height } = element; const embedLink = getEmbedLink(link); @@ -147,7 +145,7 @@ export const Hyperlink = ({ validated: true, link, }); - invalidateShapeForElement(element); + ShapeCache.delete(element); if (embeddableLinkCache.has(element.id)) { embeddableLinkCache.delete(element.id); } @@ -393,7 +391,7 @@ export const getContextMenuLabel = ( export const getLinkHandleFromCoords = ( [x1, y1, x2, y2]: Bounds, angle: number, - appState: UIAppState, + appState: Pick, ): [x: number, y: number, width: number, height: number] => { const size = DEFAULT_LINK_SIZE; const linkWidth = size / appState.zoom.value; diff --git a/src/element/binding.ts b/src/element/binding.ts index bc997759..3f6cf002 100644 --- a/src/element/binding.ts +++ b/src/element/binding.ts @@ -474,6 +474,7 @@ const maybeCalculateNewGapWhenScaling = ( return { elementId, gap: newGap, focus }; }; +// TODO: this is a bottleneck, optimise export const getEligibleElementsForBinding = ( elements: NonDeleted[], ): SuggestedBinding[] => { diff --git a/src/element/bounds.ts b/src/element/bounds.ts index a2a04439..c5af0697 100644 --- a/src/element/bounds.ts +++ b/src/element/bounds.ts @@ -10,10 +10,7 @@ import { distance2d, rotate, rotatePoint } from "../math"; import rough from "roughjs/bin/rough"; import { Drawable, Op } from "roughjs/bin/core"; import { Point } from "../types"; -import { - getShapeForElement, - generateRoughOptions, -} from "../renderer/renderElement"; +import { generateRoughOptions } from "../renderer/renderElement"; import { isArrowElement, isFreeDrawElement, @@ -24,6 +21,7 @@ import { rescalePoints } from "../points"; import { getBoundTextElement, getContainerElement } from "./textElement"; import { LinearElementEditor } from "./linearElementEditor"; import { Mutable } from "../utility-types"; +import { ShapeCache } from "../scene/ShapeCache"; export type RectangleBox = { x: number; @@ -621,7 +619,7 @@ const getLinearElementRotatedBounds = ( } // first element is always the curve - const cachedShape = getShapeForElement(element)?.[0]; + const cachedShape = ShapeCache.get(element)?.[0]; const shape = cachedShape ?? generateLinearElementShape(element); const ops = getCurvePathOps(shape); const transformXY = (x: number, y: number) => diff --git a/src/element/collision.ts b/src/element/collision.ts index 1878b93b..d04f1a0e 100644 --- a/src/element/collision.ts +++ b/src/element/collision.ts @@ -39,7 +39,6 @@ import { import { FrameNameBoundsCache, Point } from "../types"; import { Drawable } from "roughjs/bin/core"; import { AppState } from "../types"; -import { getShapeForElement } from "../renderer/renderElement"; import { hasBoundTextElement, isEmbeddableElement, @@ -50,6 +49,7 @@ import { isTransparent } from "../utils"; import { shouldShowBoundingBox } from "./transformHandles"; import { getBoundTextElement } from "./textElement"; import { Mutable } from "../utility-types"; +import { ShapeCache } from "../scene/ShapeCache"; const isElementDraggableFromInside = ( element: NonDeletedExcalidrawElement, @@ -489,7 +489,7 @@ const hitTestFreeDrawElement = ( B = element.points[i + 1]; } - const shape = getShapeForElement(element); + const shape = ShapeCache.get(element); // for filled freedraw shapes, support // selecting from inside @@ -502,7 +502,7 @@ const hitTestFreeDrawElement = ( const hitTestLinear = (args: HitTestArgs): boolean => { const { element, threshold } = args; - if (!getShapeForElement(element)) { + if (!ShapeCache.get(element)) { return false; } @@ -520,7 +520,7 @@ const hitTestLinear = (args: HitTestArgs): boolean => { } const [relX, relY] = GAPoint.toTuple(point); - const shape = getShapeForElement(element as ExcalidrawLinearElement); + const shape = ShapeCache.get(element as ExcalidrawLinearElement); if (!shape) { return false; diff --git a/src/element/linearElementEditor.ts b/src/element/linearElementEditor.ts index 3426b3e1..f0dee4fa 100644 --- a/src/element/linearElementEditor.ts +++ b/src/element/linearElementEditor.ts @@ -25,7 +25,12 @@ import { getElementPointsCoords, getMinMaxXYFromCurvePathOps, } from "./bounds"; -import { Point, AppState, PointerCoords } from "../types"; +import { + Point, + AppState, + PointerCoords, + InteractiveCanvasAppState, +} from "../types"; import { mutateElement } from "./mutateElement"; import History from "../history"; @@ -39,9 +44,9 @@ import { tupleToCoors } from "../utils"; import { isBindingElement } from "./typeChecks"; import { shouldRotateWithDiscreteAngle } from "../keys"; import { getBoundTextElement, handleBindTextResize } from "./textElement"; -import { getShapeForElement } from "../renderer/renderElement"; import { DRAGGING_THRESHOLD } from "../constants"; import { Mutable } from "../utility-types"; +import { ShapeCache } from "../scene/ShapeCache"; const editorMidPointsCache: { version: number | null; @@ -398,7 +403,7 @@ export class LinearElementEditor { static getEditorMidPoints = ( element: NonDeleted, - appState: AppState, + appState: InteractiveCanvasAppState, ): typeof editorMidPointsCache["points"] => { const boundText = getBoundTextElement(element); @@ -422,7 +427,7 @@ export class LinearElementEditor { static updateEditorMidPointsCache = ( element: NonDeleted, - appState: AppState, + appState: InteractiveCanvasAppState, ) => { const points = LinearElementEditor.getPointsGlobalCoordinates(element); @@ -1418,7 +1423,7 @@ export class LinearElementEditor { let y1; let x2; let y2; - if (element.points.length < 2 || !getShapeForElement(element)) { + if (element.points.length < 2 || !ShapeCache.get(element)) { // XXX this is just a poor estimate and not very useful const { minX, minY, maxX, maxY } = element.points.reduce( (limits, [x, y]) => { @@ -1437,7 +1442,7 @@ export class LinearElementEditor { x2 = maxX + element.x; y2 = maxY + element.y; } else { - const shape = getShapeForElement(element)!; + const shape = ShapeCache.generateElementShape(element); // first element is always the curve const ops = getCurvePathOps(shape[0]); diff --git a/src/element/mutateElement.ts b/src/element/mutateElement.ts index 1c3d6612..0e01a080 100644 --- a/src/element/mutateElement.ts +++ b/src/element/mutateElement.ts @@ -1,11 +1,11 @@ import { ExcalidrawElement } from "./types"; -import { invalidateShapeForElement } from "../renderer/renderElement"; import Scene from "../scene/Scene"; import { getSizeFromPoints } from "../points"; import { randomInteger } from "../random"; import { Point } from "../types"; import { getUpdatedTimestamp } from "../utils"; import { Mutable } from "../utility-types"; +import { ShapeCache } from "../scene/ShapeCache"; type ElementUpdate = Omit< Partial, @@ -89,7 +89,7 @@ export const mutateElement = >( typeof fileId != "undefined" || typeof points !== "undefined" ) { - invalidateShapeForElement(element); + ShapeCache.delete(element); } element.version++; diff --git a/src/element/sizeHelpers.ts b/src/element/sizeHelpers.ts index b5810dbe..1b69ca0b 100644 --- a/src/element/sizeHelpers.ts +++ b/src/element/sizeHelpers.ts @@ -2,7 +2,9 @@ import { ExcalidrawElement } from "./types"; import { mutateElement } from "./mutateElement"; import { isFreeDrawElement, isLinearElement } from "./typeChecks"; import { SHIFT_LOCKING_ANGLE } from "../constants"; -import { AppState } from "../types"; +import { AppState, Zoom } from "../types"; +import { getElementBounds } from "./bounds"; +import { viewportCoordsToSceneCoords } from "../utils"; export const isInvisiblySmallElement = ( element: ExcalidrawElement, @@ -13,6 +15,42 @@ export const isInvisiblySmallElement = ( return element.width === 0 && element.height === 0; }; +export const isElementInViewport = ( + element: ExcalidrawElement, + width: number, + height: number, + viewTransformations: { + zoom: Zoom; + offsetLeft: number; + offsetTop: number; + scrollX: number; + scrollY: number; + }, +) => { + const [x1, y1, x2, y2] = getElementBounds(element); // scene coordinates + const topLeftSceneCoords = viewportCoordsToSceneCoords( + { + clientX: viewTransformations.offsetLeft, + clientY: viewTransformations.offsetTop, + }, + viewTransformations, + ); + const bottomRightSceneCoords = viewportCoordsToSceneCoords( + { + clientX: viewTransformations.offsetLeft + width, + clientY: viewTransformations.offsetTop + height, + }, + viewTransformations, + ); + + return ( + topLeftSceneCoords.x <= x2 && + topLeftSceneCoords.y <= y2 && + bottomRightSceneCoords.x >= x1 && + bottomRightSceneCoords.y >= y1 + ); +}; + /** * Makes a perfect shape or diagonal/horizontal/vertical line */ diff --git a/src/element/textWysiwyg.test.tsx b/src/element/textWysiwyg.test.tsx index c0919117..a2301b96 100644 --- a/src/element/textWysiwyg.test.tsx +++ b/src/element/textWysiwyg.test.tsx @@ -759,7 +759,7 @@ describe("textWysiwyg", () => { expect(h.elements[1].type).toBe("text"); API.setSelectedElements([h.elements[0], h.elements[1]]); - fireEvent.contextMenu(GlobalTestState.canvas, { + fireEvent.contextMenu(GlobalTestState.interactiveCanvas, { button: 2, clientX: 20, clientY: 30, @@ -903,7 +903,7 @@ describe("textWysiwyg", () => { mouse.clickAt(10, 20); mouse.down(); mouse.up(); - fireEvent.contextMenu(GlobalTestState.canvas, { + fireEvent.contextMenu(GlobalTestState.interactiveCanvas, { button: 2, clientX: 20, clientY: 30, @@ -1154,7 +1154,7 @@ describe("textWysiwyg", () => { h.elements = [container, text]; API.setSelectedElements([container, text]); - fireEvent.contextMenu(GlobalTestState.canvas, { + fireEvent.contextMenu(GlobalTestState.interactiveCanvas, { button: 2, clientX: 20, clientY: 30, @@ -1168,7 +1168,7 @@ describe("textWysiwyg", () => { expect((h.elements[1] as ExcalidrawTextElementWithContainer).text).toBe( "Online \nwhitebo\nard \ncollabo\nration \nmade \neasy", ); - fireEvent.contextMenu(GlobalTestState.canvas, { + fireEvent.contextMenu(GlobalTestState.interactiveCanvas, { button: 2, clientX: 20, clientY: 30, @@ -1406,7 +1406,7 @@ describe("textWysiwyg", () => { API.setSelectedElements([textElement]); - fireEvent.contextMenu(GlobalTestState.canvas, { + fireEvent.contextMenu(GlobalTestState.interactiveCanvas, { button: 2, clientX: 20, clientY: 30, diff --git a/src/element/textWysiwyg.tsx b/src/element/textWysiwyg.tsx index a5bf7014..b60fdeed 100644 --- a/src/element/textWysiwyg.tsx +++ b/src/element/textWysiwyg.tsx @@ -116,7 +116,7 @@ export const textWysiwyg = ({ }) => void; getViewportCoords: (x: number, y: number) => [number, number]; element: ExcalidrawTextElement; - canvas: HTMLCanvasElement | null; + canvas: HTMLCanvasElement; excalidrawContainer: HTMLDivElement | null; app: App; }) => { diff --git a/src/element/transformHandles.ts b/src/element/transformHandles.ts index cf8e5b6a..1d2ccdca 100644 --- a/src/element/transformHandles.ts +++ b/src/element/transformHandles.ts @@ -6,7 +6,7 @@ import { import { getElementAbsoluteCoords } from "./bounds"; import { rotate } from "../math"; -import { AppState, Zoom } from "../types"; +import { InteractiveCanvasAppState, Zoom } from "../types"; import { isTextElement } from "."; import { isFrameElement, isLinearElement } from "./typeChecks"; import { DEFAULT_SPACING } from "../renderer/renderScene"; @@ -276,8 +276,8 @@ export const getTransformHandles = ( }; export const shouldShowBoundingBox = ( - elements: NonDeletedExcalidrawElement[], - appState: AppState, + elements: readonly NonDeletedExcalidrawElement[], + appState: InteractiveCanvasAppState, ) => { if (appState.editingLinearElement) { return false; diff --git a/src/excalidraw-app/data/tabSync.ts b/src/excalidraw-app/data/tabSync.ts index ddb70dbb..0617a551 100644 --- a/src/excalidraw-app/data/tabSync.ts +++ b/src/excalidraw-app/data/tabSync.ts @@ -16,14 +16,24 @@ export const isBrowserStorageStateNewer = (type: BrowserStateTypes) => { export const updateBrowserStateVersion = (type: BrowserStateTypes) => { const timestamp = Date.now(); - localStorage.setItem(type, JSON.stringify(timestamp)); - LOCAL_STATE_VERSIONS[type] = timestamp; + try { + localStorage.setItem(type, JSON.stringify(timestamp)); + LOCAL_STATE_VERSIONS[type] = timestamp; + } catch (error) { + console.error("error while updating browser state verison", error); + } }; export const resetBrowserStateVersions = () => { - for (const key of Object.keys(LOCAL_STATE_VERSIONS) as BrowserStateTypes[]) { - const timestamp = -1; - localStorage.setItem(key, JSON.stringify(timestamp)); - LOCAL_STATE_VERSIONS[key] = timestamp; + try { + for (const key of Object.keys( + LOCAL_STATE_VERSIONS, + ) as BrowserStateTypes[]) { + const timestamp = -1; + localStorage.setItem(key, JSON.stringify(timestamp)); + LOCAL_STATE_VERSIONS[key] = timestamp; + } + } catch (error) { + console.error("error while resetting browser state verison", error); } }; diff --git a/src/excalidraw-app/index.tsx b/src/excalidraw-app/index.tsx index cd719e27..00bcd0cb 100644 --- a/src/excalidraw-app/index.tsx +++ b/src/excalidraw-app/index.tsx @@ -598,7 +598,7 @@ const ExcalidrawWrapper = () => { exportedElements: readonly NonDeletedExcalidrawElement[], appState: Partial, files: BinaryFiles, - canvas: HTMLCanvasElement | null, + canvas: HTMLCanvasElement, ) => { if (exportedElements.length === 0) { return window.alert(t("alerts.cannotExportEmptyCanvas")); diff --git a/src/frame.ts b/src/frame.ts index 8a39a41b..7f0f42d7 100644 --- a/src/frame.ts +++ b/src/frame.ts @@ -16,7 +16,7 @@ import { } from "./element/textElement"; import { arrayToMap, findIndex } from "./utils"; import { mutateElement } from "./element/mutateElement"; -import { AppClassProperties, AppState } from "./types"; +import { AppClassProperties, AppState, StaticCanvasAppState } from "./types"; import { getElementsWithinSelection, getSelectedElements } from "./scene"; import { isFrameElement } from "./element"; import { moveOneRight } from "./zindex"; @@ -469,9 +469,16 @@ export const addElementsToFrame = ( } let nextElements = allElements.slice(); + // Optimisation since findIndex on "newElements" is slow + const nextElementsIndex = nextElements.reduce( + (acc: Record, element, index) => { + acc[element.id] = index; + return acc; + }, + {}, + ); const frameBoundary = findIndex(nextElements, (e) => e.frameId === frame.id); - for (const element of omitGroupsContainingFrames( allElements, _elementsToAdd, @@ -485,8 +492,8 @@ export const addElementsToFrame = ( false, ); - const frameIndex = findIndex(nextElements, (e) => e.id === frame.id); - const elementIndex = findIndex(nextElements, (e) => e.id === element.id); + const frameIndex = nextElementsIndex[frame.id] ?? -1; + const elementIndex = nextElementsIndex[element.id] ?? -1; if (elementIndex < frameBoundary) { nextElements = [ @@ -648,7 +655,7 @@ export const omitGroupsContainingFrames = ( */ export const getTargetFrame = ( element: ExcalidrawElement, - appState: AppState, + appState: StaticCanvasAppState, ) => { const _element = isTextElement(element) ? getContainerElement(element) || element @@ -660,11 +667,12 @@ export const getTargetFrame = ( : getContainingFrame(_element); }; +// TODO: this a huge bottleneck for large scenes, optimise // given an element, return if the element is in some frame export const isElementInFrame = ( element: ExcalidrawElement, allElements: ExcalidrawElementsIncludingDeleted, - appState: AppState, + appState: StaticCanvasAppState, ) => { const frame = getTargetFrame(element, appState); const _element = isTextElement(element) diff --git a/src/groups.ts b/src/groups.ts index c7aa60fc..e7b222b3 100644 --- a/src/groups.ts +++ b/src/groups.ts @@ -4,27 +4,40 @@ import { NonDeleted, NonDeletedExcalidrawElement, } from "./element/types"; -import { AppClassProperties, AppState } from "./types"; +import { + AppClassProperties, + AppState, + InteractiveCanvasAppState, +} from "./types"; import { getSelectedElements } from "./scene"; import { getBoundTextElement } from "./element/textElement"; import { makeNextSelectedElementIds } from "./scene/selection"; export const selectGroup = ( groupId: GroupId, - appState: AppState, + appState: InteractiveCanvasAppState, elements: readonly NonDeleted[], -): AppState => { - const elementsInGroup = elements.filter((element) => - element.groupIds.includes(groupId), +): Pick< + InteractiveCanvasAppState, + "selectedGroupIds" | "selectedElementIds" | "editingGroupId" +> => { + const elementsInGroup = elements.reduce( + (acc: Record, element) => { + if (element.groupIds.includes(groupId)) { + acc[element.id] = true; + } + return acc; + }, + {}, ); - if (elementsInGroup.length < 2) { + if (Object.keys(elementsInGroup).length < 2) { if ( appState.selectedGroupIds[groupId] || appState.editingGroupId === groupId ) { return { - ...appState, + selectedElementIds: appState.selectedElementIds, selectedGroupIds: { ...appState.selectedGroupIds, [groupId]: false }, editingGroupId: null, }; @@ -33,104 +46,184 @@ export const selectGroup = ( } return { - ...appState, + editingGroupId: appState.editingGroupId, selectedGroupIds: { ...appState.selectedGroupIds, [groupId]: true }, selectedElementIds: { ...appState.selectedElementIds, - ...Object.fromEntries( - elementsInGroup.map((element) => [element.id, true]), - ), + ...elementsInGroup, }, }; }; +export const selectGroupsForSelectedElements = (function () { + type SelectGroupsReturnType = Pick< + InteractiveCanvasAppState, + "selectedGroupIds" | "editingGroupId" | "selectedElementIds" + >; + + let lastSelectedElements: readonly NonDeleted[] | null = + null; + let lastElements: readonly NonDeleted[] | null = null; + let lastReturnValue: SelectGroupsReturnType | null = null; + + const _selectGroups = ( + selectedElements: readonly NonDeleted[], + elements: readonly NonDeleted[], + appState: Pick, + ): SelectGroupsReturnType => { + if ( + lastReturnValue !== undefined && + elements === lastElements && + selectedElements === lastSelectedElements && + appState.editingGroupId === lastReturnValue?.editingGroupId + ) { + return lastReturnValue; + } + + const selectedGroupIds: Record = {}; + // Gather all the groups withing selected elements + for (const selectedElement of selectedElements) { + let groupIds = selectedElement.groupIds; + if (appState.editingGroupId) { + // handle the case where a group is nested within a group + const indexOfEditingGroup = groupIds.indexOf(appState.editingGroupId); + if (indexOfEditingGroup > -1) { + groupIds = groupIds.slice(0, indexOfEditingGroup); + } + } + if (groupIds.length > 0) { + const lastSelectedGroup = groupIds[groupIds.length - 1]; + selectedGroupIds[lastSelectedGroup] = true; + } + } + + // Gather all the elements within selected groups + const groupElementsIndex: Record = {}; + const selectedElementIdsInGroups = elements.reduce( + (acc: Record, element) => { + const groupId = element.groupIds.find((id) => selectedGroupIds[id]); + + if (groupId) { + acc[element.id] = true; + + // Populate the index + if (!Array.isArray(groupElementsIndex[groupId])) { + groupElementsIndex[groupId] = [element.id]; + } else { + groupElementsIndex[groupId].push(element.id); + } + } + return acc; + }, + {}, + ); + + for (const groupId of Object.keys(groupElementsIndex)) { + // If there is one element in the group, and the group is selected or it's being edited, it's not a group + if (groupElementsIndex[groupId].length < 2) { + if (selectedGroupIds[groupId]) { + selectedGroupIds[groupId] = false; + } + } + } + + lastElements = elements; + lastSelectedElements = selectedElements; + + lastReturnValue = { + editingGroupId: appState.editingGroupId, + selectedGroupIds, + selectedElementIds: { + ...appState.selectedElementIds, + ...selectedElementIdsInGroups, + }, + }; + + return lastReturnValue; + }; + + /** + * When you select an element, you often want to actually select the whole group it's in, unless + * you're currently editing that group. + */ + const selectGroupsForSelectedElements = ( + appState: Pick, + elements: readonly NonDeletedExcalidrawElement[], + prevAppState: InteractiveCanvasAppState, + /** + * supply null in cases where you don't have access to App instance and + * you don't care about optimizing selectElements retrieval + */ + app: AppClassProperties | null, + ): Pick< + InteractiveCanvasAppState, + "selectedGroupIds" | "editingGroupId" | "selectedElementIds" + > => { + const selectedElements = app + ? app.scene.getSelectedElements({ + selectedElementIds: appState.selectedElementIds, + // supplying elements explicitly in case we're passed non-state elements + elements, + }) + : getSelectedElements(elements, appState); + + if (!selectedElements.length) { + return { + selectedGroupIds: {}, + editingGroupId: null, + selectedElementIds: makeNextSelectedElementIds( + appState.selectedElementIds, + prevAppState, + ), + }; + } + + return _selectGroups(selectedElements, elements, appState); + }; + + selectGroupsForSelectedElements.clearCache = () => { + lastElements = null; + lastSelectedElements = null; + lastReturnValue = null; + }; + + return selectGroupsForSelectedElements; +})(); + /** * If the element's group is selected, don't render an individual * selection border around it. */ export const isSelectedViaGroup = ( - appState: AppState, + appState: InteractiveCanvasAppState, element: ExcalidrawElement, ) => getSelectedGroupForElement(appState, element) != null; export const getSelectedGroupForElement = ( - appState: AppState, + appState: InteractiveCanvasAppState, element: ExcalidrawElement, ) => element.groupIds .filter((groupId) => groupId !== appState.editingGroupId) .find((groupId) => appState.selectedGroupIds[groupId]); -export const getSelectedGroupIds = (appState: AppState): GroupId[] => +export const getSelectedGroupIds = ( + appState: InteractiveCanvasAppState, +): GroupId[] => Object.entries(appState.selectedGroupIds) .filter(([groupId, isSelected]) => isSelected) .map(([groupId, isSelected]) => groupId); -/** - * When you select an element, you often want to actually select the whole group it's in, unless - * you're currently editing that group. - */ -export const selectGroupsForSelectedElements = ( - appState: AppState, - elements: readonly NonDeletedExcalidrawElement[], - prevAppState: AppState, - /** - * supply null in cases where you don't have access to App instance and - * you don't care about optimizing selectElements retrieval - */ - app: AppClassProperties | null, -): AppState => { - let nextAppState: AppState = { ...appState, selectedGroupIds: {} }; - - const selectedElements = app - ? app.scene.getSelectedElements({ - selectedElementIds: appState.selectedElementIds, - // supplying elements explicitly in case we're passed non-state elements - elements, - }) - : getSelectedElements(elements, appState); - - if (!selectedElements.length) { - return { - ...nextAppState, - editingGroupId: null, - selectedElementIds: makeNextSelectedElementIds( - nextAppState.selectedElementIds, - prevAppState, - ), - }; - } - - for (const selectedElement of selectedElements) { - let groupIds = selectedElement.groupIds; - if (appState.editingGroupId) { - // handle the case where a group is nested within a group - const indexOfEditingGroup = groupIds.indexOf(appState.editingGroupId); - if (indexOfEditingGroup > -1) { - groupIds = groupIds.slice(0, indexOfEditingGroup); - } - } - if (groupIds.length > 0) { - const groupId = groupIds[groupIds.length - 1]; - nextAppState = selectGroup(groupId, nextAppState, elements); - } - } - - nextAppState.selectedElementIds = makeNextSelectedElementIds( - nextAppState.selectedElementIds, - prevAppState, - ); - - return nextAppState; -}; - // given a list of elements, return the the actual group ids that should be selected // or used to update the elements export const selectGroupsFromGivenElements = ( elements: readonly NonDeleted[], - appState: AppState, + appState: InteractiveCanvasAppState, ) => { - let nextAppState: AppState = { ...appState, selectedGroupIds: {} }; + let nextAppState: InteractiveCanvasAppState = { + ...appState, + selectedGroupIds: {}, + }; for (const element of elements) { let groupIds = element.groupIds; @@ -142,7 +235,10 @@ export const selectGroupsFromGivenElements = ( } if (groupIds.length > 0) { const groupId = groupIds[groupIds.length - 1]; - nextAppState = selectGroup(groupId, nextAppState, elements); + nextAppState = { + ...nextAppState, + ...selectGroup(groupId, nextAppState, elements), + }; } } diff --git a/src/math.ts b/src/math.ts index 01123ce8..f549a6af 100644 --- a/src/math.ts +++ b/src/math.ts @@ -10,9 +10,9 @@ import { ExcalidrawLinearElement, NonDeleted, } from "./element/types"; -import { getShapeForElement } from "./renderer/renderElement"; import { getCurvePathOps } from "./element/bounds"; import { Mutable } from "./utility-types"; +import { ShapeCache } from "./scene/ShapeCache"; export const rotate = ( x1: number, @@ -303,7 +303,7 @@ export const getControlPointsForBezierCurve = ( element: NonDeleted, endPoint: Point, ) => { - const shape = getShapeForElement(element as ExcalidrawLinearElement); + const shape = ShapeCache.generateElementShape(element); if (!shape) { return null; } diff --git a/src/renderer/renderElement.ts b/src/renderer/renderElement.ts index b320c81a..837fd62d 100644 --- a/src/renderer/renderElement.ts +++ b/src/renderer/renderElement.ts @@ -26,7 +26,7 @@ import { Drawable, Options } from "roughjs/bin/core"; import { RoughSVG } from "roughjs/bin/svg"; import { RoughGenerator } from "roughjs/bin/generator"; -import { RenderConfig } from "../scene/types"; +import { StaticCanvasRenderConfig } from "../scene/types"; import { distance, getFontString, @@ -36,7 +36,13 @@ import { } from "../utils"; import { getCornerRadius, isPathALoop, isRightAngle } from "../math"; import rough from "roughjs/bin/rough"; -import { AppState, BinaryFiles, Zoom } from "../types"; +import { + AppState, + StaticCanvasAppState, + BinaryFiles, + Zoom, + InteractiveCanvasAppState, +} from "../types"; import { getDefaultAppState } from "../appState"; import { BOUND_TEXT_PADDING, @@ -61,6 +67,7 @@ import { } from "../element/embeddable"; import { getContainingFrame } from "../frame"; import { normalizeLink, toValidURL } from "../data/url"; +import { ShapeCache } from "../scene/ShapeCache"; // using a stronger invert (100% vs our regular 93%) and saturate // as a temp hack to make images in dark theme look closer to original @@ -72,17 +79,18 @@ const defaultAppState = getDefaultAppState(); const isPendingImageElement = ( element: ExcalidrawElement, - renderConfig: RenderConfig, + renderConfig: StaticCanvasRenderConfig, ) => isInitializedImageElement(element) && !renderConfig.imageCache.has(element.fileId); const shouldResetImageFilter = ( element: ExcalidrawElement, - renderConfig: RenderConfig, + renderConfig: StaticCanvasRenderConfig, + appState: StaticCanvasAppState, ) => { return ( - renderConfig.theme === "dark" && + appState.theme === "dark" && isInitializedImageElement(element) && !isPendingImageElement(element, renderConfig) && renderConfig.imageCache.get(element.fileId)?.mimeType !== MIME_TYPES.svg @@ -99,9 +107,9 @@ const getCanvasPadding = (element: ExcalidrawElement) => export interface ExcalidrawElementWithCanvas { element: ExcalidrawElement | ExcalidrawTextElement; canvas: HTMLCanvasElement; - theme: RenderConfig["theme"]; + theme: AppState["theme"]; scale: number; - zoomValue: RenderConfig["zoom"]["value"]; + zoomValue: AppState["zoom"]["value"]; canvasOffsetX: number; canvasOffsetY: number; boundTextElementVersion: number | null; @@ -165,7 +173,8 @@ const cappedElementCanvasSize = ( const generateElementCanvas = ( element: NonDeletedExcalidrawElement, zoom: Zoom, - renderConfig: RenderConfig, + renderConfig: StaticCanvasRenderConfig, + appState: StaticCanvasAppState, ): ExcalidrawElementWithCanvas => { const canvas = document.createElement("canvas"); const context = canvas.getContext("2d")!; @@ -205,17 +214,17 @@ const generateElementCanvas = ( const rc = rough.canvas(canvas); // in dark theme, revert the image color filter - if (shouldResetImageFilter(element, renderConfig)) { + if (shouldResetImageFilter(element, renderConfig, appState)) { context.filter = IMAGE_INVERT_FILTER; } - drawElementOnCanvas(element, rc, context, renderConfig); + drawElementOnCanvas(element, rc, context, renderConfig, appState); context.restore(); return { element, canvas, - theme: renderConfig.theme, + theme: appState.theme, scale, zoomValue: zoom.value, canvasOffsetX, @@ -262,11 +271,13 @@ const drawImagePlaceholder = ( size, ); }; + const drawElementOnCanvas = ( element: NonDeletedExcalidrawElement, rc: RoughCanvas, context: CanvasRenderingContext2D, - renderConfig: RenderConfig, + renderConfig: StaticCanvasRenderConfig, + appState: StaticCanvasAppState, ) => { context.globalAlpha = ((getContainingFrame(element)?.opacity ?? 100) * element.opacity) / 10000; @@ -277,7 +288,7 @@ const drawElementOnCanvas = ( case "ellipse": { context.lineJoin = "round"; context.lineCap = "round"; - rc.draw(getShapeForElement(element)!); + rc.draw(ShapeCache.get(element)!); break; } case "arrow": @@ -285,7 +296,7 @@ const drawElementOnCanvas = ( context.lineJoin = "round"; context.lineCap = "round"; - getShapeForElement(element)!.forEach((shape) => { + ShapeCache.get(element)!.forEach((shape) => { rc.draw(shape); }); break; @@ -296,7 +307,7 @@ const drawElementOnCanvas = ( context.fillStyle = element.strokeColor; const path = getFreeDrawPath2D(element) as Path2D; - const fillShape = getShapeForElement(element); + const fillShape = ShapeCache.get(element); if (fillShape) { rc.draw(fillShape); @@ -321,7 +332,7 @@ const drawElementOnCanvas = ( element.height, ); } else { - drawImagePlaceholder(element, context, renderConfig.zoom.value); + drawImagePlaceholder(element, context, appState.zoom.value); } break; } @@ -378,33 +389,6 @@ const elementWithCanvasCache = new WeakMap< ExcalidrawElementWithCanvas >(); -const shapeCache = new WeakMap(); - -type ElementShape = Drawable | Drawable[] | null; - -type ElementShapes = { - freedraw: Drawable | null; - arrow: Drawable[]; - line: Drawable[]; - text: null; - image: null; -}; - -export const getShapeForElement = (element: T) => - shapeCache.get(element) as T["type"] extends keyof ElementShapes - ? ElementShapes[T["type"]] | undefined - : Drawable | null | undefined; - -export const setShapeForElement = ( - element: T, - shape: T["type"] extends keyof ElementShapes - ? ElementShapes[T["type"]] - : Drawable, -) => shapeCache.set(element, shape); - -export const invalidateShapeForElement = (element: ExcalidrawElement) => - shapeCache.delete(element); - export const generateRoughOptions = ( element: ExcalidrawElement, continuousPath = false, @@ -494,16 +478,22 @@ const modifyEmbeddableForRoughOptions = ( * @param element * @param generator */ -const generateElementShape = ( +export const generateElementShape = ( element: NonDeletedExcalidrawElement, generator: RoughGenerator, isExporting: boolean = false, -) => { - let shape = isExporting ? undefined : shapeCache.get(element); +): Drawable | Drawable[] | null => { + const cachedShape = isExporting ? undefined : ShapeCache.get(element); + + if (cachedShape) { + return cachedShape; + } // `null` indicates no rc shape applicable for this element type // (= do not generate anything) - if (shape === undefined) { + if (cachedShape === undefined) { + let shape: Drawable | Drawable[] | null = null; + elementWithCanvasCache.delete(element); switch (element.type) { @@ -539,7 +529,7 @@ const generateElementShape = ( ), ); } - setShapeForElement(element, shape); + ShapeCache.set(element, shape); break; } @@ -589,7 +579,7 @@ const generateElementShape = ( generateRoughOptions(element), ); } - setShapeForElement(element, shape); + ShapeCache.set(element, shape); break; } @@ -601,7 +591,7 @@ const generateElementShape = ( element.height, generateRoughOptions(element), ); - setShapeForElement(element, shape); + ShapeCache.set(element, shape); break; case "line": @@ -726,7 +716,7 @@ const generateElementShape = ( } } - setShapeForElement(element, shape); + ShapeCache.set(element, shape); break; } @@ -742,36 +732,39 @@ const generateElementShape = ( } else { shape = null; } - setShapeForElement(element, shape); + ShapeCache.set(element, shape); break; } case "text": case "image": { // just to ensure we don't regenerate element.canvas on rerenders - setShapeForElement(element, null); + ShapeCache.set(element, null); break; } } + return shape; } + return null; }; const generateElementWithCanvas = ( element: NonDeletedExcalidrawElement, - renderConfig: RenderConfig, + renderConfig: StaticCanvasRenderConfig, + appState: StaticCanvasAppState, ) => { - const zoom: Zoom = renderConfig ? renderConfig.zoom : defaultAppState.zoom; + const zoom: Zoom = renderConfig ? appState.zoom : defaultAppState.zoom; const prevElementWithCanvas = elementWithCanvasCache.get(element); const shouldRegenerateBecauseZoom = prevElementWithCanvas && prevElementWithCanvas.zoomValue !== zoom.value && - !renderConfig?.shouldCacheIgnoreZoom; + !appState?.shouldCacheIgnoreZoom; const boundTextElementVersion = getBoundTextElement(element)?.version || null; const containingFrameOpacity = getContainingFrame(element)?.opacity || 100; if ( !prevElementWithCanvas || shouldRegenerateBecauseZoom || - prevElementWithCanvas.theme !== renderConfig.theme || + prevElementWithCanvas.theme !== appState.theme || prevElementWithCanvas.boundTextElementVersion !== boundTextElementVersion || prevElementWithCanvas.containingFrameOpacity !== containingFrameOpacity ) { @@ -779,6 +772,7 @@ const generateElementWithCanvas = ( element, zoom, renderConfig, + appState, ); elementWithCanvasCache.set(element, elementWithCanvas); @@ -790,9 +784,9 @@ const generateElementWithCanvas = ( const drawElementFromCanvas = ( elementWithCanvas: ExcalidrawElementWithCanvas, - rc: RoughCanvas, context: CanvasRenderingContext2D, - renderConfig: RenderConfig, + renderConfig: StaticCanvasRenderConfig, + appState: StaticCanvasAppState, ) => { const element = elementWithCanvas.element; const padding = getCanvasPadding(element); @@ -807,8 +801,8 @@ const drawElementFromCanvas = ( y2 = Math.ceil(y2); } - const cx = ((x1 + x2) / 2 + renderConfig.scrollX) * window.devicePixelRatio; - const cy = ((y1 + y2) / 2 + renderConfig.scrollY) * window.devicePixelRatio; + const cx = ((x1 + x2) / 2 + appState.scrollX) * window.devicePixelRatio; + const cy = ((y1 + y2) / 2 + appState.scrollY) * window.devicePixelRatio; context.save(); context.scale(1 / window.devicePixelRatio, 1 / window.devicePixelRatio); @@ -906,9 +900,9 @@ const drawElementFromCanvas = ( context.drawImage( elementWithCanvas.canvas!, - (x1 + renderConfig.scrollX) * window.devicePixelRatio - + (x1 + appState.scrollX) * window.devicePixelRatio - (padding * elementWithCanvas.scale) / elementWithCanvas.scale, - (y1 + renderConfig.scrollY) * window.devicePixelRatio - + (y1 + appState.scrollY) * window.devicePixelRatio - (padding * elementWithCanvas.scale) / elementWithCanvas.scale, elementWithCanvas.canvas!.width / elementWithCanvas.scale, elementWithCanvas.canvas!.height / elementWithCanvas.scale, @@ -926,8 +920,8 @@ const drawElementFromCanvas = ( context.strokeStyle = "#c92a2a"; context.lineWidth = 3; context.strokeRect( - (coords.x + renderConfig.scrollX) * window.devicePixelRatio, - (coords.y + renderConfig.scrollY) * window.devicePixelRatio, + (coords.x + appState.scrollX) * window.devicePixelRatio, + (coords.y + appState.scrollY) * window.devicePixelRatio, getBoundTextMaxWidth(element) * window.devicePixelRatio, getBoundTextMaxHeight(element, textElement) * window.devicePixelRatio, ); @@ -938,40 +932,38 @@ const drawElementFromCanvas = ( // Clear the nested element we appended to the DOM }; +export const renderSelectionElement = ( + element: NonDeletedExcalidrawElement, + context: CanvasRenderingContext2D, + appState: InteractiveCanvasAppState, +) => { + context.save(); + context.translate(element.x + appState.scrollX, element.y + appState.scrollY); + context.fillStyle = "rgba(0, 0, 200, 0.04)"; + + // render from 0.5px offset to get 1px wide line + // https://stackoverflow.com/questions/7530593/html5-canvas-and-line-width/7531540#7531540 + // TODO can be be improved by offseting to the negative when user selects + // from right to left + const offset = 0.5 / appState.zoom.value; + + context.fillRect(offset, offset, element.width, element.height); + context.lineWidth = 1 / appState.zoom.value; + context.strokeStyle = " rgb(105, 101, 219)"; + context.strokeRect(offset, offset, element.width, element.height); + + context.restore(); +}; + export const renderElement = ( element: NonDeletedExcalidrawElement, rc: RoughCanvas, context: CanvasRenderingContext2D, - renderConfig: RenderConfig, - appState: AppState, + renderConfig: StaticCanvasRenderConfig, + appState: StaticCanvasAppState, ) => { const generator = rc.generator; switch (element.type) { - case "selection": { - // do not render selection when exporting - if (!renderConfig.isExporting) { - context.save(); - context.translate( - element.x + renderConfig.scrollX, - element.y + renderConfig.scrollY, - ); - context.fillStyle = "rgba(0, 0, 200, 0.04)"; - - // render from 0.5px offset to get 1px wide line - // https://stackoverflow.com/questions/7530593/html5-canvas-and-line-width/7531540#7531540 - // TODO can be be improved by offseting to the negative when user selects - // from right to left - const offset = 0.5 / renderConfig.zoom.value; - - context.fillRect(offset, offset, element.width, element.height); - context.lineWidth = 1 / renderConfig.zoom.value; - context.strokeStyle = " rgb(105, 101, 219)"; - context.strokeRect(offset, offset, element.width, element.height); - - context.restore(); - } - break; - } case "frame": { if ( !renderConfig.isExporting && @@ -980,12 +972,12 @@ export const renderElement = ( ) { context.save(); context.translate( - element.x + renderConfig.scrollX, - element.y + renderConfig.scrollY, + element.x + appState.scrollX, + element.y + appState.scrollY, ); context.fillStyle = "rgba(0, 0, 200, 0.04)"; - context.lineWidth = 2 / renderConfig.zoom.value; + context.lineWidth = 2 / appState.zoom.value; context.strokeStyle = FRAME_STYLE.strokeColor; if (FRAME_STYLE.radius && context.roundRect) { @@ -995,7 +987,7 @@ export const renderElement = ( 0, element.width, element.height, - FRAME_STYLE.radius / renderConfig.zoom.value, + FRAME_STYLE.radius / appState.zoom.value, ); context.stroke(); context.closePath(); @@ -1012,22 +1004,28 @@ export const renderElement = ( if (renderConfig.isExporting) { const [x1, y1, x2, y2] = getElementAbsoluteCoords(element); - const cx = (x1 + x2) / 2 + renderConfig.scrollX; - const cy = (y1 + y2) / 2 + renderConfig.scrollY; + const cx = (x1 + x2) / 2 + appState.scrollX; + const cy = (y1 + y2) / 2 + appState.scrollY; const shiftX = (x2 - x1) / 2 - (element.x - x1); const shiftY = (y2 - y1) / 2 - (element.y - y1); context.save(); context.translate(cx, cy); context.rotate(element.angle); context.translate(-shiftX, -shiftY); - drawElementOnCanvas(element, rc, context, renderConfig); + drawElementOnCanvas(element, rc, context, renderConfig, appState); context.restore(); } else { const elementWithCanvas = generateElementWithCanvas( element, renderConfig, + appState, + ); + drawElementFromCanvas( + elementWithCanvas, + context, + renderConfig, + appState, ); - drawElementFromCanvas(elementWithCanvas, rc, context, renderConfig); } break; @@ -1043,8 +1041,8 @@ export const renderElement = ( generateElementShape(element, generator, renderConfig.isExporting); if (renderConfig.isExporting) { const [x1, y1, x2, y2] = getElementAbsoluteCoords(element); - const cx = (x1 + x2) / 2 + renderConfig.scrollX; - const cy = (y1 + y2) / 2 + renderConfig.scrollY; + const cx = (x1 + x2) / 2 + appState.scrollX; + const cy = (y1 + y2) / 2 + appState.scrollY; let shiftX = (x2 - x1) / 2 - (element.x - x1); let shiftY = (y2 - y1) / 2 - (element.y - y1); if (isTextElement(element)) { @@ -1062,7 +1060,7 @@ export const renderElement = ( context.save(); context.translate(cx, cy); - if (shouldResetImageFilter(element, renderConfig)) { + if (shouldResetImageFilter(element, renderConfig, appState)) { context.filter = "none"; } const boundTextElement = getBoundTextElement(element); @@ -1096,7 +1094,13 @@ export const renderElement = ( tempCanvasContext.translate(-shiftX, -shiftY); - drawElementOnCanvas(element, tempRc, tempCanvasContext, renderConfig); + drawElementOnCanvas( + element, + tempRc, + tempCanvasContext, + renderConfig, + appState, + ); tempCanvasContext.translate(shiftX, shiftY); @@ -1133,7 +1137,7 @@ export const renderElement = ( } context.translate(-shiftX, -shiftY); - drawElementOnCanvas(element, rc, context, renderConfig); + drawElementOnCanvas(element, rc, context, renderConfig, appState); } context.restore(); @@ -1143,6 +1147,7 @@ export const renderElement = ( const elementWithCanvas = generateElementWithCanvas( element, renderConfig, + appState, ); const currentImageSmoothingStatus = context.imageSmoothingEnabled; @@ -1150,7 +1155,7 @@ export const renderElement = ( if ( // do not disable smoothing during zoom as blurry shapes look better // on low resolution (while still zooming in) than sharp ones - !renderConfig?.shouldCacheIgnoreZoom && + !appState?.shouldCacheIgnoreZoom && // angle is 0 -> always disable smoothing (!element.angle || // or check if angle is a right angle in which case we can still @@ -1167,7 +1172,12 @@ export const renderElement = ( context.imageSmoothingEnabled = false; } - drawElementFromCanvas(elementWithCanvas, rc, context, renderConfig); + drawElementFromCanvas( + elementWithCanvas, + context, + renderConfig, + appState, + ); // reset context.imageSmoothingEnabled = currentImageSmoothingStatus; @@ -1273,7 +1283,7 @@ export const renderElementToSvg = ( generateElementShape(element, generator); const node = roughSVGDrawWithPrecision( rsvg, - getShapeForElement(element)!, + ShapeCache.get(element)!, MAX_DECIMALS_FOR_SVG_EXPORT, ); if (opacity !== 1) { @@ -1303,7 +1313,7 @@ export const renderElementToSvg = ( generateElementShape(element, generator, true); const node = roughSVGDrawWithPrecision( rsvg, - getShapeForElement(element)!, + ShapeCache.get(element)!, MAX_DECIMALS_FOR_SVG_EXPORT, ); const opacity = element.opacity / 100; @@ -1337,7 +1347,7 @@ export const renderElementToSvg = ( // render embeddable element + iframe const embeddableNode = roughSVGDrawWithPrecision( rsvg, - getShapeForElement(element)!, + ShapeCache.get(element)!, MAX_DECIMALS_FOR_SVG_EXPORT, ); embeddableNode.setAttribute("stroke-linecap", "round"); @@ -1450,7 +1460,7 @@ export const renderElementToSvg = ( } group.setAttribute("stroke-linecap", "round"); - getShapeForElement(element)!.forEach((shape) => { + ShapeCache.get(element)!.forEach((shape) => { const node = roughSVGDrawWithPrecision( rsvg, shape, @@ -1493,7 +1503,7 @@ export const renderElementToSvg = ( case "freedraw": { generateElementShape(element, generator); generateFreeDrawShape(element); - const shape = getShapeForElement(element); + const shape = ShapeCache.get(element); const node = shape ? roughSVGDrawWithPrecision(rsvg, shape, MAX_DECIMALS_FOR_SVG_EXPORT) : svgRoot.ownerDocument!.createElementNS(SVG_NS, "g"); diff --git a/src/renderer/renderScene.ts b/src/renderer/renderScene.ts index f8fa79ed..03de49b1 100644 --- a/src/renderer/renderScene.ts +++ b/src/renderer/renderScene.ts @@ -1,8 +1,14 @@ -import { RoughCanvas } from "roughjs/bin/canvas"; import { RoughSVG } from "roughjs/bin/svg"; import oc from "open-color"; -import { AppState, BinaryFiles, Point, Zoom } from "../types"; +import { + InteractiveCanvasAppState, + StaticCanvasAppState, + BinaryFiles, + Point, + CommonCanvasAppState, + Zoom, +} from "../types"; import { ExcalidrawElement, NonDeletedExcalidrawElement, @@ -17,20 +23,27 @@ import { OMIT_SIDES_FOR_MULTIPLE_ELEMENTS, getTransformHandlesFromCoords, getTransformHandles, - getElementBounds, getCommonBounds, } from "../element"; import { roundRect } from "./roundRect"; -import { RenderConfig } from "../scene/types"; +import { + InteractiveCanvasRenderConfig, + InteractiveSceneRenderConfig, + StaticCanvasRenderConfig, + StaticSceneRenderConfig, +} from "../scene/types"; import { getScrollBars, SCROLLBAR_COLOR, SCROLLBAR_WIDTH, } from "../scene/scrollbars"; -import { getSelectedElements } from "../scene/selection"; -import { renderElement, renderElementToSvg } from "./renderElement"; +import { + renderElement, + renderElementToSvg, + renderSelectionElement, +} from "./renderElement"; import { getClientColor } from "../clients"; import { LinearElementEditor } from "../element/linearElementEditor"; import { @@ -40,22 +53,14 @@ import { selectGroupsFromGivenElements, } from "../groups"; import { maxBindingGap } from "../element/collision"; -import { - SuggestedBinding, - SuggestedPointBinding, - isBindingEnabled, -} from "../element/binding"; +import { SuggestedBinding, SuggestedPointBinding } from "../element/binding"; import { OMIT_SIDES_FOR_FRAME, shouldShowBoundingBox, TransformHandles, TransformHandleType, } from "../element/transformHandles"; -import { - viewportCoordsToSceneCoords, - throttleRAF, - isOnlyExportingSingleFrame, -} from "../utils"; +import { throttleRAF, isOnlyExportingSingleFrame } from "../utils"; import { UserIdleState } from "../types"; import { FRAME_STYLE, THEME_FILTER } from "../constants"; import { @@ -213,7 +218,7 @@ const strokeGrid = ( const renderSingleLinearPoint = ( context: CanvasRenderingContext2D, - renderConfig: RenderConfig, + appState: InteractiveCanvasAppState, point: Point, radius: number, isSelected: boolean, @@ -232,23 +237,22 @@ const renderSingleLinearPoint = ( context, point[0], point[1], - radius / renderConfig.zoom.value, + radius / appState.zoom.value, !isPhantomPoint, ); }; const renderLinearPointHandles = ( context: CanvasRenderingContext2D, - appState: AppState, - renderConfig: RenderConfig, + appState: InteractiveCanvasAppState, element: NonDeleted, ) => { if (!appState.selectedLinearElement) { return; } context.save(); - context.translate(renderConfig.scrollX, renderConfig.scrollY); - context.lineWidth = 1 / renderConfig.zoom.value; + context.translate(appState.scrollX, appState.scrollY); + context.lineWidth = 1 / appState.zoom.value; const points = LinearElementEditor.getPointsGlobalCoordinates(element); const { POINT_HANDLE_SIZE } = LinearElementEditor; @@ -259,7 +263,7 @@ const renderLinearPointHandles = ( const isSelected = !!appState.editingLinearElement?.selectedPointsIndices?.includes(idx); - renderSingleLinearPoint(context, renderConfig, point, radius, isSelected); + renderSingleLinearPoint(context, appState, point, radius, isSelected); }); //Rendering segment mid points @@ -283,17 +287,17 @@ const renderLinearPointHandles = ( if (appState.editingLinearElement) { renderSingleLinearPoint( context, - renderConfig, + appState, segmentMidPoint, radius, false, ); - highlightPoint(segmentMidPoint, context, renderConfig); + highlightPoint(segmentMidPoint, context, appState); } else { - highlightPoint(segmentMidPoint, context, renderConfig); + highlightPoint(segmentMidPoint, context, appState); renderSingleLinearPoint( context, - renderConfig, + appState, segmentMidPoint, radius, false, @@ -302,7 +306,7 @@ const renderLinearPointHandles = ( } else if (appState.editingLinearElement || points.length === 2) { renderSingleLinearPoint( context, - renderConfig, + appState, segmentMidPoint, POINT_HANDLE_SIZE / 2, false, @@ -317,7 +321,7 @@ const renderLinearPointHandles = ( const highlightPoint = ( point: Point, context: CanvasRenderingContext2D, - renderConfig: RenderConfig, + appState: InteractiveCanvasAppState, ) => { context.fillStyle = "rgba(105, 101, 219, 0.4)"; @@ -325,14 +329,13 @@ const highlightPoint = ( context, point[0], point[1], - LinearElementEditor.POINT_HANDLE_SIZE / renderConfig.zoom.value, + LinearElementEditor.POINT_HANDLE_SIZE / appState.zoom.value, false, ); }; const renderLinearElementPointHighlight = ( context: CanvasRenderingContext2D, - appState: AppState, - renderConfig: RenderConfig, + appState: InteractiveCanvasAppState, ) => { const { elementId, hoverPointIndex } = appState.selectedLinearElement!; if ( @@ -351,21 +354,19 @@ const renderLinearElementPointHighlight = ( hoverPointIndex, ); context.save(); - context.translate(renderConfig.scrollX, renderConfig.scrollY); + context.translate(appState.scrollX, appState.scrollY); - highlightPoint(point, context, renderConfig); + highlightPoint(point, context, appState); context.restore(); }; const frameClip = ( frame: ExcalidrawFrameElement, context: CanvasRenderingContext2D, - renderConfig: RenderConfig, + renderConfig: StaticCanvasRenderConfig, + appState: StaticCanvasAppState, ) => { - context.translate( - frame.x + renderConfig.scrollX, - frame.y + renderConfig.scrollY, - ); + context.translate(frame.x + appState.scrollX, frame.y + appState.scrollY); context.beginPath(); if (context.roundRect && !renderConfig.isExporting) { context.roundRect( @@ -373,332 +374,219 @@ const frameClip = ( 0, frame.width, frame.height, - FRAME_STYLE.radius / renderConfig.zoom.value, + FRAME_STYLE.radius / appState.zoom.value, ); } else { context.rect(0, 0, frame.width, frame.height); } context.clip(); context.translate( - -(frame.x + renderConfig.scrollX), - -(frame.y + renderConfig.scrollY), + -(frame.x + appState.scrollX), + -(frame.y + appState.scrollY), ); }; -export const _renderScene = ({ - elements, - appState, - scale, - rc, +const getNormalizedCanvasDimensions = ( + canvas: HTMLCanvasElement, + scale: number, +): [number, number] => { + // When doing calculations based on canvas width we should used normalized one + return [canvas.width / scale, canvas.height / scale]; +}; + +const bootstrapCanvas = ({ canvas, - renderConfig, + scale, + normalizedWidth, + normalizedHeight, + theme, + isExporting, + viewBackgroundColor, }: { - elements: readonly NonDeletedExcalidrawElement[]; - appState: AppState; - scale: number; - rc: RoughCanvas; canvas: HTMLCanvasElement; - renderConfig: RenderConfig; -}) => - // extra options passed to the renderer - { - if (canvas === null) { - return { atLeastOneVisibleElement: false }; + scale: number; + normalizedWidth: number; + normalizedHeight: number; + theme?: CommonCanvasAppState["theme"]; + isExporting?: StaticCanvasRenderConfig["isExporting"]; + viewBackgroundColor?: StaticCanvasAppState["viewBackgroundColor"]; +}): CanvasRenderingContext2D => { + const context = canvas.getContext("2d")!; + + context.setTransform(1, 0, 0, 1, 0, 0); + context.scale(scale, scale); + + if (isExporting && theme === "dark") { + context.filter = THEME_FILTER; + } + + // Paint background + if (typeof viewBackgroundColor === "string") { + const hasTransparence = + viewBackgroundColor === "transparent" || + viewBackgroundColor.length === 5 || // #RGBA + viewBackgroundColor.length === 9 || // #RRGGBBA + /(hsla|rgba)\(/.test(viewBackgroundColor); + if (hasTransparence) { + context.clearRect(0, 0, normalizedWidth, normalizedHeight); } - const { - renderScrollbars = false, - renderSelection = true, - renderGrid = true, - isExporting, - } = renderConfig; - - const selectionColor = renderConfig.selectionColor || oc.black; - - const context = canvas.getContext("2d")!; - - context.setTransform(1, 0, 0, 1, 0, 0); context.save(); - context.scale(scale, scale); - // When doing calculations based on canvas width we should used normalized one - const normalizedCanvasWidth = canvas.width / scale; - const normalizedCanvasHeight = canvas.height / scale; + context.fillStyle = viewBackgroundColor; + context.fillRect(0, 0, normalizedWidth, normalizedHeight); + context.restore(); + } else { + context.clearRect(0, 0, normalizedWidth, normalizedHeight); + } - if (isExporting && renderConfig.theme === "dark") { - context.filter = THEME_FILTER; - } + return context; +}; - // Paint background - if (typeof renderConfig.viewBackgroundColor === "string") { - const hasTransparence = - renderConfig.viewBackgroundColor === "transparent" || - renderConfig.viewBackgroundColor.length === 5 || // #RGBA - renderConfig.viewBackgroundColor.length === 9 || // #RRGGBBA - /(hsla|rgba)\(/.test(renderConfig.viewBackgroundColor); - if (hasTransparence) { - context.clearRect(0, 0, normalizedCanvasWidth, normalizedCanvasHeight); - } - context.save(); - context.fillStyle = renderConfig.viewBackgroundColor; - context.fillRect(0, 0, normalizedCanvasWidth, normalizedCanvasHeight); - context.restore(); - } else { - context.clearRect(0, 0, normalizedCanvasWidth, normalizedCanvasHeight); - } +const _renderInteractiveScene = ({ + canvas, + elements, + visibleElements, + selectedElements, + scale, + appState, + renderConfig, +}: InteractiveSceneRenderConfig) => { + if (canvas === null) { + return { atLeastOneVisibleElement: false, elements }; + } - // Apply zoom - context.save(); - context.scale(renderConfig.zoom.value, renderConfig.zoom.value); + const [normalizedWidth, normalizedHeight] = getNormalizedCanvasDimensions( + canvas, + scale, + ); - // Grid - if (renderGrid && appState.gridSize) { - strokeGrid( - context, - appState.gridSize, - renderConfig.scrollX, - renderConfig.scrollY, - renderConfig.zoom, - normalizedCanvasWidth / renderConfig.zoom.value, - normalizedCanvasHeight / renderConfig.zoom.value, - ); - } + const context = bootstrapCanvas({ + canvas, + scale, + normalizedWidth, + normalizedHeight, + }); - // Paint visible elements - const visibleElements = elements.filter((element) => - isVisibleElement(element, normalizedCanvasWidth, normalizedCanvasHeight, { - zoom: renderConfig.zoom, - offsetLeft: appState.offsetLeft, - offsetTop: appState.offsetTop, - scrollX: renderConfig.scrollX, - scrollY: renderConfig.scrollY, - }), - ); + // Apply zoom + context.save(); + context.scale(appState.zoom.value, appState.zoom.value); - const groupsToBeAddedToFrame = new Set(); - - visibleElements.forEach((element) => { - if ( - element.groupIds.length > 0 && - appState.frameToHighlight && - appState.selectedElementIds[element.id] && - (elementOverlapsWithFrame(element, appState.frameToHighlight) || - element.groupIds.find((groupId) => - groupsToBeAddedToFrame.has(groupId), - )) - ) { - element.groupIds.forEach((groupId) => - groupsToBeAddedToFrame.add(groupId), - ); - } - }); - - let editingLinearElement: NonDeleted | undefined = - undefined; - - visibleElements - .filter((el) => !isEmbeddableOrFrameLabel(el)) - .forEach((element) => { - try { - // - when exporting the whole canvas, we DO NOT apply clipping - // - when we are exporting a particular frame, apply clipping - // if the containing frame is not selected, apply clipping - const frameId = element.frameId || appState.frameToHighlight?.id; - - if ( - frameId && - ((renderConfig.isExporting && - isOnlyExportingSingleFrame(elements)) || - (!renderConfig.isExporting && - appState.frameRendering.enabled && - appState.frameRendering.clip)) - ) { - context.save(); - - const frame = getTargetFrame(element, appState); - - if (frame && isElementInFrame(element, elements, appState)) { - frameClip(frame, context, renderConfig); - } - renderElement(element, rc, context, renderConfig, appState); - context.restore(); - } else { - renderElement(element, rc, context, renderConfig, appState); - } - // Getting the element using LinearElementEditor during collab mismatches version - being one head of visible elements due to - // ShapeCache returns empty hence making sure that we get the - // correct element from visible elements - if (appState.editingLinearElement?.elementId === element.id) { - if (element) { - editingLinearElement = - element as NonDeleted; - } - } - if (!isExporting) { - renderLinkIcon(element, context, appState); - } - } catch (error: any) { - console.error(error); - } - }); - - // render embeddables on top - visibleElements - .filter((el) => isEmbeddableOrFrameLabel(el)) - .forEach((element) => { - try { - const render = () => { - renderElement(element, rc, context, renderConfig, appState); - - if ( - isEmbeddableElement(element) && - (isExporting || !element.validated) && - element.width && - element.height - ) { - const label = createPlaceholderEmbeddableLabel(element); - renderElement(label, rc, context, renderConfig, appState); - } - if (!isExporting) { - renderLinkIcon(element, context, appState); - } - }; - // - when exporting the whole canvas, we DO NOT apply clipping - // - when we are exporting a particular frame, apply clipping - // if the containing frame is not selected, apply clipping - const frameId = element.frameId || appState.frameToHighlight?.id; - - if ( - frameId && - ((renderConfig.isExporting && - isOnlyExportingSingleFrame(elements)) || - (!renderConfig.isExporting && - appState.frameRendering.enabled && - appState.frameRendering.clip)) - ) { - context.save(); - - const frame = getTargetFrame(element, appState); - - if (frame && isElementInFrame(element, elements, appState)) { - frameClip(frame, context, renderConfig); - } - render(); - context.restore(); - } else { - render(); - } - } catch (error: any) { - console.error(error); - } - }); - - if (editingLinearElement) { - renderLinearPointHandles( - context, - appState, - renderConfig, - editingLinearElement, - ); - } - - // Paint selection element - if (appState.selectionElement) { - try { - renderElement( - appState.selectionElement, - rc, - context, - renderConfig, - appState, - ); - } catch (error: any) { - console.error(error); - } - } - - if (isBindingEnabled(appState)) { - appState.suggestedBindings - .filter((binding) => binding != null) - .forEach((suggestedBinding) => { - renderBindingHighlight(context, renderConfig, suggestedBinding!); - }); - } - - if (appState.frameToHighlight) { - renderFrameHighlight(context, renderConfig, appState.frameToHighlight); - } - - if (appState.elementsToHighlight) { - renderElementsBoxHighlight( - context, - renderConfig, - appState.elementsToHighlight, - appState, - ); - } - - const locallySelectedElements = getSelectedElements(elements, appState); - const isFrameSelected = locallySelectedElements.some((element) => - isFrameElement(element), - ); + let editingLinearElement: NonDeleted | undefined = + undefined; + visibleElements.forEach((element) => { // Getting the element using LinearElementEditor during collab mismatches version - being one head of visible elements due to // ShapeCache returns empty hence making sure that we get the // correct element from visible elements + if (appState.editingLinearElement?.elementId === element.id) { + if (element) { + editingLinearElement = element as NonDeleted; + } + } + }); + + if (editingLinearElement) { + renderLinearPointHandles(context, appState, editingLinearElement); + } + + // Paint selection element + if (appState.selectionElement) { + try { + renderSelectionElement(appState.selectionElement, context, appState); + } catch (error: any) { + console.error(error); + } + } + + if (appState.isBindingEnabled) { + appState.suggestedBindings + .filter((binding) => binding != null) + .forEach((suggestedBinding) => { + renderBindingHighlight(context, appState, suggestedBinding!); + }); + } + + if (appState.frameToHighlight) { + renderFrameHighlight(context, appState, appState.frameToHighlight); + } + + if (appState.elementsToHighlight) { + renderElementsBoxHighlight(context, appState, appState.elementsToHighlight); + } + + const isFrameSelected = selectedElements.some((element) => + isFrameElement(element), + ); + + // Getting the element using LinearElementEditor during collab mismatches version - being one head of visible elements due to + // ShapeCache returns empty hence making sure that we get the + // correct element from visible elements + if ( + selectedElements.length === 1 && + appState.editingLinearElement?.elementId === selectedElements[0].id + ) { + renderLinearPointHandles( + context, + appState, + selectedElements[0] as NonDeleted, + ); + } + + if ( + appState.selectedLinearElement && + appState.selectedLinearElement.hoverPointIndex >= 0 + ) { + renderLinearElementPointHighlight(context, appState); + } + // Paint selected elements + if (!appState.multiElement && !appState.editingLinearElement) { + const showBoundingBox = shouldShowBoundingBox(selectedElements, appState); + + const isSingleLinearElementSelected = + selectedElements.length === 1 && isLinearElement(selectedElements[0]); + // render selected linear element points if ( - locallySelectedElements.length === 1 && - appState.editingLinearElement?.elementId === locallySelectedElements[0].id + isSingleLinearElementSelected && + appState.selectedLinearElement?.elementId === selectedElements[0].id && + !selectedElements[0].locked ) { renderLinearPointHandles( context, appState, - renderConfig, - locallySelectedElements[0] as NonDeleted, + selectedElements[0] as ExcalidrawLinearElement, ); } + const selectionColor = renderConfig.selectionColor || oc.black; - if ( - appState.selectedLinearElement && - appState.selectedLinearElement.hoverPointIndex >= 0 - ) { - renderLinearElementPointHighlight(context, appState, renderConfig); - } - // Paint selected elements - if ( - renderSelection && - !appState.multiElement && - !appState.editingLinearElement - ) { - const showBoundingBox = shouldShowBoundingBox( - locallySelectedElements, - appState, + if (showBoundingBox) { + // Optimisation for finding quickly relevant element ids + const locallySelectedIds = selectedElements.reduce( + (acc: Record, element) => { + acc[element.id] = true; + return acc; + }, + {}, ); - const locallySelectedIds = locallySelectedElements.map( - (element) => element.id, - ); - const isSingleLinearElementSelected = - locallySelectedElements.length === 1 && - isLinearElement(locallySelectedElements[0]); - // render selected linear element points - if ( - isSingleLinearElementSelected && - appState.selectedLinearElement?.elementId === - locallySelectedElements[0].id && - !locallySelectedElements[0].locked - ) { - renderLinearPointHandles( - context, - appState, - renderConfig, - locallySelectedElements[0] as ExcalidrawLinearElement, - ); - } - if (showBoundingBox) { - const selections = elements.reduce((acc, element) => { + const selections = elements.reduce( + ( + acc: { + angle: number; + elementX1: number; + elementY1: number; + elementX2: number; + elementY2: number; + selectionColors: string[]; + dashed?: boolean; + cx: number; + cy: number; + activeEmbeddable: boolean; + }[], + element, + ) => { const selectionColors = []; // local user if ( - locallySelectedIds.includes(element.id) && + locallySelectedIds[element.id] && !isSelectedViaGroup(appState, element) ) { selectionColors.push(selectionColor); @@ -707,7 +595,7 @@ export const _renderScene = ({ if (renderConfig.remoteSelectedElementIds[element.id]) { selectionColors.push( ...renderConfig.remoteSelectedElementIds[element.id].map( - (socketId) => { + (socketId: string) => { const background = getClientColor(socketId); return background; }, @@ -734,312 +622,494 @@ export const _renderScene = ({ }); } return acc; - }, [] as { angle: number; elementX1: number; elementY1: number; elementX2: number; elementY2: number; selectionColors: string[]; dashed?: boolean; cx: number; cy: number; activeEmbeddable: boolean }[]); + }, + [], + ); - const addSelectionForGroupId = (groupId: GroupId) => { - const groupElements = getElementsInGroup(elements, groupId); - const [elementX1, elementY1, elementX2, elementY2] = - getCommonBounds(groupElements); - selections.push({ - angle: 0, - elementX1, - elementX2, - elementY1, - elementY2, - selectionColors: [oc.black], - dashed: true, - cx: elementX1 + (elementX2 - elementX1) / 2, - cy: elementY1 + (elementY2 - elementY1) / 2, - activeEmbeddable: false, - }); - }; + const addSelectionForGroupId = (groupId: GroupId) => { + const groupElements = getElementsInGroup(elements, groupId); + const [elementX1, elementY1, elementX2, elementY2] = + getCommonBounds(groupElements); + selections.push({ + angle: 0, + elementX1, + elementX2, + elementY1, + elementY2, + selectionColors: [oc.black], + dashed: true, + cx: elementX1 + (elementX2 - elementX1) / 2, + cy: elementY1 + (elementY2 - elementY1) / 2, + activeEmbeddable: false, + }); + }; - for (const groupId of getSelectedGroupIds(appState)) { - // TODO: support multiplayer selected group IDs - addSelectionForGroupId(groupId); - } - - if (appState.editingGroupId) { - addSelectionForGroupId(appState.editingGroupId); - } - - selections.forEach((selection) => - renderSelectionBorder(context, renderConfig, selection), - ); + for (const groupId of getSelectedGroupIds(appState)) { + // TODO: support multiplayer selected group IDs + addSelectionForGroupId(groupId); } - // Paint resize transformHandles - context.save(); - context.translate(renderConfig.scrollX, renderConfig.scrollY); - if (locallySelectedElements.length === 1) { - context.fillStyle = oc.white; - const transformHandles = getTransformHandles( - locallySelectedElements[0], - renderConfig.zoom, - "mouse", // when we render we don't know which pointer type so use mouse - ); - if (!appState.viewModeEnabled && showBoundingBox) { - renderTransformHandles( - context, - renderConfig, - transformHandles, - locallySelectedElements[0].angle, - ); - } - } else if (locallySelectedElements.length > 1 && !appState.isRotating) { - const dashedLinePadding = - (DEFAULT_SPACING * 2) / renderConfig.zoom.value; - context.fillStyle = oc.white; - const [x1, y1, x2, y2] = getCommonBounds(locallySelectedElements); - const initialLineDash = context.getLineDash(); - context.setLineDash([2 / renderConfig.zoom.value]); - const lineWidth = context.lineWidth; - context.lineWidth = 1 / renderConfig.zoom.value; - context.strokeStyle = selectionColor; - strokeRectWithRotation( + if (appState.editingGroupId) { + addSelectionForGroupId(appState.editingGroupId); + } + + selections.forEach((selection) => + renderSelectionBorder(context, appState, selection), + ); + } + // Paint resize transformHandles + context.save(); + context.translate(appState.scrollX, appState.scrollY); + + if (selectedElements.length === 1) { + context.fillStyle = oc.white; + const transformHandles = getTransformHandles( + selectedElements[0], + appState.zoom, + "mouse", // when we render we don't know which pointer type so use mouse + ); + if (!appState.viewModeEnabled && showBoundingBox) { + renderTransformHandles( context, - x1 - dashedLinePadding, - y1 - dashedLinePadding, - x2 - x1 + dashedLinePadding * 2, - y2 - y1 + dashedLinePadding * 2, - (x1 + x2) / 2, - (y1 + y2) / 2, - 0, + renderConfig, + appState, + transformHandles, + selectedElements[0].angle, ); - context.lineWidth = lineWidth; - context.setLineDash(initialLineDash); - const transformHandles = getTransformHandlesFromCoords( - [x1, y1, x2, y2, (x1 + x2) / 2, (y1 + y2) / 2], - 0, - renderConfig.zoom, - "mouse", - isFrameSelected - ? OMIT_SIDES_FOR_FRAME - : OMIT_SIDES_FOR_MULTIPLE_ELEMENTS, - ); - if (locallySelectedElements.some((element) => !element.locked)) { - renderTransformHandles(context, renderConfig, transformHandles, 0); - } } - context.restore(); + } else if (selectedElements.length > 1 && !appState.isRotating) { + const dashedLinePadding = (DEFAULT_SPACING * 2) / appState.zoom.value; + context.fillStyle = oc.white; + const [x1, y1, x2, y2] = getCommonBounds(selectedElements); + const initialLineDash = context.getLineDash(); + context.setLineDash([2 / appState.zoom.value]); + const lineWidth = context.lineWidth; + context.lineWidth = 1 / appState.zoom.value; + context.strokeStyle = selectionColor; + strokeRectWithRotation( + context, + x1 - dashedLinePadding, + y1 - dashedLinePadding, + x2 - x1 + dashedLinePadding * 2, + y2 - y1 + dashedLinePadding * 2, + (x1 + x2) / 2, + (y1 + y2) / 2, + 0, + ); + context.lineWidth = lineWidth; + context.setLineDash(initialLineDash); + const transformHandles = getTransformHandlesFromCoords( + [x1, y1, x2, y2, (x1 + x2) / 2, (y1 + y2) / 2], + 0, + appState.zoom, + "mouse", + isFrameSelected + ? OMIT_SIDES_FOR_FRAME + : OMIT_SIDES_FOR_MULTIPLE_ELEMENTS, + ); + if (selectedElements.some((element) => !element.locked)) { + renderTransformHandles( + context, + renderConfig, + appState, + transformHandles, + 0, + ); + } + } + context.restore(); + } + + // Reset zoom + context.restore(); + + // Paint remote pointers + for (const clientId in renderConfig.remotePointerViewportCoords) { + let { x, y } = renderConfig.remotePointerViewportCoords[clientId]; + + x -= appState.offsetLeft; + y -= appState.offsetTop; + + const width = 11; + const height = 14; + + const isOutOfBounds = + x < 0 || + x > normalizedWidth - width || + y < 0 || + y > normalizedHeight - height; + + x = Math.max(x, 0); + x = Math.min(x, normalizedWidth - width); + y = Math.max(y, 0); + y = Math.min(y, normalizedHeight - height); + + const background = getClientColor(clientId); + + context.save(); + context.strokeStyle = background; + context.fillStyle = background; + + const userState = renderConfig.remotePointerUserStates[clientId]; + const isInactive = + isOutOfBounds || + userState === UserIdleState.IDLE || + userState === UserIdleState.AWAY; + + if (isInactive) { + context.globalAlpha = 0.3; } - // Reset zoom - context.restore(); - - // Paint remote pointers - for (const clientId in renderConfig.remotePointerViewportCoords) { - let { x, y } = renderConfig.remotePointerViewportCoords[clientId]; - - x -= appState.offsetLeft; - y -= appState.offsetTop; - - const width = 11; - const height = 14; - - const isOutOfBounds = - x < 0 || - x > normalizedCanvasWidth - width || - y < 0 || - y > normalizedCanvasHeight - height; - - x = Math.max(x, 0); - x = Math.min(x, normalizedCanvasWidth - width); - y = Math.max(y, 0); - y = Math.min(y, normalizedCanvasHeight - height); - - const background = getClientColor(clientId); - - context.save(); - context.strokeStyle = background; - context.fillStyle = background; - - const userState = renderConfig.remotePointerUserStates[clientId]; - const isInactive = - isOutOfBounds || - userState === UserIdleState.IDLE || - userState === UserIdleState.AWAY; - - if (isInactive) { - context.globalAlpha = 0.3; - } - - if ( - renderConfig.remotePointerButton && - renderConfig.remotePointerButton[clientId] === "down" - ) { - context.beginPath(); - context.arc(x, y, 15, 0, 2 * Math.PI, false); - context.lineWidth = 3; - context.strokeStyle = "#ffffff88"; - context.stroke(); - context.closePath(); - - context.beginPath(); - context.arc(x, y, 15, 0, 2 * Math.PI, false); - context.lineWidth = 1; - context.strokeStyle = background; - context.stroke(); - context.closePath(); - } - - // Background (white outline) for arrow - context.fillStyle = oc.white; - context.strokeStyle = oc.white; - context.lineWidth = 6; - context.lineJoin = "round"; + if ( + renderConfig.remotePointerButton && + renderConfig.remotePointerButton[clientId] === "down" + ) { context.beginPath(); + context.arc(x, y, 15, 0, 2 * Math.PI, false); + context.lineWidth = 3; + context.strokeStyle = "#ffffff88"; + context.stroke(); + context.closePath(); + + context.beginPath(); + context.arc(x, y, 15, 0, 2 * Math.PI, false); + context.lineWidth = 1; + context.strokeStyle = background; + context.stroke(); + context.closePath(); + } + + // Background (white outline) for arrow + context.fillStyle = oc.white; + context.strokeStyle = oc.white; + context.lineWidth = 6; + context.lineJoin = "round"; + context.beginPath(); + context.moveTo(x, y); + context.lineTo(x + 0, y + 14); + context.lineTo(x + 4, y + 9); + context.lineTo(x + 11, y + 8); + context.closePath(); + context.stroke(); + context.fill(); + + // Arrow + context.fillStyle = background; + context.strokeStyle = background; + context.lineWidth = 2; + context.lineJoin = "round"; + context.beginPath(); + if (isInactive) { + context.moveTo(x - 1, y - 1); + context.lineTo(x - 1, y + 15); + context.lineTo(x + 5, y + 10); + context.lineTo(x + 12, y + 9); + context.closePath(); + context.fill(); + } else { context.moveTo(x, y); context.lineTo(x + 0, y + 14); context.lineTo(x + 4, y + 9); context.lineTo(x + 11, y + 8); context.closePath(); - context.stroke(); context.fill(); - - // Arrow - context.fillStyle = background; - context.strokeStyle = background; - context.lineWidth = 2; - context.lineJoin = "round"; - context.beginPath(); - if (isInactive) { - context.moveTo(x - 1, y - 1); - context.lineTo(x - 1, y + 15); - context.lineTo(x + 5, y + 10); - context.lineTo(x + 12, y + 9); - context.closePath(); - context.fill(); - } else { - context.moveTo(x, y); - context.lineTo(x + 0, y + 14); - context.lineTo(x + 4, y + 9); - context.lineTo(x + 11, y + 8); - context.closePath(); - context.fill(); - context.stroke(); - } - - const username = renderConfig.remotePointerUsernames[clientId] || ""; - - if (!isOutOfBounds && username) { - context.font = "600 12px sans-serif"; // font has to be set before context.measureText() - - const offsetX = x + width / 2; - const offsetY = y + height + 2; - const paddingHorizontal = 5; - const paddingVertical = 3; - const measure = context.measureText(username); - const measureHeight = - measure.actualBoundingBoxDescent + measure.actualBoundingBoxAscent; - const finalHeight = Math.max(measureHeight, 12); - - const boxX = offsetX - 1; - const boxY = offsetY - 1; - const boxWidth = measure.width + 2 + paddingHorizontal * 2 + 2; - const boxHeight = finalHeight + 2 + paddingVertical * 2 + 2; - if (context.roundRect) { - context.beginPath(); - context.roundRect(boxX, boxY, boxWidth, boxHeight, 8); - context.fillStyle = background; - context.fill(); - context.strokeStyle = oc.white; - context.stroke(); - } else { - roundRect(context, boxX, boxY, boxWidth, boxHeight, 8, oc.white); - } - context.fillStyle = oc.black; - - context.fillText( - username, - offsetX + paddingHorizontal + 1, - offsetY + - paddingVertical + - measure.actualBoundingBoxAscent + - Math.floor((finalHeight - measureHeight) / 2) + - 2, - ); - } - - context.restore(); - context.closePath(); + context.stroke(); } - // Paint scrollbars - let scrollBars; - if (renderScrollbars) { - scrollBars = getScrollBars( - elements, - normalizedCanvasWidth, - normalizedCanvasHeight, - renderConfig, - ); + const username = renderConfig.remotePointerUsernames[clientId] || ""; - context.save(); - context.fillStyle = SCROLLBAR_COLOR; - context.strokeStyle = "rgba(255,255,255,0.8)"; - [scrollBars.horizontal, scrollBars.vertical].forEach((scrollBar) => { - if (scrollBar) { - roundRect( - context, - scrollBar.x, - scrollBar.y, - scrollBar.width, - scrollBar.height, - SCROLLBAR_WIDTH / 2, - ); - } - }); - context.restore(); + if (!isOutOfBounds && username) { + context.font = "600 12px sans-serif"; // font has to be set before context.measureText() + + const offsetX = x + width / 2; + const offsetY = y + height + 2; + const paddingHorizontal = 5; + const paddingVertical = 3; + const measure = context.measureText(username); + const measureHeight = + measure.actualBoundingBoxDescent + measure.actualBoundingBoxAscent; + const finalHeight = Math.max(measureHeight, 12); + + const boxX = offsetX - 1; + const boxY = offsetY - 1; + const boxWidth = measure.width + 2 + paddingHorizontal * 2 + 2; + const boxHeight = finalHeight + 2 + paddingVertical * 2 + 2; + if (context.roundRect) { + context.beginPath(); + context.roundRect(boxX, boxY, boxWidth, boxHeight, 8); + context.fillStyle = background; + context.fill(); + context.strokeStyle = oc.white; + context.stroke(); + } else { + roundRect(context, boxX, boxY, boxWidth, boxHeight, 8, oc.white); + } + context.fillStyle = oc.black; + + context.fillText( + username, + offsetX + paddingHorizontal + 1, + offsetY + + paddingVertical + + measure.actualBoundingBoxAscent + + Math.floor((finalHeight - measureHeight) / 2) + + 2, + ); } context.restore(); - return { atLeastOneVisibleElement: visibleElements.length > 0, scrollBars }; - }; + context.closePath(); + } -const renderSceneThrottled = throttleRAF( - (config: { - elements: readonly NonDeletedExcalidrawElement[]; - appState: AppState; - scale: number; - rc: RoughCanvas; - canvas: HTMLCanvasElement; - renderConfig: RenderConfig; - callback?: (data: ReturnType) => void; - }) => { - const ret = _renderScene(config); + // Paint scrollbars + let scrollBars; + if (renderConfig.renderScrollbars) { + scrollBars = getScrollBars( + elements, + normalizedWidth, + normalizedHeight, + appState, + ); + + context.save(); + context.fillStyle = SCROLLBAR_COLOR; + context.strokeStyle = "rgba(255,255,255,0.8)"; + [scrollBars.horizontal, scrollBars.vertical].forEach((scrollBar) => { + if (scrollBar) { + roundRect( + context, + scrollBar.x, + scrollBar.y, + scrollBar.width, + scrollBar.height, + SCROLLBAR_WIDTH / 2, + ); + } + }); + context.restore(); + } + + return { + scrollBars, + atLeastOneVisibleElement: visibleElements.length > 0, + elements, + }; +}; + +const _renderStaticScene = ({ + canvas, + rc, + elements, + visibleElements, + scale, + appState, + renderConfig, +}: StaticSceneRenderConfig) => { + if (canvas === null) { + return; + } + + const { renderGrid = true, isExporting } = renderConfig; + + const [normalizedWidth, normalizedHeight] = getNormalizedCanvasDimensions( + canvas, + scale, + ); + + const context = bootstrapCanvas({ + canvas, + scale, + normalizedWidth, + normalizedHeight, + theme: appState.theme, + isExporting, + viewBackgroundColor: appState.viewBackgroundColor, + }); + + // Apply zoom + context.scale(appState.zoom.value, appState.zoom.value); + + // Grid + if (renderGrid && appState.gridSize) { + strokeGrid( + context, + appState.gridSize, + -Math.ceil(appState.zoom.value / appState.gridSize) * appState.gridSize + + (appState.scrollX % appState.gridSize), + -Math.ceil(appState.zoom.value / appState.gridSize) * appState.gridSize + + (appState.scrollY % appState.gridSize), + appState.zoom, + normalizedWidth / appState.zoom.value, + normalizedHeight / appState.zoom.value, + ); + } + + const groupsToBeAddedToFrame = new Set(); + + visibleElements.forEach((element) => { + if ( + element.groupIds.length > 0 && + appState.frameToHighlight && + appState.selectedElementIds[element.id] && + (elementOverlapsWithFrame(element, appState.frameToHighlight) || + element.groupIds.find((groupId) => groupsToBeAddedToFrame.has(groupId))) + ) { + element.groupIds.forEach((groupId) => + groupsToBeAddedToFrame.add(groupId), + ); + } + }); + + // Paint visible elements + visibleElements + .filter((el) => !isEmbeddableOrFrameLabel(el)) + .forEach((element) => { + try { + // - when exporting the whole canvas, we DO NOT apply clipping + // - when we are exporting a particular frame, apply clipping + // if the containing frame is not selected, apply clipping + const frameId = element.frameId || appState.frameToHighlight?.id; + + if ( + frameId && + ((renderConfig.isExporting && isOnlyExportingSingleFrame(elements)) || + (!renderConfig.isExporting && + appState.frameRendering.enabled && + appState.frameRendering.clip)) + ) { + context.save(); + + const frame = getTargetFrame(element, appState); + + // TODO do we need to check isElementInFrame here? + if (frame && isElementInFrame(element, elements, appState)) { + frameClip(frame, context, renderConfig, appState); + } + renderElement(element, rc, context, renderConfig, appState); + context.restore(); + } else { + renderElement(element, rc, context, renderConfig, appState); + } + if (!isExporting) { + renderLinkIcon(element, context, appState); + } + } catch (error: any) { + console.error(error); + } + }); + + // render embeddables on top + visibleElements + .filter((el) => isEmbeddableOrFrameLabel(el)) + .forEach((element) => { + try { + const render = () => { + renderElement(element, rc, context, renderConfig, appState); + + if ( + isEmbeddableElement(element) && + (isExporting || !element.validated) && + element.width && + element.height + ) { + const label = createPlaceholderEmbeddableLabel(element); + renderElement(label, rc, context, renderConfig, appState); + } + if (!isExporting) { + renderLinkIcon(element, context, appState); + } + }; + // - when exporting the whole canvas, we DO NOT apply clipping + // - when we are exporting a particular frame, apply clipping + // if the containing frame is not selected, apply clipping + const frameId = element.frameId || appState.frameToHighlight?.id; + + if ( + frameId && + ((renderConfig.isExporting && isOnlyExportingSingleFrame(elements)) || + (!renderConfig.isExporting && + appState.frameRendering.enabled && + appState.frameRendering.clip)) + ) { + context.save(); + + const frame = getTargetFrame(element, appState); + + if (frame && isElementInFrame(element, elements, appState)) { + frameClip(frame, context, renderConfig, appState); + } + render(); + context.restore(); + } else { + render(); + } + } catch (error: any) { + console.error(error); + } + }); +}; + +/** throttled to animation framerate */ +const renderInteractiveSceneThrottled = throttleRAF( + (config: InteractiveSceneRenderConfig) => { + const ret = _renderInteractiveScene(config); config.callback?.(ret); }, { trailing: true }, ); -/** renderScene throttled to animation framerate */ -export const renderScene = ( - config: { - elements: readonly NonDeletedExcalidrawElement[]; - appState: AppState; - scale: number; - rc: RoughCanvas; - canvas: HTMLCanvasElement; - renderConfig: RenderConfig; - callback?: (data: ReturnType) => void; - }, - /** Whether to throttle rendering. Defaults to false. - * When throttling, no value is returned. Use the callback instead. */ +/** + * Interactive scene is the ui-canvas where we render boundinb boxes, selections + * and other ui stuff. + */ +export const renderInteractiveScene = < + U extends typeof _renderInteractiveScene, + T extends boolean = false, +>( + renderConfig: InteractiveSceneRenderConfig, throttle?: T, -): T extends true ? void : ReturnType => { +): T extends true ? void : ReturnType => { if (throttle) { - renderSceneThrottled(config); - return undefined as T extends true ? void : ReturnType; + renderInteractiveSceneThrottled(renderConfig); + return undefined as T extends true ? void : ReturnType; } - const ret = _renderScene(config); - config.callback?.(ret); - return ret as T extends true ? void : ReturnType; + const ret = _renderInteractiveScene(renderConfig); + renderConfig.callback(ret); + return ret as T extends true ? void : ReturnType; +}; + +/** throttled to animation framerate */ +const renderStaticSceneThrottled = throttleRAF( + (config: StaticSceneRenderConfig) => { + _renderStaticScene(config); + }, + { trailing: true }, +); + +/** + * Static scene is the non-ui canvas where we render elements. + */ +export const renderStaticScene = ( + renderConfig: StaticSceneRenderConfig, + throttle?: boolean, +) => { + if (throttle) { + renderStaticSceneThrottled(renderConfig); + return; + } + + _renderStaticScene(renderConfig); +}; + +export const cancelRender = () => { + renderInteractiveSceneThrottled.cancel(); + renderStaticSceneThrottled.cancel(); }; const renderTransformHandles = ( context: CanvasRenderingContext2D, - renderConfig: RenderConfig, + renderConfig: InteractiveCanvasRenderConfig, + appState: InteractiveCanvasAppState, transformHandles: TransformHandles, angle: number, ): void => { @@ -1049,7 +1119,7 @@ const renderTransformHandles = ( const [x, y, width, height] = transformHandle; context.save(); - context.lineWidth = 1 / renderConfig.zoom.value; + context.lineWidth = 1 / appState.zoom.value; if (renderConfig.selectionColor) { context.strokeStyle = renderConfig.selectionColor; } @@ -1058,7 +1128,7 @@ const renderTransformHandles = ( // prefer round corners if roundRect API is available } else if (context.roundRect) { context.beginPath(); - context.roundRect(x, y, width, height, 2 / renderConfig.zoom.value); + context.roundRect(x, y, width, height, 2 / appState.zoom.value); context.fill(); context.stroke(); } else { @@ -1081,7 +1151,7 @@ const renderTransformHandles = ( const renderSelectionBorder = ( context: CanvasRenderingContext2D, - renderConfig: RenderConfig, + appState: InteractiveCanvasAppState, elementProperties: { angle: number; elementX1: number; @@ -1111,13 +1181,13 @@ const renderSelectionBorder = ( const elementWidth = elementX2 - elementX1; const elementHeight = elementY2 - elementY1; - const linePadding = padding / renderConfig.zoom.value; - const lineWidth = 8 / renderConfig.zoom.value; - const spaceWidth = 4 / renderConfig.zoom.value; + const linePadding = padding / appState.zoom.value; + const lineWidth = 8 / appState.zoom.value; + const spaceWidth = 4 / appState.zoom.value; context.save(); - context.translate(renderConfig.scrollX, renderConfig.scrollY); - context.lineWidth = (activeEmbeddable ? 4 : 1) / renderConfig.zoom.value; + context.translate(appState.scrollX, appState.scrollY); + context.lineWidth = (activeEmbeddable ? 4 : 1) / appState.zoom.value; const count = selectionColors.length; for (let index = 0; index < count; ++index) { @@ -1145,7 +1215,7 @@ const renderSelectionBorder = ( const renderBindingHighlight = ( context: CanvasRenderingContext2D, - renderConfig: RenderConfig, + appState: InteractiveCanvasAppState, suggestedBinding: SuggestedBinding, ) => { const renderHighlight = Array.isArray(suggestedBinding) @@ -1153,7 +1223,7 @@ const renderBindingHighlight = ( : renderBindingHighlightForBindableElement; context.save(); - context.translate(renderConfig.scrollX, renderConfig.scrollY); + context.translate(appState.scrollX, appState.scrollY); renderHighlight(context, suggestedBinding as any); context.restore(); @@ -1219,7 +1289,7 @@ const renderBindingHighlightForBindableElement = ( const renderFrameHighlight = ( context: CanvasRenderingContext2D, - renderConfig: RenderConfig, + appState: InteractiveCanvasAppState, frame: NonDeleted, ) => { const [x1, y1, x2, y2] = getElementAbsoluteCoords(frame); @@ -1227,10 +1297,10 @@ const renderFrameHighlight = ( const height = y2 - y1; context.strokeStyle = "rgb(0,118,255)"; - context.lineWidth = (FRAME_STYLE.strokeWidth * 2) / renderConfig.zoom.value; + context.lineWidth = (FRAME_STYLE.strokeWidth * 2) / appState.zoom.value; context.save(); - context.translate(renderConfig.scrollX, renderConfig.scrollY); + context.translate(appState.scrollX, appState.scrollY); strokeRectWithRotation( context, x1, @@ -1241,16 +1311,15 @@ const renderFrameHighlight = ( y1 + height / 2, frame.angle, false, - FRAME_STYLE.radius / renderConfig.zoom.value, + FRAME_STYLE.radius / appState.zoom.value, ); context.restore(); }; const renderElementsBoxHighlight = ( context: CanvasRenderingContext2D, - renderConfig: RenderConfig, + appState: InteractiveCanvasAppState, elements: NonDeleted[], - appState: AppState, ) => { const individualElements = elements.filter( (element) => element.groupIds.length === 0, @@ -1290,7 +1359,7 @@ const renderElementsBoxHighlight = ( individualElements.map((element) => getSelectionFromElements([element])), ) .forEach((selection) => - renderSelectionBorder(context, renderConfig, selection), + renderSelectionBorder(context, appState, selection), ); }; @@ -1324,7 +1393,7 @@ let linkCanvasCache: any; const renderLinkIcon = ( element: NonDeletedExcalidrawElement, context: CanvasRenderingContext2D, - appState: AppState, + appState: StaticCanvasAppState, ) => { if (element.link && !appState.selectedElementIds[element.id]) { const [x1, y1, x2, y2] = getElementAbsoluteCoords(element); @@ -1375,42 +1444,6 @@ const renderLinkIcon = ( } }; -export const isVisibleElement = ( - element: ExcalidrawElement, - canvasWidth: number, - canvasHeight: number, - viewTransformations: { - zoom: Zoom; - offsetLeft: number; - offsetTop: number; - scrollX: number; - scrollY: number; - }, -) => { - const [x1, y1, x2, y2] = getElementBounds(element); // scene coordinates - const topLeftSceneCoords = viewportCoordsToSceneCoords( - { - clientX: viewTransformations.offsetLeft, - clientY: viewTransformations.offsetTop, - }, - viewTransformations, - ); - const bottomRightSceneCoords = viewportCoordsToSceneCoords( - { - clientX: viewTransformations.offsetLeft + canvasWidth, - clientY: viewTransformations.offsetTop + canvasHeight, - }, - viewTransformations, - ); - - return ( - topLeftSceneCoords.x <= x2 && - topLeftSceneCoords.y <= y2 && - bottomRightSceneCoords.x >= x1 && - bottomRightSceneCoords.y >= y1 - ); -}; - // This should be only called for exporting purposes export const renderSceneToSvg = ( elements: readonly NonDeletedExcalidrawElement[], diff --git a/src/scene/Fonts.ts b/src/scene/Fonts.ts index e245eb16..05dddadc 100644 --- a/src/scene/Fonts.ts +++ b/src/scene/Fonts.ts @@ -2,9 +2,9 @@ import { isTextElement, refreshTextDimensions } from "../element"; import { newElementWith } from "../element/mutateElement"; import { isBoundToContainer } from "../element/typeChecks"; import { ExcalidrawElement, ExcalidrawTextElement } from "../element/types"; -import { invalidateShapeForElement } from "../renderer/renderElement"; import { getFontString } from "../utils"; import type Scene from "./Scene"; +import { ShapeCache } from "./ShapeCache"; export class Fonts { private scene: Scene; @@ -54,7 +54,7 @@ export class Fonts { this.scene.mapElements((element) => { if (isTextElement(element) && !isBoundToContainer(element)) { - invalidateShapeForElement(element); + ShapeCache.delete(element); didUpdate = true; return newElementWith(element, { ...refreshTextDimensions(element), diff --git a/src/scene/Renderer.ts b/src/scene/Renderer.ts new file mode 100644 index 00000000..15222495 --- /dev/null +++ b/src/scene/Renderer.ts @@ -0,0 +1,131 @@ +import { isElementInViewport } from "../element/sizeHelpers"; +import { isImageElement } from "../element/typeChecks"; +import { NonDeletedExcalidrawElement } from "../element/types"; +import { cancelRender } from "../renderer/renderScene"; +import { AppState } from "../types"; +import { memoize } from "../utils"; +import Scene from "./Scene"; + +export class Renderer { + private scene: Scene; + + constructor(scene: Scene) { + this.scene = scene; + } + + public getRenderableElements = (() => { + const getVisibleCanvasElements = ({ + elements, + zoom, + offsetLeft, + offsetTop, + scrollX, + scrollY, + height, + width, + }: { + elements: readonly NonDeletedExcalidrawElement[]; + zoom: AppState["zoom"]; + offsetLeft: AppState["offsetLeft"]; + offsetTop: AppState["offsetTop"]; + scrollX: AppState["scrollX"]; + scrollY: AppState["scrollY"]; + height: AppState["height"]; + width: AppState["width"]; + }): readonly NonDeletedExcalidrawElement[] => { + return elements.filter((element) => + isElementInViewport(element, width, height, { + zoom, + offsetLeft, + offsetTop, + scrollX, + scrollY, + }), + ); + }; + + const getCanvasElements = ({ + editingElement, + elements, + pendingImageElementId, + }: { + elements: readonly NonDeletedExcalidrawElement[]; + editingElement: AppState["editingElement"]; + pendingImageElementId: AppState["pendingImageElementId"]; + }) => { + return elements.filter((element) => { + if (isImageElement(element)) { + if ( + // => not placed on canvas yet (but in elements array) + pendingImageElementId === element.id + ) { + return false; + } + } + // we don't want to render text element that's being currently edited + // (it's rendered on remote only) + return ( + !editingElement || + editingElement.type !== "text" || + element.id !== editingElement.id + ); + }); + }; + + return memoize( + ({ + zoom, + offsetLeft, + offsetTop, + scrollX, + scrollY, + height, + width, + editingElement, + pendingImageElementId, + // unused but serves we cache on it to invalidate elements if they + // get mutated + versionNonce: _versionNonce, + }: { + zoom: AppState["zoom"]; + offsetLeft: AppState["offsetLeft"]; + offsetTop: AppState["offsetTop"]; + scrollX: AppState["scrollX"]; + scrollY: AppState["scrollY"]; + height: AppState["height"]; + width: AppState["width"]; + editingElement: AppState["editingElement"]; + pendingImageElementId: AppState["pendingImageElementId"]; + versionNonce: ReturnType["getVersionNonce"]>; + }) => { + const elements = this.scene.getNonDeletedElements(); + + const canvasElements = getCanvasElements({ + elements, + editingElement, + pendingImageElementId, + }); + + const visibleElements = getVisibleCanvasElements({ + elements: canvasElements, + zoom, + offsetLeft, + offsetTop, + scrollX, + scrollY, + height, + width, + }); + + return { canvasElements, visibleElements }; + }, + ); + })(); + + // NOTE Doesn't destroy everything (scene, rc, etc.) because it may not be + // safe to break TS contract here (for upstream cases) + public destroy() { + cancelRender(); + this.getRenderableElements.clear(); + } +} diff --git a/src/scene/Scene.ts b/src/scene/Scene.ts index 5b5b7970..e64da78f 100644 --- a/src/scene/Scene.ts +++ b/src/scene/Scene.ts @@ -14,6 +14,7 @@ import { isFrameElement } from "../element/typeChecks"; import { getSelectedElements } from "./selection"; import { AppState } from "../types"; import { Assert, SameType } from "../utility-types"; +import { randomInteger } from "../random"; type ElementIdKey = InstanceType["elementId"]; type ElementKey = ExcalidrawElement | ElementIdKey; @@ -105,6 +106,7 @@ class Scene { elements: null, cache: new Map(), }; + private versionNonce: number | undefined; getElementsIncludingDeleted() { return this.elements; @@ -172,6 +174,10 @@ class Scene { return (this.elementsMap.get(id) as T | undefined) || null; } + getVersionNonce() { + return this.versionNonce; + } + getNonDeletedElement( id: ExcalidrawElement["id"], ): NonDeleted | null { @@ -230,6 +236,8 @@ class Scene { } informMutation() { + this.versionNonce = randomInteger(); + for (const callback of Array.from(this.callbacks)) { callback(); } diff --git a/src/scene/ShapeCache.ts b/src/scene/ShapeCache.ts new file mode 100644 index 00000000..d2237220 --- /dev/null +++ b/src/scene/ShapeCache.ts @@ -0,0 +1,61 @@ +import { Drawable } from "roughjs/bin/core"; +import { RoughGenerator } from "roughjs/bin/generator"; +import { ExcalidrawElement } from "../element/types"; +import { generateElementShape } from "../renderer/renderElement"; + +type ElementShape = Drawable | Drawable[] | null; + +type ElementShapes = { + freedraw: Drawable | null; + arrow: Drawable[]; + line: Drawable[]; + text: null; + image: null; +}; + +export class ShapeCache { + private static rg = new RoughGenerator(); + private static cache = new WeakMap(); + + public static get = (element: T) => { + return ShapeCache.cache.get( + element, + ) as T["type"] extends keyof ElementShapes + ? ElementShapes[T["type"]] | undefined + : Drawable | null | undefined; + }; + + public static set = ( + 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 + * return cached shape. + */ + public static generateElementShape = ( + element: T, + ) => { + const shape = generateElementShape( + element, + ShapeCache.rg, + /* so it prefers cache */ false, + ) as T["type"] extends keyof ElementShapes + ? ElementShapes[T["type"]] + : Drawable | null; + + ShapeCache.cache.set(element, shape); + + return shape; + }; +} diff --git a/src/scene/export.ts b/src/scene/export.ts index 61f235d1..ca838f05 100644 --- a/src/scene/export.ts +++ b/src/scene/export.ts @@ -1,7 +1,7 @@ import rough from "roughjs/bin/rough"; import { NonDeletedExcalidrawElement } from "../element/types"; import { getCommonBounds, getElementAbsoluteCoords } from "../element/bounds"; -import { renderScene, renderSceneToSvg } from "../renderer/renderScene"; +import { renderSceneToSvg, renderStaticScene } from "../renderer/renderScene"; import { distance, isOnlyExportingSingleFrame } from "../utils"; import { AppState, BinaryFiles } from "../types"; import { DEFAULT_EXPORT_PADDING, SVG_NS, THEME_FILTER } from "../constants"; @@ -54,26 +54,23 @@ export const exportToCanvas = async ( const onlyExportingSingleFrame = isOnlyExportingSingleFrame(elements); - renderScene({ - elements, - appState, - scale, - rc: rough.canvas(canvas), + renderStaticScene({ canvas, - renderConfig: { + rc: rough.canvas(canvas), + elements, + visibleElements: elements, + scale, + appState: { + ...appState, viewBackgroundColor: exportBackground ? viewBackgroundColor : null, scrollX: -minX + (onlyExportingSingleFrame ? 0 : exportPadding), scrollY: -minY + (onlyExportingSingleFrame ? 0 : exportPadding), zoom: defaultAppState.zoom, - remotePointerViewportCoords: {}, - remoteSelectedElementIds: {}, shouldCacheIgnoreZoom: false, - remotePointerUsernames: {}, - remotePointerUserStates: {}, theme: appState.exportWithDarkMode ? "dark" : "light", + }, + renderConfig: { imageCache, - renderScrollbars: false, - renderSelection: false, renderGrid: false, isExporting: true, }, diff --git a/src/scene/scroll.ts b/src/scene/scroll.ts index 114d6db0..b5b8176e 100644 --- a/src/scene/scroll.ts +++ b/src/scene/scroll.ts @@ -11,11 +11,7 @@ import { viewportCoordsToSceneCoords, } from "../utils"; -const isOutsideViewPort = ( - appState: AppState, - canvas: HTMLCanvasElement | null, - cords: Array, -) => { +const isOutsideViewPort = (appState: AppState, cords: Array) => { const [x1, y1, x2, y2] = cords; const { x: viewportX1, y: viewportY1 } = sceneCoordsToViewportCoords( { sceneX: x1, sceneY: y1 }, @@ -49,7 +45,6 @@ export const centerScrollOn = ({ export const calculateScrollCenter = ( elements: readonly ExcalidrawElement[], appState: AppState, - canvas: HTMLCanvasElement | null, ): { scrollX: number; scrollY: number } => { elements = getVisibleElements(elements); @@ -61,7 +56,7 @@ export const calculateScrollCenter = ( } let [x1, y1, x2, y2] = getCommonBounds(elements); - if (isOutsideViewPort(appState, canvas, [x1, y1, x2, y2])) { + if (isOutsideViewPort(appState, [x1, y1, x2, y2])) { [x1, y1, x2, y2] = getClosestElementBounds( elements, viewportCoordsToSceneCoords( diff --git a/src/scene/scrollbars.ts b/src/scene/scrollbars.ts index 76a04d60..1d93f688 100644 --- a/src/scene/scrollbars.ts +++ b/src/scene/scrollbars.ts @@ -1,6 +1,6 @@ import { ExcalidrawElement } from "../element/types"; import { getCommonBounds } from "../element"; -import { Zoom } from "../types"; +import { InteractiveCanvasAppState } from "../types"; import { ScrollBars } from "./types"; import { getGlobalCSSVariable } from "../utils"; import { getLanguage } from "../i18n"; @@ -13,15 +13,7 @@ export const getScrollBars = ( elements: readonly ExcalidrawElement[], viewportWidth: number, viewportHeight: number, - { - scrollX, - scrollY, - zoom, - }: { - scrollX: number; - scrollY: number; - zoom: Zoom; - }, + appState: InteractiveCanvasAppState, ): ScrollBars => { if (elements.length === 0) { return { @@ -34,8 +26,8 @@ export const getScrollBars = ( getCommonBounds(elements); // Apply zoom - const viewportWidthWithZoom = viewportWidth / zoom.value; - const viewportHeightWithZoom = viewportHeight / zoom.value; + const viewportWidthWithZoom = viewportWidth / appState.zoom.value; + const viewportHeightWithZoom = viewportHeight / appState.zoom.value; const viewportWidthDiff = viewportWidth - viewportWidthWithZoom; const viewportHeightDiff = viewportHeight - viewportHeightWithZoom; @@ -50,8 +42,10 @@ export const getScrollBars = ( const isRTL = getLanguage().rtl; // The viewport is the rectangle currently visible for the user - const viewportMinX = -scrollX + viewportWidthDiff / 2 + safeArea.left; - const viewportMinY = -scrollY + viewportHeightDiff / 2 + safeArea.top; + const viewportMinX = + -appState.scrollX + viewportWidthDiff / 2 + safeArea.left; + const viewportMinY = + -appState.scrollY + viewportHeightDiff / 2 + safeArea.top; const viewportMaxX = viewportMinX + viewportWidthWithZoom - safeArea.right; const viewportMaxY = viewportMinY + viewportHeightWithZoom - safeArea.bottom; diff --git a/src/scene/selection.ts b/src/scene/selection.ts index bbb629d3..e678894a 100644 --- a/src/scene/selection.ts +++ b/src/scene/selection.ts @@ -3,7 +3,7 @@ import { NonDeletedExcalidrawElement, } from "../element/types"; import { getElementAbsoluteCoords, getElementBounds } from "../element"; -import { AppState } from "../types"; +import { AppState, InteractiveCanvasAppState } from "../types"; import { isBoundToContainer } from "../element/typeChecks"; import { elementOverlapsWithFrame, @@ -146,7 +146,7 @@ export const getCommonAttributeOfSelectedElements = ( export const getSelectedElements = ( elements: readonly NonDeletedExcalidrawElement[], - appState: Pick, + appState: Pick, opts?: { includeBoundTextElement?: boolean; includeElementsInFrames?: boolean; diff --git a/src/scene/types.ts b/src/scene/types.ts index a54b02b2..9298f596 100644 --- a/src/scene/types.ts +++ b/src/scene/types.ts @@ -1,33 +1,63 @@ -import { ExcalidrawTextElement } from "../element/types"; -import { AppClassProperties, AppState } from "../types"; +import { RoughCanvas } from "roughjs/bin/canvas"; +import { + ExcalidrawTextElement, + NonDeletedExcalidrawElement, +} from "../element/types"; +import { + AppClassProperties, + InteractiveCanvasAppState, + StaticCanvasAppState, +} from "../types"; -export type RenderConfig = { - // AppState values - // --------------------------------------------------------------------------- - scrollX: AppState["scrollX"]; - scrollY: AppState["scrollY"]; - /** null indicates transparent bg */ - viewBackgroundColor: AppState["viewBackgroundColor"] | null; - zoom: AppState["zoom"]; - shouldCacheIgnoreZoom: AppState["shouldCacheIgnoreZoom"]; - theme: AppState["theme"]; - // collab-related state - // --------------------------------------------------------------------------- - remotePointerViewportCoords: { [id: string]: { x: number; y: number } }; - remotePointerButton?: { [id: string]: string | undefined }; - remoteSelectedElementIds: { [elementId: string]: string[] }; - remotePointerUsernames: { [id: string]: string }; - remotePointerUserStates: { [id: string]: string }; +export type StaticCanvasRenderConfig = { // extra options passed to the renderer // --------------------------------------------------------------------------- imageCache: AppClassProperties["imageCache"]; - renderScrollbars?: boolean; - renderSelection?: boolean; - renderGrid?: boolean; + renderGrid: boolean; /** when exporting the behavior is slightly different (e.g. we can't use - CSS filters), and we disable render optimizations for best output */ + CSS filters), and we disable render optimizations for best output */ isExporting: boolean; +}; + +export type InteractiveCanvasRenderConfig = { + // collab-related state + // --------------------------------------------------------------------------- + remoteSelectedElementIds: { [elementId: string]: string[] }; + remotePointerViewportCoords: { [id: string]: { x: number; y: number } }; + remotePointerUserStates: { [id: string]: string }; + remotePointerUsernames: { [id: string]: string }; + remotePointerButton?: { [id: string]: string | undefined }; selectionColor?: string; + // extra options passed to the renderer + // --------------------------------------------------------------------------- + renderScrollbars?: boolean; +}; + +export type RenderInteractiveSceneCallback = { + atLeastOneVisibleElement: boolean; + elements: readonly NonDeletedExcalidrawElement[]; + scrollBars?: ScrollBars; +}; + +export type StaticSceneRenderConfig = { + canvas: HTMLCanvasElement; + rc: RoughCanvas; + elements: readonly NonDeletedExcalidrawElement[]; + visibleElements: readonly NonDeletedExcalidrawElement[]; + scale: number; + appState: StaticCanvasAppState; + renderConfig: StaticCanvasRenderConfig; +}; + +export type InteractiveSceneRenderConfig = { + canvas: HTMLCanvasElement | null; + elements: readonly NonDeletedExcalidrawElement[]; + visibleElements: readonly NonDeletedExcalidrawElement[]; + selectedElements: readonly NonDeletedExcalidrawElement[]; + scale: number; + appState: InteractiveCanvasAppState; + renderConfig: InteractiveCanvasRenderConfig; + callback: (data: RenderInteractiveSceneCallback) => void; }; export type SceneScroll = { diff --git a/src/tests/__snapshots__/contextmenu.test.tsx.snap b/src/tests/__snapshots__/contextmenu.test.tsx.snap index 8ed2c308..608ab8ef 100644 --- a/src/tests/__snapshots__/contextmenu.test.tsx.snap +++ b/src/tests/__snapshots__/contextmenu.test.tsx.snap @@ -397,7 +397,7 @@ exports[`contextMenu element > right-clicking on a group should select whole gro "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, @@ -431,7 +431,7 @@ exports[`contextMenu element > right-clicking on a group should select whole gro "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, @@ -467,7 +467,7 @@ exports[`contextMenu element > right-clicking on a group should select whole gro exports[`contextMenu element > right-clicking on a group should select whole group > [end of test] number of elements 1`] = `2`; -exports[`contextMenu element > right-clicking on a group should select whole group > [end of test] number of renders 1`] = `7`; +exports[`contextMenu element > right-clicking on a group should select whole group > [end of test] number of renders 1`] = `4`; exports[`contextMenu element > selecting 'Add to library' in context menu adds element to library > [end of test] appState 1`] = ` { @@ -587,14 +587,14 @@ exports[`contextMenu element > selecting 'Add to library' in context menu adds e "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 449462985, + "versionNonce": 401146281, "width": 20, "x": -10, "y": 0, @@ -646,14 +646,14 @@ exports[`contextMenu element > selecting 'Add to library' in context menu adds e "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 449462985, + "versionNonce": 401146281, "width": 20, "x": -10, "y": 0, @@ -666,7 +666,7 @@ exports[`contextMenu element > selecting 'Add to library' in context menu adds e exports[`contextMenu element > selecting 'Add to library' in context menu adds element to library > [end of test] number of elements 1`] = `1`; -exports[`contextMenu element > selecting 'Add to library' in context menu adds element to library > [end of test] number of renders 1`] = `14`; +exports[`contextMenu element > selecting 'Add to library' in context menu adds element to library > [end of test] number of renders 1`] = `6`; exports[`contextMenu element > selecting 'Bring forward' in context menu brings element forward > [end of test] appState 1`] = ` { @@ -784,14 +784,14 @@ exports[`contextMenu element > selecting 'Bring forward' in context menu brings "roundness": { "type": 3, }, - "seed": 453191, + "seed": 1150084233, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 401146281, + "versionNonce": 1014066025, "width": 20, "x": 20, "y": 30, @@ -816,14 +816,14 @@ exports[`contextMenu element > selecting 'Bring forward' in context menu brings "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 2019559783, + "versionNonce": 400692809, "width": 20, "x": -10, "y": 0, @@ -875,14 +875,14 @@ exports[`contextMenu element > selecting 'Bring forward' in context menu brings "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 449462985, + "versionNonce": 401146281, "width": 20, "x": -10, "y": 0, @@ -918,14 +918,14 @@ exports[`contextMenu element > selecting 'Bring forward' in context menu brings "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 449462985, + "versionNonce": 401146281, "width": 20, "x": -10, "y": 0, @@ -947,14 +947,14 @@ exports[`contextMenu element > selecting 'Bring forward' in context menu brings "roundness": { "type": 3, }, - "seed": 453191, + "seed": 1150084233, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 401146281, + "versionNonce": 1014066025, "width": 20, "x": 20, "y": 30, @@ -990,14 +990,14 @@ exports[`contextMenu element > selecting 'Bring forward' in context menu brings "roundness": { "type": 3, }, - "seed": 453191, + "seed": 1150084233, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 401146281, + "versionNonce": 1014066025, "width": 20, "x": 20, "y": 30, @@ -1019,14 +1019,14 @@ exports[`contextMenu element > selecting 'Bring forward' in context menu brings "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 2019559783, + "versionNonce": 400692809, "width": 20, "x": -10, "y": 0, @@ -1039,7 +1039,7 @@ exports[`contextMenu element > selecting 'Bring forward' in context menu brings exports[`contextMenu element > selecting 'Bring forward' in context menu brings element forward > [end of test] number of elements 1`] = `2`; -exports[`contextMenu element > selecting 'Bring forward' in context menu brings element forward > [end of test] number of renders 1`] = `18`; +exports[`contextMenu element > selecting 'Bring forward' in context menu brings element forward > [end of test] number of renders 1`] = `10`; exports[`contextMenu element > selecting 'Bring to front' in context menu brings element to front > [end of test] appState 1`] = ` { @@ -1157,14 +1157,14 @@ exports[`contextMenu element > selecting 'Bring to front' in context menu brings "roundness": { "type": 3, }, - "seed": 453191, + "seed": 1150084233, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 401146281, + "versionNonce": 1014066025, "width": 20, "x": 20, "y": 30, @@ -1189,14 +1189,14 @@ exports[`contextMenu element > selecting 'Bring to front' in context menu brings "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 2019559783, + "versionNonce": 400692809, "width": 20, "x": -10, "y": 0, @@ -1248,14 +1248,14 @@ exports[`contextMenu element > selecting 'Bring to front' in context menu brings "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 449462985, + "versionNonce": 401146281, "width": 20, "x": -10, "y": 0, @@ -1291,14 +1291,14 @@ exports[`contextMenu element > selecting 'Bring to front' in context menu brings "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 449462985, + "versionNonce": 401146281, "width": 20, "x": -10, "y": 0, @@ -1320,14 +1320,14 @@ exports[`contextMenu element > selecting 'Bring to front' in context menu brings "roundness": { "type": 3, }, - "seed": 453191, + "seed": 1150084233, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 401146281, + "versionNonce": 1014066025, "width": 20, "x": 20, "y": 30, @@ -1363,14 +1363,14 @@ exports[`contextMenu element > selecting 'Bring to front' in context menu brings "roundness": { "type": 3, }, - "seed": 453191, + "seed": 1150084233, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 401146281, + "versionNonce": 1014066025, "width": 20, "x": 20, "y": 30, @@ -1392,14 +1392,14 @@ exports[`contextMenu element > selecting 'Bring to front' in context menu brings "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 2019559783, + "versionNonce": 400692809, "width": 20, "x": -10, "y": 0, @@ -1412,7 +1412,7 @@ exports[`contextMenu element > selecting 'Bring to front' in context menu brings exports[`contextMenu element > selecting 'Bring to front' in context menu brings element to front > [end of test] number of elements 1`] = `2`; -exports[`contextMenu element > selecting 'Bring to front' in context menu brings element to front > [end of test] number of renders 1`] = `18`; +exports[`contextMenu element > selecting 'Bring to front' in context menu brings element to front > [end of test] number of renders 1`] = `10`; exports[`contextMenu element > selecting 'Copy styles' in context menu copies styles > [end of test] appState 1`] = ` { @@ -1532,14 +1532,14 @@ exports[`contextMenu element > selecting 'Copy styles' in context menu copies st "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 453191, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 449462985, + "versionNonce": 2019559783, "width": 20, "x": -10, "y": 0, @@ -1591,14 +1591,14 @@ exports[`contextMenu element > selecting 'Copy styles' in context menu copies st "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 453191, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 449462985, + "versionNonce": 2019559783, "width": 20, "x": -10, "y": 0, @@ -1611,7 +1611,7 @@ exports[`contextMenu element > selecting 'Copy styles' in context menu copies st exports[`contextMenu element > selecting 'Copy styles' in context menu copies styles > [end of test] number of elements 1`] = `1`; -exports[`contextMenu element > selecting 'Copy styles' in context menu copies styles > [end of test] number of renders 1`] = `14`; +exports[`contextMenu element > selecting 'Copy styles' in context menu copies styles > [end of test] number of renders 1`] = `6`; exports[`contextMenu element > selecting 'Delete' in context menu deletes element > [end of test] appState 1`] = ` { @@ -1727,14 +1727,14 @@ exports[`contextMenu element > selecting 'Delete' in context menu deletes elemen "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 453191, + "versionNonce": 1150084233, "width": 20, "x": -10, "y": 0, @@ -1786,14 +1786,14 @@ exports[`contextMenu element > selecting 'Delete' in context menu deletes elemen "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 449462985, + "versionNonce": 401146281, "width": 20, "x": -10, "y": 0, @@ -1827,14 +1827,14 @@ exports[`contextMenu element > selecting 'Delete' in context menu deletes elemen "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 453191, + "versionNonce": 1150084233, "width": 20, "x": -10, "y": 0, @@ -1847,7 +1847,7 @@ exports[`contextMenu element > selecting 'Delete' in context menu deletes elemen exports[`contextMenu element > selecting 'Delete' in context menu deletes element > [end of test] number of elements 1`] = `1`; -exports[`contextMenu element > selecting 'Delete' in context menu deletes element > [end of test] number of renders 1`] = `14`; +exports[`contextMenu element > selecting 'Delete' in context menu deletes element > [end of test] number of renders 1`] = `7`; exports[`contextMenu element > selecting 'Duplicate' in context menu duplicates element > [end of test] appState 1`] = ` { @@ -1965,14 +1965,14 @@ exports[`contextMenu element > selecting 'Duplicate' in context menu duplicates "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 449462985, + "versionNonce": 401146281, "width": 20, "x": -10, "y": 0, @@ -1997,14 +1997,14 @@ exports[`contextMenu element > selecting 'Duplicate' in context menu duplicates "roundness": { "type": 3, }, - "seed": 453191, + "seed": 1150084233, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 449462985, + "versionNonce": 401146281, "width": 20, "x": 0, "y": 10, @@ -2056,14 +2056,14 @@ exports[`contextMenu element > selecting 'Duplicate' in context menu duplicates "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 449462985, + "versionNonce": 401146281, "width": 20, "x": -10, "y": 0, @@ -2099,14 +2099,14 @@ exports[`contextMenu element > selecting 'Duplicate' in context menu duplicates "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 449462985, + "versionNonce": 401146281, "width": 20, "x": -10, "y": 0, @@ -2128,14 +2128,14 @@ exports[`contextMenu element > selecting 'Duplicate' in context menu duplicates "roundness": { "type": 3, }, - "seed": 453191, + "seed": 1150084233, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 449462985, + "versionNonce": 401146281, "width": 20, "x": 0, "y": 10, @@ -2148,7 +2148,7 @@ exports[`contextMenu element > selecting 'Duplicate' in context menu duplicates exports[`contextMenu element > selecting 'Duplicate' in context menu duplicates element > [end of test] number of elements 1`] = `2`; -exports[`contextMenu element > selecting 'Duplicate' in context menu duplicates element > [end of test] number of renders 1`] = `14`; +exports[`contextMenu element > selecting 'Duplicate' in context menu duplicates element > [end of test] number of renders 1`] = `7`; exports[`contextMenu element > selecting 'Group selection' in context menu groups selected elements > [end of test] appState 1`] = ` { @@ -2273,14 +2273,14 @@ exports[`contextMenu element > selecting 'Group selection' in context menu group "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1150084233, + "versionNonce": 1604849351, "width": 20, "x": -10, "y": 0, @@ -2307,14 +2307,14 @@ exports[`contextMenu element > selecting 'Group selection' in context menu group "roundness": { "type": 3, }, - "seed": 453191, + "seed": 1150084233, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1116226695, + "versionNonce": 1505387817, "width": 20, "x": 20, "y": 30, @@ -2366,14 +2366,14 @@ exports[`contextMenu element > selecting 'Group selection' in context menu group "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 449462985, + "versionNonce": 401146281, "width": 20, "x": -10, "y": 0, @@ -2409,14 +2409,14 @@ exports[`contextMenu element > selecting 'Group selection' in context menu group "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 449462985, + "versionNonce": 401146281, "width": 20, "x": -10, "y": 0, @@ -2438,14 +2438,14 @@ exports[`contextMenu element > selecting 'Group selection' in context menu group "roundness": { "type": 3, }, - "seed": 453191, + "seed": 1150084233, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 401146281, + "versionNonce": 1014066025, "width": 20, "x": 20, "y": 30, @@ -2486,14 +2486,14 @@ exports[`contextMenu element > selecting 'Group selection' in context menu group "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1150084233, + "versionNonce": 1604849351, "width": 20, "x": -10, "y": 0, @@ -2517,14 +2517,14 @@ exports[`contextMenu element > selecting 'Group selection' in context menu group "roundness": { "type": 3, }, - "seed": 453191, + "seed": 1150084233, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1116226695, + "versionNonce": 1505387817, "width": 20, "x": 20, "y": 30, @@ -2537,7 +2537,7 @@ exports[`contextMenu element > selecting 'Group selection' in context menu group exports[`contextMenu element > selecting 'Group selection' in context menu groups selected elements > [end of test] number of elements 1`] = `2`; -exports[`contextMenu element > selecting 'Group selection' in context menu groups selected elements > [end of test] number of renders 1`] = `20`; +exports[`contextMenu element > selecting 'Group selection' in context menu groups selected elements > [end of test] number of renders 1`] = `10`; exports[`contextMenu element > selecting 'Paste styles' in context menu pastes styles > [end of test] appState 1`] = ` { @@ -2657,14 +2657,14 @@ exports[`contextMenu element > selecting 'Paste styles' in context menu pastes s "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 449462985, "strokeColor": "#e03131", "strokeStyle": "dotted", "strokeWidth": 2, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 23633383, + "versionNonce": 406373543, "width": 20, "x": -10, "y": 0, @@ -2689,14 +2689,14 @@ exports[`contextMenu element > selecting 'Paste styles' in context menu pastes s "roundness": { "type": 3, }, - "seed": 400692809, + "seed": 1006504105, "strokeColor": "#e03131", "strokeStyle": "dotted", "strokeWidth": 2, "type": "rectangle", "updated": 1, "version": 9, - "versionNonce": 1505387817, + "versionNonce": 1898319239, "width": 20, "x": 20, "y": 30, @@ -2748,79 +2748,7 @@ exports[`contextMenu element > selecting 'Paste styles' in context menu pastes s "roundness": { "type": 3, }, - "seed": 1278240551, - "strokeColor": "#1e1e1e", - "strokeStyle": "solid", - "strokeWidth": 1, - "type": "rectangle", - "updated": 1, - "version": 2, - "versionNonce": 449462985, - "width": 20, - "x": -10, - "y": 0, - }, - ], - }, - { - "appState": { - "editingGroupId": null, - "editingLinearElement": null, - "name": "Untitled-201933152653", - "selectedElementIds": { - "id1": true, - }, - "selectedGroupIds": {}, - "viewBackgroundColor": "#ffffff", - }, - "elements": [ - { - "angle": 0, - "backgroundColor": "transparent", - "boundElements": null, - "fillStyle": "hachure", - "frameId": null, - "groupIds": [], - "height": 20, - "id": "id0", - "isDeleted": false, - "link": null, - "locked": false, - "opacity": 100, - "roughness": 1, - "roundness": { - "type": 3, - }, - "seed": 1278240551, - "strokeColor": "#1e1e1e", - "strokeStyle": "solid", - "strokeWidth": 1, - "type": "rectangle", - "updated": 1, - "version": 2, - "versionNonce": 449462985, - "width": 20, - "x": -10, - "y": 0, - }, - { - "angle": 0, - "backgroundColor": "transparent", - "boundElements": null, - "fillStyle": "hachure", - "frameId": null, - "groupIds": [], - "height": 20, - "id": "id1", - "isDeleted": false, - "link": null, - "locked": false, - "opacity": 100, - "roughness": 1, - "roundness": { - "type": 3, - }, - "seed": 453191, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, @@ -2829,8 +2757,8 @@ exports[`contextMenu element > selecting 'Paste styles' in context menu pastes s "version": 2, "versionNonce": 401146281, "width": 20, - "x": 20, - "y": 30, + "x": -10, + "y": 0, }, ], }, @@ -2863,14 +2791,14 @@ exports[`contextMenu element > selecting 'Paste styles' in context menu pastes s "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 449462985, + "versionNonce": 401146281, "width": 20, "x": -10, "y": 0, @@ -2892,229 +2820,13 @@ exports[`contextMenu element > selecting 'Paste styles' in context menu pastes s "roundness": { "type": 3, }, - "seed": 453191, - "strokeColor": "#e03131", - "strokeStyle": "solid", - "strokeWidth": 1, - "type": "rectangle", - "updated": 1, - "version": 3, - "versionNonce": 2019559783, - "width": 20, - "x": 20, - "y": 30, - }, - ], - }, - { - "appState": { - "editingGroupId": null, - "editingLinearElement": null, - "name": "Untitled-201933152653", - "selectedElementIds": { - "id1": true, - }, - "selectedGroupIds": {}, - "viewBackgroundColor": "#ffffff", - }, - "elements": [ - { - "angle": 0, - "backgroundColor": "transparent", - "boundElements": null, - "fillStyle": "hachure", - "frameId": null, - "groupIds": [], - "height": 20, - "id": "id0", - "isDeleted": false, - "link": null, - "locked": false, - "opacity": 100, - "roughness": 1, - "roundness": { - "type": 3, - }, - "seed": 1278240551, + "seed": 1150084233, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 449462985, - "width": 20, - "x": -10, - "y": 0, - }, - { - "angle": 0, - "backgroundColor": "#a5d8ff", - "boundElements": null, - "fillStyle": "hachure", - "frameId": null, - "groupIds": [], - "height": 20, - "id": "id1", - "isDeleted": false, - "link": null, - "locked": false, - "opacity": 100, - "roughness": 1, - "roundness": { - "type": 3, - }, - "seed": 453191, - "strokeColor": "#e03131", - "strokeStyle": "solid", - "strokeWidth": 1, - "type": "rectangle", - "updated": 1, - "version": 4, - "versionNonce": 1150084233, - "width": 20, - "x": 20, - "y": 30, - }, - ], - }, - { - "appState": { - "editingGroupId": null, - "editingLinearElement": null, - "name": "Untitled-201933152653", - "selectedElementIds": { - "id1": true, - }, - "selectedGroupIds": {}, - "viewBackgroundColor": "#ffffff", - }, - "elements": [ - { - "angle": 0, - "backgroundColor": "transparent", - "boundElements": null, - "fillStyle": "hachure", - "frameId": null, - "groupIds": [], - "height": 20, - "id": "id0", - "isDeleted": false, - "link": null, - "locked": false, - "opacity": 100, - "roughness": 1, - "roundness": { - "type": 3, - }, - "seed": 1278240551, - "strokeColor": "#1e1e1e", - "strokeStyle": "solid", - "strokeWidth": 1, - "type": "rectangle", - "updated": 1, - "version": 2, - "versionNonce": 449462985, - "width": 20, - "x": -10, - "y": 0, - }, - { - "angle": 0, - "backgroundColor": "#a5d8ff", - "boundElements": null, - "fillStyle": "cross-hatch", - "frameId": null, - "groupIds": [], - "height": 20, - "id": "id1", - "isDeleted": false, - "link": null, - "locked": false, - "opacity": 100, - "roughness": 1, - "roundness": { - "type": 3, - }, - "seed": 453191, - "strokeColor": "#e03131", - "strokeStyle": "solid", - "strokeWidth": 1, - "type": "rectangle", - "updated": 1, - "version": 5, - "versionNonce": 1116226695, - "width": 20, - "x": 20, - "y": 30, - }, - ], - }, - { - "appState": { - "editingGroupId": null, - "editingLinearElement": null, - "name": "Untitled-201933152653", - "selectedElementIds": { - "id1": true, - }, - "selectedGroupIds": {}, - "viewBackgroundColor": "#ffffff", - }, - "elements": [ - { - "angle": 0, - "backgroundColor": "transparent", - "boundElements": null, - "fillStyle": "hachure", - "frameId": null, - "groupIds": [], - "height": 20, - "id": "id0", - "isDeleted": false, - "link": null, - "locked": false, - "opacity": 100, - "roughness": 1, - "roundness": { - "type": 3, - }, - "seed": 1278240551, - "strokeColor": "#1e1e1e", - "strokeStyle": "solid", - "strokeWidth": 1, - "type": "rectangle", - "updated": 1, - "version": 2, - "versionNonce": 449462985, - "width": 20, - "x": -10, - "y": 0, - }, - { - "angle": 0, - "backgroundColor": "#a5d8ff", - "boundElements": null, - "fillStyle": "cross-hatch", - "frameId": null, - "groupIds": [], - "height": 20, - "id": "id1", - "isDeleted": false, - "link": null, - "locked": false, - "opacity": 100, - "roughness": 1, - "roundness": { - "type": 3, - }, - "seed": 453191, - "strokeColor": "#e03131", - "strokeStyle": "solid", - "strokeWidth": 2, - "type": "rectangle", - "updated": 1, - "version": 6, "versionNonce": 1014066025, "width": 20, "x": 20, @@ -3151,23 +2863,23 @@ exports[`contextMenu element > selecting 'Paste styles' in context menu pastes s "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 449462985, + "versionNonce": 401146281, "width": 20, "x": -10, "y": 0, }, { "angle": 0, - "backgroundColor": "#a5d8ff", + "backgroundColor": "transparent", "boundElements": null, - "fillStyle": "cross-hatch", + "fillStyle": "hachure", "frameId": null, "groupIds": [], "height": 20, @@ -3180,14 +2892,14 @@ exports[`contextMenu element > selecting 'Paste styles' in context menu pastes s "roundness": { "type": 3, }, - "seed": 453191, + "seed": 1150084233, "strokeColor": "#e03131", - "strokeStyle": "dotted", - "strokeWidth": 2, + "strokeStyle": "solid", + "strokeWidth": 1, "type": "rectangle", "updated": 1, - "version": 7, - "versionNonce": 238820263, + "version": 3, + "versionNonce": 400692809, "width": 20, "x": 20, "y": 30, @@ -3223,14 +2935,302 @@ exports[`contextMenu element > selecting 'Paste styles' in context menu pastes s "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 449462985, + "versionNonce": 401146281, + "width": 20, + "x": -10, + "y": 0, + }, + { + "angle": 0, + "backgroundColor": "#a5d8ff", + "boundElements": null, + "fillStyle": "hachure", + "frameId": null, + "groupIds": [], + "height": 20, + "id": "id1", + "isDeleted": false, + "link": null, + "locked": false, + "opacity": 100, + "roughness": 1, + "roundness": { + "type": 3, + }, + "seed": 1150084233, + "strokeColor": "#e03131", + "strokeStyle": "solid", + "strokeWidth": 1, + "type": "rectangle", + "updated": 1, + "version": 4, + "versionNonce": 1505387817, + "width": 20, + "x": 20, + "y": 30, + }, + ], + }, + { + "appState": { + "editingGroupId": null, + "editingLinearElement": null, + "name": "Untitled-201933152653", + "selectedElementIds": { + "id1": true, + }, + "selectedGroupIds": {}, + "viewBackgroundColor": "#ffffff", + }, + "elements": [ + { + "angle": 0, + "backgroundColor": "transparent", + "boundElements": null, + "fillStyle": "hachure", + "frameId": null, + "groupIds": [], + "height": 20, + "id": "id0", + "isDeleted": false, + "link": null, + "locked": false, + "opacity": 100, + "roughness": 1, + "roundness": { + "type": 3, + }, + "seed": 449462985, + "strokeColor": "#1e1e1e", + "strokeStyle": "solid", + "strokeWidth": 1, + "type": "rectangle", + "updated": 1, + "version": 2, + "versionNonce": 401146281, + "width": 20, + "x": -10, + "y": 0, + }, + { + "angle": 0, + "backgroundColor": "#a5d8ff", + "boundElements": null, + "fillStyle": "cross-hatch", + "frameId": null, + "groupIds": [], + "height": 20, + "id": "id1", + "isDeleted": false, + "link": null, + "locked": false, + "opacity": 100, + "roughness": 1, + "roundness": { + "type": 3, + }, + "seed": 1150084233, + "strokeColor": "#e03131", + "strokeStyle": "solid", + "strokeWidth": 1, + "type": "rectangle", + "updated": 1, + "version": 5, + "versionNonce": 493213705, + "width": 20, + "x": 20, + "y": 30, + }, + ], + }, + { + "appState": { + "editingGroupId": null, + "editingLinearElement": null, + "name": "Untitled-201933152653", + "selectedElementIds": { + "id1": true, + }, + "selectedGroupIds": {}, + "viewBackgroundColor": "#ffffff", + }, + "elements": [ + { + "angle": 0, + "backgroundColor": "transparent", + "boundElements": null, + "fillStyle": "hachure", + "frameId": null, + "groupIds": [], + "height": 20, + "id": "id0", + "isDeleted": false, + "link": null, + "locked": false, + "opacity": 100, + "roughness": 1, + "roundness": { + "type": 3, + }, + "seed": 449462985, + "strokeColor": "#1e1e1e", + "strokeStyle": "solid", + "strokeWidth": 1, + "type": "rectangle", + "updated": 1, + "version": 2, + "versionNonce": 401146281, + "width": 20, + "x": -10, + "y": 0, + }, + { + "angle": 0, + "backgroundColor": "#a5d8ff", + "boundElements": null, + "fillStyle": "cross-hatch", + "frameId": null, + "groupIds": [], + "height": 20, + "id": "id1", + "isDeleted": false, + "link": null, + "locked": false, + "opacity": 100, + "roughness": 1, + "roundness": { + "type": 3, + }, + "seed": 1150084233, + "strokeColor": "#e03131", + "strokeStyle": "solid", + "strokeWidth": 2, + "type": "rectangle", + "updated": 1, + "version": 6, + "versionNonce": 81784553, + "width": 20, + "x": 20, + "y": 30, + }, + ], + }, + { + "appState": { + "editingGroupId": null, + "editingLinearElement": null, + "name": "Untitled-201933152653", + "selectedElementIds": { + "id1": true, + }, + "selectedGroupIds": {}, + "viewBackgroundColor": "#ffffff", + }, + "elements": [ + { + "angle": 0, + "backgroundColor": "transparent", + "boundElements": null, + "fillStyle": "hachure", + "frameId": null, + "groupIds": [], + "height": 20, + "id": "id0", + "isDeleted": false, + "link": null, + "locked": false, + "opacity": 100, + "roughness": 1, + "roundness": { + "type": 3, + }, + "seed": 449462985, + "strokeColor": "#1e1e1e", + "strokeStyle": "solid", + "strokeWidth": 1, + "type": "rectangle", + "updated": 1, + "version": 2, + "versionNonce": 401146281, + "width": 20, + "x": -10, + "y": 0, + }, + { + "angle": 0, + "backgroundColor": "#a5d8ff", + "boundElements": null, + "fillStyle": "cross-hatch", + "frameId": null, + "groupIds": [], + "height": 20, + "id": "id1", + "isDeleted": false, + "link": null, + "locked": false, + "opacity": 100, + "roughness": 1, + "roundness": { + "type": 3, + }, + "seed": 1150084233, + "strokeColor": "#e03131", + "strokeStyle": "dotted", + "strokeWidth": 2, + "type": "rectangle", + "updated": 1, + "version": 7, + "versionNonce": 1723083209, + "width": 20, + "x": 20, + "y": 30, + }, + ], + }, + { + "appState": { + "editingGroupId": null, + "editingLinearElement": null, + "name": "Untitled-201933152653", + "selectedElementIds": { + "id1": true, + }, + "selectedGroupIds": {}, + "viewBackgroundColor": "#ffffff", + }, + "elements": [ + { + "angle": 0, + "backgroundColor": "transparent", + "boundElements": null, + "fillStyle": "hachure", + "frameId": null, + "groupIds": [], + "height": 20, + "id": "id0", + "isDeleted": false, + "link": null, + "locked": false, + "opacity": 100, + "roughness": 1, + "roundness": { + "type": 3, + }, + "seed": 449462985, + "strokeColor": "#1e1e1e", + "strokeStyle": "solid", + "strokeWidth": 1, + "type": "rectangle", + "updated": 1, + "version": 2, + "versionNonce": 401146281, "width": 20, "x": -10, "y": 0, @@ -3252,14 +3252,14 @@ exports[`contextMenu element > selecting 'Paste styles' in context menu pastes s "roundness": { "type": 3, }, - "seed": 400692809, + "seed": 1006504105, "strokeColor": "#e03131", "strokeStyle": "dotted", "strokeWidth": 2, "type": "rectangle", "updated": 1, "version": 8, - "versionNonce": 1604849351, + "versionNonce": 289600103, "width": 20, "x": 20, "y": 30, @@ -3295,14 +3295,14 @@ exports[`contextMenu element > selecting 'Paste styles' in context menu pastes s "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 449462985, + "versionNonce": 401146281, "width": 20, "x": -10, "y": 0, @@ -3324,14 +3324,14 @@ exports[`contextMenu element > selecting 'Paste styles' in context menu pastes s "roundness": { "type": 3, }, - "seed": 400692809, + "seed": 1006504105, "strokeColor": "#e03131", "strokeStyle": "dotted", "strokeWidth": 2, "type": "rectangle", "updated": 1, "version": 9, - "versionNonce": 1505387817, + "versionNonce": 1898319239, "width": 20, "x": 20, "y": 30, @@ -3367,14 +3367,14 @@ exports[`contextMenu element > selecting 'Paste styles' in context menu pastes s "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 449462985, "strokeColor": "#e03131", "strokeStyle": "dotted", "strokeWidth": 2, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 23633383, + "versionNonce": 406373543, "width": 20, "x": -10, "y": 0, @@ -3396,14 +3396,14 @@ exports[`contextMenu element > selecting 'Paste styles' in context menu pastes s "roundness": { "type": 3, }, - "seed": 400692809, + "seed": 1006504105, "strokeColor": "#e03131", "strokeStyle": "dotted", "strokeWidth": 2, "type": "rectangle", "updated": 1, "version": 9, - "versionNonce": 1505387817, + "versionNonce": 1898319239, "width": 20, "x": 20, "y": 30, @@ -3416,7 +3416,7 @@ exports[`contextMenu element > selecting 'Paste styles' in context menu pastes s exports[`contextMenu element > selecting 'Paste styles' in context menu pastes styles > [end of test] number of elements 1`] = `2`; -exports[`contextMenu element > selecting 'Paste styles' in context menu pastes styles > [end of test] number of renders 1`] = `32`; +exports[`contextMenu element > selecting 'Paste styles' in context menu pastes styles > [end of test] number of renders 1`] = `17`; exports[`contextMenu element > selecting 'Send backward' in context menu sends element backward > [end of test] appState 1`] = ` { @@ -3534,14 +3534,14 @@ exports[`contextMenu element > selecting 'Send backward' in context menu sends e "roundness": { "type": 3, }, - "seed": 453191, + "seed": 1150084233, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 2019559783, + "versionNonce": 400692809, "width": 20, "x": 20, "y": 30, @@ -3566,14 +3566,14 @@ exports[`contextMenu element > selecting 'Send backward' in context menu sends e "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 449462985, + "versionNonce": 401146281, "width": 20, "x": -10, "y": 0, @@ -3625,79 +3625,7 @@ exports[`contextMenu element > selecting 'Send backward' in context menu sends e "roundness": { "type": 3, }, - "seed": 1278240551, - "strokeColor": "#1e1e1e", - "strokeStyle": "solid", - "strokeWidth": 1, - "type": "rectangle", - "updated": 1, - "version": 2, - "versionNonce": 449462985, - "width": 20, - "x": -10, - "y": 0, - }, - ], - }, - { - "appState": { - "editingGroupId": null, - "editingLinearElement": null, - "name": "Untitled-201933152653", - "selectedElementIds": { - "id1": true, - }, - "selectedGroupIds": {}, - "viewBackgroundColor": "#ffffff", - }, - "elements": [ - { - "angle": 0, - "backgroundColor": "transparent", - "boundElements": null, - "fillStyle": "hachure", - "frameId": null, - "groupIds": [], - "height": 20, - "id": "id0", - "isDeleted": false, - "link": null, - "locked": false, - "opacity": 100, - "roughness": 1, - "roundness": { - "type": 3, - }, - "seed": 1278240551, - "strokeColor": "#1e1e1e", - "strokeStyle": "solid", - "strokeWidth": 1, - "type": "rectangle", - "updated": 1, - "version": 2, - "versionNonce": 449462985, - "width": 20, - "x": -10, - "y": 0, - }, - { - "angle": 0, - "backgroundColor": "transparent", - "boundElements": null, - "fillStyle": "hachure", - "frameId": null, - "groupIds": [], - "height": 20, - "id": "id1", - "isDeleted": false, - "link": null, - "locked": false, - "opacity": 100, - "roughness": 1, - "roundness": { - "type": 3, - }, - "seed": 453191, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, @@ -3706,6 +3634,78 @@ exports[`contextMenu element > selecting 'Send backward' in context menu sends e "version": 2, "versionNonce": 401146281, "width": 20, + "x": -10, + "y": 0, + }, + ], + }, + { + "appState": { + "editingGroupId": null, + "editingLinearElement": null, + "name": "Untitled-201933152653", + "selectedElementIds": { + "id1": true, + }, + "selectedGroupIds": {}, + "viewBackgroundColor": "#ffffff", + }, + "elements": [ + { + "angle": 0, + "backgroundColor": "transparent", + "boundElements": null, + "fillStyle": "hachure", + "frameId": null, + "groupIds": [], + "height": 20, + "id": "id0", + "isDeleted": false, + "link": null, + "locked": false, + "opacity": 100, + "roughness": 1, + "roundness": { + "type": 3, + }, + "seed": 449462985, + "strokeColor": "#1e1e1e", + "strokeStyle": "solid", + "strokeWidth": 1, + "type": "rectangle", + "updated": 1, + "version": 2, + "versionNonce": 401146281, + "width": 20, + "x": -10, + "y": 0, + }, + { + "angle": 0, + "backgroundColor": "transparent", + "boundElements": null, + "fillStyle": "hachure", + "frameId": null, + "groupIds": [], + "height": 20, + "id": "id1", + "isDeleted": false, + "link": null, + "locked": false, + "opacity": 100, + "roughness": 1, + "roundness": { + "type": 3, + }, + "seed": 1150084233, + "strokeColor": "#1e1e1e", + "strokeStyle": "solid", + "strokeWidth": 1, + "type": "rectangle", + "updated": 1, + "version": 2, + "versionNonce": 1014066025, + "width": 20, "x": 20, "y": 30, }, @@ -3740,14 +3740,14 @@ exports[`contextMenu element > selecting 'Send backward' in context menu sends e "roundness": { "type": 3, }, - "seed": 453191, + "seed": 1150084233, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 2019559783, + "versionNonce": 400692809, "width": 20, "x": 20, "y": 30, @@ -3769,14 +3769,14 @@ exports[`contextMenu element > selecting 'Send backward' in context menu sends e "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 449462985, + "versionNonce": 401146281, "width": 20, "x": -10, "y": 0, @@ -3789,7 +3789,7 @@ exports[`contextMenu element > selecting 'Send backward' in context menu sends e exports[`contextMenu element > selecting 'Send backward' in context menu sends element backward > [end of test] number of elements 1`] = `2`; -exports[`contextMenu element > selecting 'Send backward' in context menu sends element backward > [end of test] number of renders 1`] = `18`; +exports[`contextMenu element > selecting 'Send backward' in context menu sends element backward > [end of test] number of renders 1`] = `10`; exports[`contextMenu element > selecting 'Send to back' in context menu sends element to back > [end of test] appState 1`] = ` { @@ -3907,14 +3907,14 @@ exports[`contextMenu element > selecting 'Send to back' in context menu sends el "roundness": { "type": 3, }, - "seed": 453191, + "seed": 1150084233, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 2019559783, + "versionNonce": 400692809, "width": 20, "x": 20, "y": 30, @@ -3939,14 +3939,14 @@ exports[`contextMenu element > selecting 'Send to back' in context menu sends el "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 449462985, + "versionNonce": 401146281, "width": 20, "x": -10, "y": 0, @@ -3998,79 +3998,7 @@ exports[`contextMenu element > selecting 'Send to back' in context menu sends el "roundness": { "type": 3, }, - "seed": 1278240551, - "strokeColor": "#1e1e1e", - "strokeStyle": "solid", - "strokeWidth": 1, - "type": "rectangle", - "updated": 1, - "version": 2, - "versionNonce": 449462985, - "width": 20, - "x": -10, - "y": 0, - }, - ], - }, - { - "appState": { - "editingGroupId": null, - "editingLinearElement": null, - "name": "Untitled-201933152653", - "selectedElementIds": { - "id1": true, - }, - "selectedGroupIds": {}, - "viewBackgroundColor": "#ffffff", - }, - "elements": [ - { - "angle": 0, - "backgroundColor": "transparent", - "boundElements": null, - "fillStyle": "hachure", - "frameId": null, - "groupIds": [], - "height": 20, - "id": "id0", - "isDeleted": false, - "link": null, - "locked": false, - "opacity": 100, - "roughness": 1, - "roundness": { - "type": 3, - }, - "seed": 1278240551, - "strokeColor": "#1e1e1e", - "strokeStyle": "solid", - "strokeWidth": 1, - "type": "rectangle", - "updated": 1, - "version": 2, - "versionNonce": 449462985, - "width": 20, - "x": -10, - "y": 0, - }, - { - "angle": 0, - "backgroundColor": "transparent", - "boundElements": null, - "fillStyle": "hachure", - "frameId": null, - "groupIds": [], - "height": 20, - "id": "id1", - "isDeleted": false, - "link": null, - "locked": false, - "opacity": 100, - "roughness": 1, - "roundness": { - "type": 3, - }, - "seed": 453191, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, @@ -4079,6 +4007,78 @@ exports[`contextMenu element > selecting 'Send to back' in context menu sends el "version": 2, "versionNonce": 401146281, "width": 20, + "x": -10, + "y": 0, + }, + ], + }, + { + "appState": { + "editingGroupId": null, + "editingLinearElement": null, + "name": "Untitled-201933152653", + "selectedElementIds": { + "id1": true, + }, + "selectedGroupIds": {}, + "viewBackgroundColor": "#ffffff", + }, + "elements": [ + { + "angle": 0, + "backgroundColor": "transparent", + "boundElements": null, + "fillStyle": "hachure", + "frameId": null, + "groupIds": [], + "height": 20, + "id": "id0", + "isDeleted": false, + "link": null, + "locked": false, + "opacity": 100, + "roughness": 1, + "roundness": { + "type": 3, + }, + "seed": 449462985, + "strokeColor": "#1e1e1e", + "strokeStyle": "solid", + "strokeWidth": 1, + "type": "rectangle", + "updated": 1, + "version": 2, + "versionNonce": 401146281, + "width": 20, + "x": -10, + "y": 0, + }, + { + "angle": 0, + "backgroundColor": "transparent", + "boundElements": null, + "fillStyle": "hachure", + "frameId": null, + "groupIds": [], + "height": 20, + "id": "id1", + "isDeleted": false, + "link": null, + "locked": false, + "opacity": 100, + "roughness": 1, + "roundness": { + "type": 3, + }, + "seed": 1150084233, + "strokeColor": "#1e1e1e", + "strokeStyle": "solid", + "strokeWidth": 1, + "type": "rectangle", + "updated": 1, + "version": 2, + "versionNonce": 1014066025, + "width": 20, "x": 20, "y": 30, }, @@ -4113,14 +4113,14 @@ exports[`contextMenu element > selecting 'Send to back' in context menu sends el "roundness": { "type": 3, }, - "seed": 453191, + "seed": 1150084233, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 2019559783, + "versionNonce": 400692809, "width": 20, "x": 20, "y": 30, @@ -4142,14 +4142,14 @@ exports[`contextMenu element > selecting 'Send to back' in context menu sends el "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 449462985, + "versionNonce": 401146281, "width": 20, "x": -10, "y": 0, @@ -4162,7 +4162,7 @@ exports[`contextMenu element > selecting 'Send to back' in context menu sends el exports[`contextMenu element > selecting 'Send to back' in context menu sends element to back > [end of test] number of elements 1`] = `2`; -exports[`contextMenu element > selecting 'Send to back' in context menu sends element to back > [end of test] number of renders 1`] = `18`; +exports[`contextMenu element > selecting 'Send to back' in context menu sends element to back > [end of test] number of renders 1`] = `10`; exports[`contextMenu element > selecting 'Ungroup selection' in context menu ungroups selected group > [end of test] appState 1`] = ` { @@ -4283,14 +4283,14 @@ exports[`contextMenu element > selecting 'Ungroup selection' in context menu ung "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 453191, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 4, - "versionNonce": 1014066025, + "versionNonce": 915032327, "width": 20, "x": -10, "y": 0, @@ -4315,14 +4315,14 @@ exports[`contextMenu element > selecting 'Ungroup selection' in context menu ung "roundness": { "type": 3, }, - "seed": 453191, + "seed": 1116226695, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 4, - "versionNonce": 238820263, + "versionNonce": 81784553, "width": 20, "x": 20, "y": 30, @@ -4374,14 +4374,14 @@ exports[`contextMenu element > selecting 'Ungroup selection' in context menu ung "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 453191, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 449462985, + "versionNonce": 2019559783, "width": 20, "x": -10, "y": 0, @@ -4417,14 +4417,14 @@ exports[`contextMenu element > selecting 'Ungroup selection' in context menu ung "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 453191, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 449462985, + "versionNonce": 2019559783, "width": 20, "x": -10, "y": 0, @@ -4446,14 +4446,14 @@ exports[`contextMenu element > selecting 'Ungroup selection' in context menu ung "roundness": { "type": 3, }, - "seed": 453191, + "seed": 1116226695, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 401146281, + "versionNonce": 238820263, "width": 20, "x": 20, "y": 30, @@ -4494,14 +4494,14 @@ exports[`contextMenu element > selecting 'Ungroup selection' in context menu ung "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 453191, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1150084233, + "versionNonce": 1505387817, "width": 20, "x": -10, "y": 0, @@ -4525,14 +4525,14 @@ exports[`contextMenu element > selecting 'Ungroup selection' in context menu ung "roundness": { "type": 3, }, - "seed": 453191, + "seed": 1116226695, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1116226695, + "versionNonce": 23633383, "width": 20, "x": 20, "y": 30, @@ -4569,14 +4569,14 @@ exports[`contextMenu element > selecting 'Ungroup selection' in context menu ung "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 453191, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 4, - "versionNonce": 1014066025, + "versionNonce": 915032327, "width": 20, "x": -10, "y": 0, @@ -4598,14 +4598,14 @@ exports[`contextMenu element > selecting 'Ungroup selection' in context menu ung "roundness": { "type": 3, }, - "seed": 453191, + "seed": 1116226695, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 4, - "versionNonce": 238820263, + "versionNonce": 81784553, "width": 20, "x": 20, "y": 30, @@ -4618,7 +4618,7 @@ exports[`contextMenu element > selecting 'Ungroup selection' in context menu ung exports[`contextMenu element > selecting 'Ungroup selection' in context menu ungroups selected group > [end of test] number of elements 1`] = `2`; -exports[`contextMenu element > selecting 'Ungroup selection' in context menu ungroups selected group > [end of test] number of renders 1`] = `21`; +exports[`contextMenu element > selecting 'Ungroup selection' in context menu ungroups selected group > [end of test] number of renders 1`] = `11`; exports[`contextMenu element > shows 'Group selection' in context menu for multiple selected elements > [end of test] appState 1`] = ` { @@ -5015,14 +5015,14 @@ exports[`contextMenu element > shows 'Group selection' in context menu for multi "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 449462985, + "versionNonce": 401146281, "width": 10, "x": -10, "y": 0, @@ -5047,14 +5047,14 @@ exports[`contextMenu element > shows 'Group selection' in context menu for multi "roundness": { "type": 3, }, - "seed": 453191, + "seed": 1150084233, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 401146281, + "versionNonce": 1014066025, "width": 10, "x": 10, "y": 0, @@ -5106,14 +5106,14 @@ exports[`contextMenu element > shows 'Group selection' in context menu for multi "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 449462985, + "versionNonce": 401146281, "width": 10, "x": -10, "y": 0, @@ -5149,14 +5149,14 @@ exports[`contextMenu element > shows 'Group selection' in context menu for multi "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 449462985, + "versionNonce": 401146281, "width": 10, "x": -10, "y": 0, @@ -5178,14 +5178,14 @@ exports[`contextMenu element > shows 'Group selection' in context menu for multi "roundness": { "type": 3, }, - "seed": 453191, + "seed": 1150084233, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 401146281, + "versionNonce": 1014066025, "width": 10, "x": 10, "y": 0, @@ -5198,7 +5198,7 @@ exports[`contextMenu element > shows 'Group selection' in context menu for multi exports[`contextMenu element > shows 'Group selection' in context menu for multiple selected elements > [end of test] number of elements 1`] = `2`; -exports[`contextMenu element > shows 'Group selection' in context menu for multiple selected elements > [end of test] number of renders 1`] = `20`; +exports[`contextMenu element > shows 'Group selection' in context menu for multiple selected elements > [end of test] number of renders 1`] = `9`; exports[`contextMenu element > shows 'Ungroup selection' in context menu for group inside selected elements > [end of test] appState 1`] = ` { @@ -5599,14 +5599,14 @@ exports[`contextMenu element > shows 'Ungroup selection' in context menu for gro "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 453191, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1116226695, + "versionNonce": 23633383, "width": 10, "x": -10, "y": 0, @@ -5633,14 +5633,14 @@ exports[`contextMenu element > shows 'Ungroup selection' in context menu for gro "roundness": { "type": 3, }, - "seed": 453191, + "seed": 1116226695, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1014066025, + "versionNonce": 493213705, "width": 10, "x": 10, "y": 0, @@ -5692,14 +5692,14 @@ exports[`contextMenu element > shows 'Ungroup selection' in context menu for gro "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 453191, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 449462985, + "versionNonce": 2019559783, "width": 10, "x": -10, "y": 0, @@ -5735,14 +5735,14 @@ exports[`contextMenu element > shows 'Ungroup selection' in context menu for gro "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 453191, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 449462985, + "versionNonce": 2019559783, "width": 10, "x": -10, "y": 0, @@ -5764,14 +5764,14 @@ exports[`contextMenu element > shows 'Ungroup selection' in context menu for gro "roundness": { "type": 3, }, - "seed": 453191, + "seed": 1116226695, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 401146281, + "versionNonce": 238820263, "width": 10, "x": 10, "y": 0, @@ -5812,14 +5812,14 @@ exports[`contextMenu element > shows 'Ungroup selection' in context menu for gro "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 453191, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1116226695, + "versionNonce": 23633383, "width": 10, "x": -10, "y": 0, @@ -5843,14 +5843,14 @@ exports[`contextMenu element > shows 'Ungroup selection' in context menu for gro "roundness": { "type": 3, }, - "seed": 453191, + "seed": 1116226695, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1014066025, + "versionNonce": 493213705, "width": 10, "x": 10, "y": 0, @@ -5863,7 +5863,7 @@ exports[`contextMenu element > shows 'Ungroup selection' in context menu for gro exports[`contextMenu element > shows 'Ungroup selection' in context menu for group inside selected elements > [end of test] number of elements 1`] = `2`; -exports[`contextMenu element > shows 'Ungroup selection' in context menu for group inside selected elements > [end of test] number of renders 1`] = `21`; +exports[`contextMenu element > shows 'Ungroup selection' in context menu for group inside selected elements > [end of test] number of renders 1`] = `10`; exports[`contextMenu element > shows context menu for canvas > [end of test] appState 1`] = ` { @@ -6098,7 +6098,7 @@ exports[`contextMenu element > shows context menu for canvas > [end of test] his exports[`contextMenu element > shows context menu for canvas > [end of test] number of elements 1`] = `0`; -exports[`contextMenu element > shows context menu for canvas > [end of test] number of renders 1`] = `6`; +exports[`contextMenu element > shows context menu for canvas > [end of test] number of renders 1`] = `3`; exports[`contextMenu element > shows context menu for element > [end of test] appState 1`] = ` { @@ -6866,14 +6866,14 @@ exports[`contextMenu element > shows context menu for element > [end of test] el "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 449462985, + "versionNonce": 401146281, "width": 20, "x": -10, "y": 0, @@ -6898,7 +6898,7 @@ exports[`contextMenu element > shows context menu for element > [end of test] el "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, @@ -6930,7 +6930,7 @@ exports[`contextMenu element > shows context menu for element > [end of test] el "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, @@ -6989,14 +6989,14 @@ exports[`contextMenu element > shows context menu for element > [end of test] hi "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 449462985, + "versionNonce": 401146281, "width": 20, "x": -10, "y": 0, @@ -7031,6 +7031,6 @@ exports[`contextMenu element > shows context menu for element > [end of test] nu exports[`contextMenu element > shows context menu for element > [end of test] number of elements 2`] = `2`; -exports[`contextMenu element > shows context menu for element > [end of test] number of renders 1`] = `12`; +exports[`contextMenu element > shows context menu for element > [end of test] number of renders 1`] = `6`; -exports[`contextMenu element > shows context menu for element > [end of test] number of renders 2`] = `11`; +exports[`contextMenu element > shows context menu for element > [end of test] number of renders 2`] = `4`; diff --git a/src/tests/__snapshots__/dragCreate.test.tsx.snap b/src/tests/__snapshots__/dragCreate.test.tsx.snap index 3f527ded..34c994da 100644 --- a/src/tests/__snapshots__/dragCreate.test.tsx.snap +++ b/src/tests/__snapshots__/dragCreate.test.tsx.snap @@ -33,7 +33,7 @@ exports[`Test dragCreate > add element to the scene when pointer dragging long e "roundness": { "type": 2, }, - "seed": 337897, + "seed": 1278240551, "startArrowhead": null, "startBinding": null, "strokeColor": "#1e1e1e", @@ -42,7 +42,7 @@ exports[`Test dragCreate > add element to the scene when pointer dragging long e "type": "arrow", "updated": 1, "version": 3, - "versionNonce": 449462985, + "versionNonce": 401146281, "width": 30, "x": 30, "y": 20, @@ -69,14 +69,14 @@ exports[`Test dragCreate > add element to the scene when pointer dragging long e "roundness": { "type": 2, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "diamond", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 30, "x": 30, "y": 20, @@ -103,14 +103,14 @@ exports[`Test dragCreate > add element to the scene when pointer dragging long e "roundness": { "type": 2, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "ellipse", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 30, "x": 30, "y": 20, @@ -148,7 +148,7 @@ exports[`Test dragCreate > add element to the scene when pointer dragging long e "roundness": { "type": 2, }, - "seed": 337897, + "seed": 1278240551, "startArrowhead": null, "startBinding": null, "strokeColor": "#1e1e1e", @@ -157,7 +157,7 @@ exports[`Test dragCreate > add element to the scene when pointer dragging long e "type": "line", "updated": 1, "version": 3, - "versionNonce": 449462985, + "versionNonce": 401146281, "width": 30, "x": 30, "y": 20, @@ -184,14 +184,14 @@ exports[`Test dragCreate > add element to the scene when pointer dragging long e "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 30, "x": 30, "y": 20, diff --git a/src/tests/__snapshots__/linearElementEditor.test.tsx.snap b/src/tests/__snapshots__/linearElementEditor.test.tsx.snap index 190f4b92..41e9f2b1 100644 --- a/src/tests/__snapshots__/linearElementEditor.test.tsx.snap +++ b/src/tests/__snapshots__/linearElementEditor.test.tsx.snap @@ -5,7 +5,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: 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: -7.5px; font: Emoji 20px 20px; line-height: 1.25; font-family: Virgil, 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: 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: Virgil, Segoe UI Emoji;" tabindex="0" wrap="off" /> diff --git a/src/tests/__snapshots__/move.test.tsx.snap b/src/tests/__snapshots__/move.test.tsx.snap index e7b73d67..092074ba 100644 --- a/src/tests/__snapshots__/move.test.tsx.snap +++ b/src/tests/__snapshots__/move.test.tsx.snap @@ -18,14 +18,14 @@ exports[`duplicate element on move when ALT is clicked > rectangle 1`] = ` "roundness": { "type": 3, }, - "seed": 401146281, + "seed": 1014066025, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 4, - "versionNonce": 2019559783, + "versionNonce": 238820263, "width": 30, "x": 30, "y": 20, @@ -50,14 +50,14 @@ exports[`duplicate element on move when ALT is clicked > rectangle 2`] = ` "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 4, - "versionNonce": 1150084233, + "versionNonce": 1604849351, "width": 30, "x": -10, "y": 60, @@ -82,14 +82,14 @@ exports[`move element > rectangle 1`] = ` "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 453191, + "versionNonce": 1150084233, "width": 30, "x": 0, "y": 40, @@ -119,14 +119,14 @@ exports[`move element > rectangles with binding arrow 1`] = ` "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1014066025, + "versionNonce": 81784553, "width": 100, "x": 0, "y": 0, @@ -156,14 +156,14 @@ exports[`move element > rectangles with binding arrow 2`] = ` "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 6, - "versionNonce": 1723083209, + "versionNonce": 927333447, "width": 300, "x": 201, "y": 2, @@ -205,7 +205,7 @@ exports[`move element > rectangles with binding arrow 3`] = ` "roundness": { "type": 2, }, - "seed": 401146281, + "seed": 238820263, "startArrowhead": null, "startBinding": { "elementId": "id0", @@ -218,7 +218,7 @@ exports[`move element > rectangles with binding arrow 3`] = ` "type": "line", "updated": 1, "version": 11, - "versionNonce": 1006504105, + "versionNonce": 1051383431, "width": 81, "x": 110, "y": 49.981789081137734, diff --git a/src/tests/__snapshots__/multiPointCreate.test.tsx.snap b/src/tests/__snapshots__/multiPointCreate.test.tsx.snap index 27a6647f..1f488b4d 100644 --- a/src/tests/__snapshots__/multiPointCreate.test.tsx.snap +++ b/src/tests/__snapshots__/multiPointCreate.test.tsx.snap @@ -38,7 +38,7 @@ exports[`multi point mode in linear elements > arrow 1`] = ` "roundness": { "type": 2, }, - "seed": 337897, + "seed": 1278240551, "startArrowhead": null, "startBinding": null, "strokeColor": "#1e1e1e", @@ -47,7 +47,7 @@ exports[`multi point mode in linear elements > arrow 1`] = ` "type": "arrow", "updated": 1, "version": 7, - "versionNonce": 1150084233, + "versionNonce": 1505387817, "width": 70, "x": 30, "y": 30, @@ -92,7 +92,7 @@ exports[`multi point mode in linear elements > line 1`] = ` "roundness": { "type": 2, }, - "seed": 337897, + "seed": 1278240551, "startArrowhead": null, "startBinding": null, "strokeColor": "#1e1e1e", @@ -101,7 +101,7 @@ exports[`multi point mode in linear elements > line 1`] = ` "type": "line", "updated": 1, "version": 7, - "versionNonce": 1150084233, + "versionNonce": 1505387817, "width": 70, "x": 30, "y": 30, diff --git a/src/tests/__snapshots__/regressionTests.test.tsx.snap b/src/tests/__snapshots__/regressionTests.test.tsx.snap index 8c8dd713..a1a76204 100644 --- a/src/tests/__snapshots__/regressionTests.test.tsx.snap +++ b/src/tests/__snapshots__/regressionTests.test.tsx.snap @@ -150,14 +150,14 @@ exports[`given element A and group of elements B and given both are selected whe "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 0, "y": 0, @@ -193,14 +193,14 @@ exports[`given element A and group of elements B and given both are selected whe "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 0, "y": 0, @@ -222,14 +222,14 @@ exports[`given element A and group of elements B and given both are selected whe "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 10, "x": 0, "y": 30, @@ -265,14 +265,14 @@ exports[`given element A and group of elements B and given both are selected whe "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 0, "y": 0, @@ -294,14 +294,14 @@ exports[`given element A and group of elements B and given both are selected whe "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 10, "x": 0, "y": 30, @@ -323,14 +323,14 @@ exports[`given element A and group of elements B and given both are selected whe "roundness": { "type": 3, }, - "seed": 401146281, + "seed": 238820263, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 2019559783, + "versionNonce": 1604849351, "width": 10, "x": 0, "y": 60, @@ -369,14 +369,14 @@ exports[`given element A and group of elements B and given both are selected whe "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 10, "x": 0, "y": 30, @@ -400,14 +400,14 @@ exports[`given element A and group of elements B and given both are selected whe "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1014066025, + "versionNonce": 915032327, "width": 10, "x": 0, "y": 0, @@ -431,14 +431,14 @@ exports[`given element A and group of elements B and given both are selected whe "roundness": { "type": 3, }, - "seed": 401146281, + "seed": 238820263, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 238820263, + "versionNonce": 81784553, "width": 10, "x": 0, "y": 60, @@ -451,7 +451,7 @@ exports[`given element A and group of elements B and given both are selected whe exports[`given element A and group of elements B and given both are selected when user clicks on B, on pointer up only elements from B should be selected > [end of test] number of elements 1`] = `0`; -exports[`given element A and group of elements B and given both are selected when user clicks on B, on pointer up only elements from B should be selected > [end of test] number of renders 1`] = `28`; +exports[`given element A and group of elements B and given both are selected when user clicks on B, on pointer up only elements from B should be selected > [end of test] number of renders 1`] = `14`; exports[`given element A and group of elements B and given both are selected when user shift-clicks on B, on pointer up only element A should be selected > [end of test] appState 1`] = ` { @@ -605,14 +605,14 @@ exports[`given element A and group of elements B and given both are selected whe "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 100, "x": 0, "y": 0, @@ -648,14 +648,14 @@ exports[`given element A and group of elements B and given both are selected whe "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 100, "x": 0, "y": 0, @@ -677,14 +677,14 @@ exports[`given element A and group of elements B and given both are selected whe "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 100, "x": 110, "y": 110, @@ -720,14 +720,14 @@ exports[`given element A and group of elements B and given both are selected whe "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 100, "x": 0, "y": 0, @@ -749,14 +749,14 @@ exports[`given element A and group of elements B and given both are selected whe "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 100, "x": 110, "y": 110, @@ -778,14 +778,14 @@ exports[`given element A and group of elements B and given both are selected whe "roundness": { "type": 3, }, - "seed": 401146281, + "seed": 238820263, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 2019559783, + "versionNonce": 1604849351, "width": 100, "x": 220, "y": 220, @@ -824,14 +824,14 @@ exports[`given element A and group of elements B and given both are selected whe "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 100, "x": 110, "y": 110, @@ -855,14 +855,14 @@ exports[`given element A and group of elements B and given both are selected whe "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1116226695, + "versionNonce": 493213705, "width": 100, "x": 0, "y": 0, @@ -886,14 +886,14 @@ exports[`given element A and group of elements B and given both are selected whe "roundness": { "type": 3, }, - "seed": 401146281, + "seed": 238820263, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1014066025, + "versionNonce": 915032327, "width": 100, "x": 220, "y": 220, @@ -906,7 +906,7 @@ exports[`given element A and group of elements B and given both are selected whe exports[`given element A and group of elements B and given both are selected when user shift-clicks on B, on pointer up only element A should be selected > [end of test] number of elements 1`] = `0`; -exports[`given element A and group of elements B and given both are selected when user shift-clicks on B, on pointer up only element A should be selected > [end of test] number of renders 1`] = `24`; +exports[`given element A and group of elements B and given both are selected when user shift-clicks on B, on pointer up only element A should be selected > [end of test] number of renders 1`] = `14`; exports[`regression tests > Cmd/Ctrl-click exclusively select element under pointer > [end of test] appState 1`] = ` { @@ -1051,14 +1051,14 @@ exports[`regression tests > Cmd/Ctrl-click exclusively select element under poin "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 0, "y": 0, @@ -1094,14 +1094,14 @@ exports[`regression tests > Cmd/Ctrl-click exclusively select element under poin "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 0, "y": 0, @@ -1123,14 +1123,14 @@ exports[`regression tests > Cmd/Ctrl-click exclusively select element under poin "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 10, "x": 30, "y": 0, @@ -1171,14 +1171,14 @@ exports[`regression tests > Cmd/Ctrl-click exclusively select element under poin "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1150084233, + "versionNonce": 1604849351, "width": 10, "x": 0, "y": 0, @@ -1202,14 +1202,14 @@ exports[`regression tests > Cmd/Ctrl-click exclusively select element under poin "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1116226695, + "versionNonce": 1505387817, "width": 10, "x": 30, "y": 0, @@ -1247,14 +1247,14 @@ exports[`regression tests > Cmd/Ctrl-click exclusively select element under poin "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1150084233, + "versionNonce": 1604849351, "width": 10, "x": 0, "y": 0, @@ -1278,14 +1278,14 @@ exports[`regression tests > Cmd/Ctrl-click exclusively select element under poin "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1116226695, + "versionNonce": 1505387817, "width": 10, "x": 30, "y": 0, @@ -1323,14 +1323,14 @@ exports[`regression tests > Cmd/Ctrl-click exclusively select element under poin "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1150084233, + "versionNonce": 1604849351, "width": 10, "x": 0, "y": 0, @@ -1354,14 +1354,14 @@ exports[`regression tests > Cmd/Ctrl-click exclusively select element under poin "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1116226695, + "versionNonce": 1505387817, "width": 10, "x": 30, "y": 0, @@ -1383,14 +1383,14 @@ exports[`regression tests > Cmd/Ctrl-click exclusively select element under poin "roundness": { "type": 3, }, - "seed": 400692809, + "seed": 81784553, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1604849351, + "versionNonce": 1723083209, "width": 10, "x": 60, "y": 0, @@ -1433,14 +1433,14 @@ exports[`regression tests > Cmd/Ctrl-click exclusively select element under poin "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 4, - "versionNonce": 493213705, + "versionNonce": 1315507081, "width": 10, "x": 0, "y": 0, @@ -1465,14 +1465,14 @@ exports[`regression tests > Cmd/Ctrl-click exclusively select element under poin "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 4, - "versionNonce": 915032327, + "versionNonce": 1898319239, "width": 10, "x": 30, "y": 0, @@ -1496,14 +1496,14 @@ exports[`regression tests > Cmd/Ctrl-click exclusively select element under poin "roundness": { "type": 3, }, - "seed": 400692809, + "seed": 81784553, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 81784553, + "versionNonce": 640725609, "width": 10, "x": 60, "y": 0, @@ -1542,14 +1542,14 @@ exports[`regression tests > Cmd/Ctrl-click exclusively select element under poin "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 4, - "versionNonce": 493213705, + "versionNonce": 1315507081, "width": 10, "x": 0, "y": 0, @@ -1574,14 +1574,14 @@ exports[`regression tests > Cmd/Ctrl-click exclusively select element under poin "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 4, - "versionNonce": 915032327, + "versionNonce": 1898319239, "width": 10, "x": 30, "y": 0, @@ -1605,14 +1605,14 @@ exports[`regression tests > Cmd/Ctrl-click exclusively select element under poin "roundness": { "type": 3, }, - "seed": 400692809, + "seed": 81784553, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 81784553, + "versionNonce": 640725609, "width": 10, "x": 60, "y": 0, @@ -1651,14 +1651,14 @@ exports[`regression tests > Cmd/Ctrl-click exclusively select element under poin "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 4, - "versionNonce": 493213705, + "versionNonce": 1315507081, "width": 10, "x": 0, "y": 0, @@ -1683,14 +1683,14 @@ exports[`regression tests > Cmd/Ctrl-click exclusively select element under poin "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 4, - "versionNonce": 915032327, + "versionNonce": 1898319239, "width": 10, "x": 30, "y": 0, @@ -1714,14 +1714,14 @@ exports[`regression tests > Cmd/Ctrl-click exclusively select element under poin "roundness": { "type": 3, }, - "seed": 400692809, + "seed": 81784553, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 81784553, + "versionNonce": 640725609, "width": 10, "x": 60, "y": 0, @@ -1734,7 +1734,7 @@ exports[`regression tests > Cmd/Ctrl-click exclusively select element under poin exports[`regression tests > Cmd/Ctrl-click exclusively select element under pointer > [end of test] number of elements 1`] = `0`; -exports[`regression tests > Cmd/Ctrl-click exclusively select element under pointer > [end of test] number of renders 1`] = `43`; +exports[`regression tests > Cmd/Ctrl-click exclusively select element under pointer > [end of test] number of renders 1`] = `15`; exports[`regression tests > Drags selected element when hitting only bounding box and keeps element selected > [end of test] appState 1`] = ` { @@ -1881,14 +1881,14 @@ exports[`regression tests > Drags selected element when hitting only bounding bo "roundness": { "type": 2, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "ellipse", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 0, "y": 0, @@ -1924,14 +1924,14 @@ exports[`regression tests > Drags selected element when hitting only bounding bo "roundness": { "type": 2, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "ellipse", "updated": 1, "version": 3, - "versionNonce": 453191, + "versionNonce": 1150084233, "width": 10, "x": 25, "y": 25, @@ -1944,7 +1944,7 @@ exports[`regression tests > Drags selected element when hitting only bounding bo exports[`regression tests > Drags selected element when hitting only bounding box and keeps element selected > [end of test] number of elements 1`] = `0`; -exports[`regression tests > Drags selected element when hitting only bounding box and keeps element selected > [end of test] number of renders 1`] = `12`; +exports[`regression tests > Drags selected element when hitting only bounding box and keeps element selected > [end of test] number of renders 1`] = `9`; exports[`regression tests > adjusts z order when grouping > [end of test] appState 1`] = ` { @@ -2094,14 +2094,14 @@ exports[`regression tests > adjusts z order when grouping > [end of test] histor "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 10, "y": 10, @@ -2137,14 +2137,14 @@ exports[`regression tests > adjusts z order when grouping > [end of test] histor "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 10, "y": 10, @@ -2166,14 +2166,14 @@ exports[`regression tests > adjusts z order when grouping > [end of test] histor "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 10, "x": 30, "y": 10, @@ -2209,14 +2209,14 @@ exports[`regression tests > adjusts z order when grouping > [end of test] histor "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 10, "y": 10, @@ -2238,14 +2238,14 @@ exports[`regression tests > adjusts z order when grouping > [end of test] histor "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 10, "x": 30, "y": 10, @@ -2267,14 +2267,14 @@ exports[`regression tests > adjusts z order when grouping > [end of test] histor "roundness": { "type": 3, }, - "seed": 401146281, + "seed": 238820263, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 2019559783, + "versionNonce": 1604849351, "width": 10, "x": 50, "y": 10, @@ -2313,14 +2313,14 @@ exports[`regression tests > adjusts z order when grouping > [end of test] histor "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 10, "x": 30, "y": 10, @@ -2344,14 +2344,14 @@ exports[`regression tests > adjusts z order when grouping > [end of test] histor "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1014066025, + "versionNonce": 915032327, "width": 10, "x": 10, "y": 10, @@ -2375,14 +2375,14 @@ exports[`regression tests > adjusts z order when grouping > [end of test] histor "roundness": { "type": 3, }, - "seed": 401146281, + "seed": 238820263, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 238820263, + "versionNonce": 81784553, "width": 10, "x": 50, "y": 10, @@ -2395,7 +2395,7 @@ exports[`regression tests > adjusts z order when grouping > [end of test] histor exports[`regression tests > adjusts z order when grouping > [end of test] number of elements 1`] = `0`; -exports[`regression tests > adjusts z order when grouping > [end of test] number of renders 1`] = `22`; +exports[`regression tests > adjusts z order when grouping > [end of test] number of renders 1`] = `14`; exports[`regression tests > alt-drag duplicates an element > [end of test] appState 1`] = ` { @@ -2542,14 +2542,14 @@ exports[`regression tests > alt-drag duplicates an element > [end of test] histo "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 10, "y": 10, @@ -2585,14 +2585,14 @@ exports[`regression tests > alt-drag duplicates an element > [end of test] histo "roundness": { "type": 3, }, - "seed": 401146281, + "seed": 1014066025, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 4, - "versionNonce": 2019559783, + "versionNonce": 238820263, "width": 10, "x": 10, "y": 10, @@ -2614,14 +2614,14 @@ exports[`regression tests > alt-drag duplicates an element > [end of test] histo "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 453191, + "versionNonce": 1150084233, "width": 10, "x": 20, "y": 20, @@ -2634,7 +2634,7 @@ exports[`regression tests > alt-drag duplicates an element > [end of test] histo exports[`regression tests > alt-drag duplicates an element > [end of test] number of elements 1`] = `0`; -exports[`regression tests > alt-drag duplicates an element > [end of test] number of renders 1`] = `12`; +exports[`regression tests > alt-drag duplicates an element > [end of test] number of renders 1`] = `9`; exports[`regression tests > arrow keys > [end of test] appState 1`] = ` { @@ -2779,14 +2779,14 @@ exports[`regression tests > arrow keys > [end of test] history 1`] = ` "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 10, "y": 10, @@ -2799,7 +2799,7 @@ exports[`regression tests > arrow keys > [end of test] history 1`] = ` exports[`regression tests > arrow keys > [end of test] number of elements 1`] = `0`; -exports[`regression tests > arrow keys > [end of test] number of renders 1`] = `21`; +exports[`regression tests > arrow keys > [end of test] number of renders 1`] = `13`; exports[`regression tests > can drag element that covers another element, while another elem is selected > [end of test] appState 1`] = ` { @@ -2946,14 +2946,14 @@ exports[`regression tests > can drag element that covers another element, while "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 200, "x": 100, "y": 100, @@ -2989,14 +2989,14 @@ exports[`regression tests > can drag element that covers another element, while "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 200, "x": 100, "y": 100, @@ -3018,14 +3018,14 @@ exports[`regression tests > can drag element that covers another element, while "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 200, "x": 100, "y": 100, @@ -3061,14 +3061,14 @@ exports[`regression tests > can drag element that covers another element, while "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 200, "x": 100, "y": 100, @@ -3090,14 +3090,14 @@ exports[`regression tests > can drag element that covers another element, while "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 200, "x": 100, "y": 100, @@ -3119,14 +3119,14 @@ exports[`regression tests > can drag element that covers another element, while "roundness": { "type": 2, }, - "seed": 401146281, + "seed": 238820263, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "ellipse", "updated": 1, "version": 2, - "versionNonce": 2019559783, + "versionNonce": 1604849351, "width": 350, "x": 300, "y": 300, @@ -3162,14 +3162,14 @@ exports[`regression tests > can drag element that covers another element, while "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 200, "x": 100, "y": 100, @@ -3191,14 +3191,14 @@ exports[`regression tests > can drag element that covers another element, while "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1116226695, + "versionNonce": 493213705, "width": 200, "x": 300, "y": 300, @@ -3220,14 +3220,14 @@ exports[`regression tests > can drag element that covers another element, while "roundness": { "type": 2, }, - "seed": 401146281, + "seed": 238820263, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "ellipse", "updated": 1, "version": 2, - "versionNonce": 2019559783, + "versionNonce": 1604849351, "width": 350, "x": 300, "y": 300, @@ -3240,7 +3240,7 @@ exports[`regression tests > can drag element that covers another element, while exports[`regression tests > can drag element that covers another element, while another elem is selected > [end of test] number of elements 1`] = `0`; -exports[`regression tests > can drag element that covers another element, while another elem is selected > [end of test] number of renders 1`] = `20`; +exports[`regression tests > can drag element that covers another element, while another elem is selected > [end of test] number of renders 1`] = `15`; exports[`regression tests > change the properties of a shape > [end of test] appState 1`] = ` { @@ -3385,14 +3385,14 @@ exports[`regression tests > change the properties of a shape > [end of test] his "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 10, "y": 10, @@ -3428,14 +3428,14 @@ exports[`regression tests > change the properties of a shape > [end of test] his "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 449462985, + "versionNonce": 2019559783, "width": 10, "x": 10, "y": 10, @@ -3471,14 +3471,14 @@ exports[`regression tests > change the properties of a shape > [end of test] his "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 4, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 10, "x": 10, "y": 10, @@ -3514,14 +3514,14 @@ exports[`regression tests > change the properties of a shape > [end of test] his "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1971c2", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 5, - "versionNonce": 401146281, + "versionNonce": 238820263, "width": 10, "x": 10, "y": 10, @@ -3534,7 +3534,7 @@ exports[`regression tests > change the properties of a shape > [end of test] his exports[`regression tests > change the properties of a shape > [end of test] number of elements 1`] = `0`; -exports[`regression tests > change the properties of a shape > [end of test] number of renders 1`] = `14`; +exports[`regression tests > change the properties of a shape > [end of test] number of renders 1`] = `10`; exports[`regression tests > click on an element and drag it > [dragged] appState 1`] = ` { @@ -3654,14 +3654,14 @@ exports[`regression tests > click on an element and drag it > [dragged] element "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 453191, + "versionNonce": 1150084233, "width": 10, "x": 20, "y": 20, @@ -3713,14 +3713,14 @@ exports[`regression tests > click on an element and drag it > [dragged] history "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 10, "y": 10, @@ -3756,14 +3756,14 @@ exports[`regression tests > click on an element and drag it > [dragged] history "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 453191, + "versionNonce": 1150084233, "width": 10, "x": 20, "y": 20, @@ -3776,7 +3776,7 @@ exports[`regression tests > click on an element and drag it > [dragged] history exports[`regression tests > click on an element and drag it > [dragged] number of elements 1`] = `1`; -exports[`regression tests > click on an element and drag it > [dragged] number of renders 1`] = `12`; +exports[`regression tests > click on an element and drag it > [dragged] number of renders 1`] = `9`; exports[`regression tests > click on an element and drag it > [end of test] appState 1`] = ` { @@ -3923,14 +3923,14 @@ exports[`regression tests > click on an element and drag it > [end of test] hist "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 10, "y": 10, @@ -3966,14 +3966,14 @@ exports[`regression tests > click on an element and drag it > [end of test] hist "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 453191, + "versionNonce": 1150084233, "width": 10, "x": 20, "y": 20, @@ -4009,14 +4009,14 @@ exports[`regression tests > click on an element and drag it > [end of test] hist "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 4, - "versionNonce": 2019559783, + "versionNonce": 400692809, "width": 10, "x": 10, "y": 10, @@ -4029,7 +4029,7 @@ exports[`regression tests > click on an element and drag it > [end of test] hist exports[`regression tests > click on an element and drag it > [end of test] number of elements 1`] = `0`; -exports[`regression tests > click on an element and drag it > [end of test] number of renders 1`] = `15`; +exports[`regression tests > click on an element and drag it > [end of test] number of renders 1`] = `11`; exports[`regression tests > click to select a shape > [end of test] appState 1`] = ` { @@ -4176,14 +4176,14 @@ exports[`regression tests > click to select a shape > [end of test] history 1`] "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 10, "y": 10, @@ -4219,14 +4219,14 @@ exports[`regression tests > click to select a shape > [end of test] history 1`] "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 10, "y": 10, @@ -4248,14 +4248,14 @@ exports[`regression tests > click to select a shape > [end of test] history 1`] "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 10, "x": 30, "y": 10, @@ -4268,7 +4268,7 @@ exports[`regression tests > click to select a shape > [end of test] history 1`] exports[`regression tests > click to select a shape > [end of test] number of elements 1`] = `0`; -exports[`regression tests > click to select a shape > [end of test] number of renders 1`] = `15`; +exports[`regression tests > click to select a shape > [end of test] number of renders 1`] = `10`; exports[`regression tests > click-drag to select a group > [end of test] appState 1`] = ` { @@ -4416,14 +4416,14 @@ exports[`regression tests > click-drag to select a group > [end of test] history "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 10, "y": 10, @@ -4459,14 +4459,14 @@ exports[`regression tests > click-drag to select a group > [end of test] history "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 10, "y": 10, @@ -4488,14 +4488,14 @@ exports[`regression tests > click-drag to select a group > [end of test] history "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 10, "x": 30, "y": 10, @@ -4531,14 +4531,14 @@ exports[`regression tests > click-drag to select a group > [end of test] history "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 10, "y": 10, @@ -4560,14 +4560,14 @@ exports[`regression tests > click-drag to select a group > [end of test] history "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 10, "x": 30, "y": 10, @@ -4589,14 +4589,14 @@ exports[`regression tests > click-drag to select a group > [end of test] history "roundness": { "type": 3, }, - "seed": 401146281, + "seed": 238820263, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 2019559783, + "versionNonce": 1604849351, "width": 10, "x": 50, "y": 10, @@ -4609,7 +4609,479 @@ exports[`regression tests > click-drag to select a group > [end of test] history exports[`regression tests > click-drag to select a group > [end of test] number of elements 1`] = `0`; -exports[`regression tests > click-drag to select a group > [end of test] number of renders 1`] = `21`; +exports[`regression tests > click-drag to select a group > [end of test] number of renders 1`] = `13`; + +exports[`regression tests > deleting last but one element in editing group should unselect the group > [end of test] appState 1`] = ` +{ + "activeEmbeddable": null, + "activeTool": { + "customType": null, + "lastActiveTool": null, + "locked": false, + "type": "selection", + }, + "collaborators": Map {}, + "contextMenu": null, + "currentChartType": "bar", + "currentItemBackgroundColor": "transparent", + "currentItemEndArrowhead": "arrow", + "currentItemFillStyle": "hachure", + "currentItemFontFamily": 1, + "currentItemFontSize": 20, + "currentItemOpacity": 100, + "currentItemRoughness": 1, + "currentItemRoundness": "round", + "currentItemStartArrowhead": null, + "currentItemStrokeColor": "#1e1e1e", + "currentItemStrokeStyle": "solid", + "currentItemStrokeWidth": 1, + "currentItemTextAlign": "left", + "cursorButton": "up", + "defaultSidebarDockedPreference": false, + "draggingElement": null, + "editingElement": null, + "editingFrame": null, + "editingGroupId": null, + "editingLinearElement": null, + "elementsToHighlight": null, + "errorMessage": null, + "exportBackground": true, + "exportEmbedScene": false, + "exportScale": 1, + "exportWithDarkMode": false, + "fileHandle": null, + "frameRendering": { + "clip": true, + "enabled": true, + "name": true, + "outline": true, + }, + "frameToHighlight": null, + "gridSize": null, + "height": 768, + "isBindingEnabled": true, + "isLoading": false, + "isResizing": false, + "isRotating": false, + "lastPointerDownWith": "mouse", + "multiElement": null, + "name": "Untitled-201933152653", + "offsetLeft": 0, + "offsetTop": 0, + "openDialog": null, + "openMenu": null, + "openPopup": null, + "openSidebar": null, + "pasteDialog": { + "data": null, + "shown": false, + }, + "penDetected": false, + "penMode": false, + "pendingImageElementId": null, + "previousSelectedElementIds": {}, + "resizingElement": null, + "scrollX": 0, + "scrollY": 0, + "scrolledOutside": false, + "selectedElementIds": { + "id1": true, + }, + "selectedElementsAreBeingDragged": false, + "selectedGroupIds": { + "id4": false, + }, + "selectedLinearElement": null, + "selectionElement": null, + "shouldCacheIgnoreZoom": false, + "showHyperlinkPopup": false, + "showStats": false, + "showWelcomeScreen": true, + "startBoundElement": null, + "suggestedBindings": [], + "theme": "light", + "toast": null, + "viewBackgroundColor": "#ffffff", + "viewModeEnabled": false, + "width": 1024, + "zenModeEnabled": false, + "zoom": { + "value": 1, + }, +} +`; + +exports[`regression tests > deleting last but one element in editing group should unselect the group > [end of test] history 1`] = ` +{ + "recording": false, + "redoStack": [], + "stateHistory": [ + { + "appState": { + "editingGroupId": null, + "editingLinearElement": null, + "name": "Untitled-201933152653", + "selectedElementIds": {}, + "selectedGroupIds": {}, + "viewBackgroundColor": "#ffffff", + }, + "elements": [], + }, + { + "appState": { + "editingGroupId": null, + "editingLinearElement": null, + "name": "Untitled-201933152653", + "selectedElementIds": { + "id0": true, + }, + "selectedGroupIds": {}, + "viewBackgroundColor": "#ffffff", + }, + "elements": [ + { + "angle": 0, + "backgroundColor": "transparent", + "boundElements": null, + "fillStyle": "hachure", + "frameId": null, + "groupIds": [], + "height": 10, + "id": "id0", + "isDeleted": false, + "link": null, + "locked": false, + "opacity": 100, + "roughness": 1, + "roundness": { + "type": 3, + }, + "seed": 1278240551, + "strokeColor": "#1e1e1e", + "strokeStyle": "solid", + "strokeWidth": 1, + "type": "rectangle", + "updated": 1, + "version": 2, + "versionNonce": 453191, + "width": 10, + "x": 10, + "y": 0, + }, + ], + }, + { + "appState": { + "editingGroupId": null, + "editingLinearElement": null, + "name": "Untitled-201933152653", + "selectedElementIds": { + "id1": true, + }, + "selectedGroupIds": {}, + "viewBackgroundColor": "#ffffff", + }, + "elements": [ + { + "angle": 0, + "backgroundColor": "transparent", + "boundElements": null, + "fillStyle": "hachure", + "frameId": null, + "groupIds": [], + "height": 10, + "id": "id0", + "isDeleted": false, + "link": null, + "locked": false, + "opacity": 100, + "roughness": 1, + "roundness": { + "type": 3, + }, + "seed": 1278240551, + "strokeColor": "#1e1e1e", + "strokeStyle": "solid", + "strokeWidth": 1, + "type": "rectangle", + "updated": 1, + "version": 2, + "versionNonce": 453191, + "width": 10, + "x": 10, + "y": 0, + }, + { + "angle": 0, + "backgroundColor": "transparent", + "boundElements": null, + "fillStyle": "hachure", + "frameId": null, + "groupIds": [], + "height": 10, + "id": "id1", + "isDeleted": false, + "link": null, + "locked": false, + "opacity": 100, + "roughness": 1, + "roundness": { + "type": 3, + }, + "seed": 2019559783, + "strokeColor": "#1e1e1e", + "strokeStyle": "solid", + "strokeWidth": 1, + "type": "rectangle", + "updated": 1, + "version": 2, + "versionNonce": 1116226695, + "width": 10, + "x": 50, + "y": 0, + }, + ], + }, + { + "appState": { + "editingGroupId": null, + "editingLinearElement": null, + "name": "Untitled-201933152653", + "selectedElementIds": { + "id0": true, + "id1": true, + }, + "selectedGroupIds": { + "id4": true, + }, + "viewBackgroundColor": "#ffffff", + }, + "elements": [ + { + "angle": 0, + "backgroundColor": "transparent", + "boundElements": null, + "fillStyle": "hachure", + "frameId": null, + "groupIds": [ + "id4", + ], + "height": 10, + "id": "id0", + "isDeleted": false, + "link": null, + "locked": false, + "opacity": 100, + "roughness": 1, + "roundness": { + "type": 3, + }, + "seed": 1278240551, + "strokeColor": "#1e1e1e", + "strokeStyle": "solid", + "strokeWidth": 1, + "type": "rectangle", + "updated": 1, + "version": 3, + "versionNonce": 1604849351, + "width": 10, + "x": 10, + "y": 0, + }, + { + "angle": 0, + "backgroundColor": "transparent", + "boundElements": null, + "fillStyle": "hachure", + "frameId": null, + "groupIds": [ + "id4", + ], + "height": 10, + "id": "id1", + "isDeleted": false, + "link": null, + "locked": false, + "opacity": 100, + "roughness": 1, + "roundness": { + "type": 3, + }, + "seed": 2019559783, + "strokeColor": "#1e1e1e", + "strokeStyle": "solid", + "strokeWidth": 1, + "type": "rectangle", + "updated": 1, + "version": 3, + "versionNonce": 1505387817, + "width": 10, + "x": 50, + "y": 0, + }, + ], + }, + { + "appState": { + "editingGroupId": "id4", + "editingLinearElement": null, + "name": "Untitled-201933152653", + "selectedElementIds": { + "id1": true, + }, + "selectedGroupIds": {}, + "viewBackgroundColor": "#ffffff", + }, + "elements": [ + { + "angle": 0, + "backgroundColor": "transparent", + "boundElements": null, + "fillStyle": "hachure", + "frameId": null, + "groupIds": [ + "id4", + ], + "height": 10, + "id": "id0", + "isDeleted": true, + "link": null, + "locked": false, + "opacity": 100, + "roughness": 1, + "roundness": { + "type": 3, + }, + "seed": 1278240551, + "strokeColor": "#1e1e1e", + "strokeStyle": "solid", + "strokeWidth": 1, + "type": "rectangle", + "updated": 1, + "version": 4, + "versionNonce": 493213705, + "width": 10, + "x": 10, + "y": 0, + }, + { + "angle": 0, + "backgroundColor": "transparent", + "boundElements": null, + "fillStyle": "hachure", + "frameId": null, + "groupIds": [ + "id4", + ], + "height": 10, + "id": "id1", + "isDeleted": false, + "link": null, + "locked": false, + "opacity": 100, + "roughness": 1, + "roundness": { + "type": 3, + }, + "seed": 2019559783, + "strokeColor": "#1e1e1e", + "strokeStyle": "solid", + "strokeWidth": 1, + "type": "rectangle", + "updated": 1, + "version": 3, + "versionNonce": 1505387817, + "width": 10, + "x": 50, + "y": 0, + }, + ], + }, + { + "appState": { + "editingGroupId": null, + "editingLinearElement": null, + "name": "Untitled-201933152653", + "selectedElementIds": { + "id1": true, + }, + "selectedGroupIds": { + "id4": false, + }, + "viewBackgroundColor": "#ffffff", + }, + "elements": [ + { + "angle": 0, + "backgroundColor": "transparent", + "boundElements": null, + "fillStyle": "hachure", + "frameId": null, + "groupIds": [ + "id4", + ], + "height": 10, + "id": "id0", + "isDeleted": true, + "link": null, + "locked": false, + "opacity": 100, + "roughness": 1, + "roundness": { + "type": 3, + }, + "seed": 1278240551, + "strokeColor": "#1e1e1e", + "strokeStyle": "solid", + "strokeWidth": 1, + "type": "rectangle", + "updated": 1, + "version": 4, + "versionNonce": 493213705, + "width": 10, + "x": 10, + "y": 0, + }, + { + "angle": 0, + "backgroundColor": "transparent", + "boundElements": null, + "fillStyle": "hachure", + "frameId": null, + "groupIds": [ + "id4", + ], + "height": 10, + "id": "id1", + "isDeleted": false, + "link": null, + "locked": false, + "opacity": 100, + "roughness": 1, + "roundness": { + "type": 3, + }, + "seed": 2019559783, + "strokeColor": "#1e1e1e", + "strokeStyle": "solid", + "strokeWidth": 1, + "type": "rectangle", + "updated": 1, + "version": 3, + "versionNonce": 1505387817, + "width": 10, + "x": 50, + "y": 0, + }, + ], + }, + ], +} +`; + +exports[`regression tests > deleting last but one element in editing group should unselect the group > [end of test] number of elements 1`] = `0`; + +exports[`regression tests > deleting last but one element in editing group should unselect the group > [end of test] number of renders 1`] = `12`; exports[`regression tests > deselects group of selected elements on pointer down when pointer doesn't hit any element > [end of test] appState 1`] = ` { @@ -4655,7 +5127,7 @@ exports[`regression tests > deselects group of selected elements on pointer down "roundness": { "type": 2, }, - "seed": 2019559783, + "seed": 400692809, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, @@ -4736,7 +5208,7 @@ exports[`regression tests > deselects group of selected elements on pointer down "roundness": { "type": 2, }, - "seed": 2019559783, + "seed": 400692809, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, @@ -4811,14 +5283,14 @@ exports[`regression tests > deselects group of selected elements on pointer down "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 0, "y": 0, @@ -4854,14 +5326,14 @@ exports[`regression tests > deselects group of selected elements on pointer down "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 0, "y": 0, @@ -4883,14 +5355,14 @@ exports[`regression tests > deselects group of selected elements on pointer down "roundness": { "type": 2, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "ellipse", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 10, "x": 110, "y": 110, @@ -4903,7 +5375,7 @@ exports[`regression tests > deselects group of selected elements on pointer down exports[`regression tests > deselects group of selected elements on pointer down when pointer doesn't hit any element > [end of test] number of elements 1`] = `0`; -exports[`regression tests > deselects group of selected elements on pointer down when pointer doesn't hit any element > [end of test] number of renders 1`] = `16`; +exports[`regression tests > deselects group of selected elements on pointer down when pointer doesn't hit any element > [end of test] number of renders 1`] = `10`; exports[`regression tests > deselects group of selected elements on pointer up when pointer hits common bounding box without hitting any element > [end of test] appState 1`] = ` { @@ -4949,7 +5421,7 @@ exports[`regression tests > deselects group of selected elements on pointer up w "roundness": { "type": 2, }, - "seed": 2019559783, + "seed": 400692809, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, @@ -5077,14 +5549,14 @@ exports[`regression tests > deselects group of selected elements on pointer up w "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 0, "y": 0, @@ -5120,14 +5592,14 @@ exports[`regression tests > deselects group of selected elements on pointer up w "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 0, "y": 0, @@ -5149,14 +5621,14 @@ exports[`regression tests > deselects group of selected elements on pointer up w "roundness": { "type": 2, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "ellipse", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 10, "x": 110, "y": 110, @@ -5169,7 +5641,7 @@ exports[`regression tests > deselects group of selected elements on pointer up w exports[`regression tests > deselects group of selected elements on pointer up when pointer hits common bounding box without hitting any element > [end of test] number of elements 1`] = `0`; -exports[`regression tests > deselects group of selected elements on pointer up when pointer hits common bounding box without hitting any element > [end of test] number of renders 1`] = `17`; +exports[`regression tests > deselects group of selected elements on pointer up when pointer hits common bounding box without hitting any element > [end of test] number of renders 1`] = `10`; exports[`regression tests > deselects selected element on pointer down when pointer doesn't hit any element > [end of test] appState 1`] = ` { @@ -5215,7 +5687,7 @@ exports[`regression tests > deselects selected element on pointer down when poin "roundness": { "type": 2, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, @@ -5295,7 +5767,7 @@ exports[`regression tests > deselects selected element on pointer down when poin "roundness": { "type": 2, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, @@ -5370,14 +5842,14 @@ exports[`regression tests > deselects selected element on pointer down when poin "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 0, "y": 0, @@ -5390,7 +5862,7 @@ exports[`regression tests > deselects selected element on pointer down when poin exports[`regression tests > deselects selected element on pointer down when pointer doesn't hit any element > [end of test] number of elements 1`] = `0`; -exports[`regression tests > deselects selected element on pointer down when pointer doesn't hit any element > [end of test] number of renders 1`] = `10`; +exports[`regression tests > deselects selected element on pointer down when pointer doesn't hit any element > [end of test] number of renders 1`] = `7`; exports[`regression tests > deselects selected element, on pointer up, when click hits element bounding box but doesn't hit the element > [end of test] appState 1`] = ` { @@ -5535,14 +6007,14 @@ exports[`regression tests > deselects selected element, on pointer up, when clic "roundness": { "type": 2, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "ellipse", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 100, "x": 0, "y": 0, @@ -5555,7 +6027,7 @@ exports[`regression tests > deselects selected element, on pointer up, when clic exports[`regression tests > deselects selected element, on pointer up, when click hits element bounding box but doesn't hit the element > [end of test] number of elements 1`] = `0`; -exports[`regression tests > deselects selected element, on pointer up, when click hits element bounding box but doesn't hit the element > [end of test] number of renders 1`] = `11`; +exports[`regression tests > deselects selected element, on pointer up, when click hits element bounding box but doesn't hit the element > [end of test] number of renders 1`] = `7`; exports[`regression tests > double click to edit a group > [end of test] appState 1`] = ` { @@ -5700,14 +6172,14 @@ exports[`regression tests > double click to edit a group > [end of test] history "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 10, "y": 10, @@ -5743,14 +6215,14 @@ exports[`regression tests > double click to edit a group > [end of test] history "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 10, "y": 10, @@ -5772,14 +6244,14 @@ exports[`regression tests > double click to edit a group > [end of test] history "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 10, "x": 30, "y": 10, @@ -5815,14 +6287,14 @@ exports[`regression tests > double click to edit a group > [end of test] history "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 10, "y": 10, @@ -5844,14 +6316,14 @@ exports[`regression tests > double click to edit a group > [end of test] history "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 10, "x": 30, "y": 10, @@ -5873,14 +6345,14 @@ exports[`regression tests > double click to edit a group > [end of test] history "roundness": { "type": 3, }, - "seed": 401146281, + "seed": 238820263, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 2019559783, + "versionNonce": 1604849351, "width": 10, "x": 50, "y": 10, @@ -5922,14 +6394,14 @@ exports[`regression tests > double click to edit a group > [end of test] history "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1150084233, + "versionNonce": 23633383, "width": 10, "x": 10, "y": 10, @@ -5953,14 +6425,14 @@ exports[`regression tests > double click to edit a group > [end of test] history "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1116226695, + "versionNonce": 493213705, "width": 10, "x": 30, "y": 10, @@ -5984,14 +6456,14 @@ exports[`regression tests > double click to edit a group > [end of test] history "roundness": { "type": 3, }, - "seed": 401146281, + "seed": 238820263, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1014066025, + "versionNonce": 915032327, "width": 10, "x": 50, "y": 10, @@ -6004,7 +6476,7 @@ exports[`regression tests > double click to edit a group > [end of test] history exports[`regression tests > double click to edit a group > [end of test] number of elements 1`] = `0`; -exports[`regression tests > double click to edit a group > [end of test] number of renders 1`] = `20`; +exports[`regression tests > double click to edit a group > [end of test] number of renders 1`] = `14`; exports[`regression tests > drags selected elements from point inside common bounding box that doesn't hit any element and keeps elements selected after dragging > [end of test] appState 1`] = ` { @@ -6153,14 +6625,14 @@ exports[`regression tests > drags selected elements from point inside common bou "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 0, "y": 0, @@ -6196,14 +6668,14 @@ exports[`regression tests > drags selected elements from point inside common bou "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 0, "y": 0, @@ -6225,14 +6697,14 @@ exports[`regression tests > drags selected elements from point inside common bou "roundness": { "type": 2, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "ellipse", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 10, "x": 110, "y": 110, @@ -6269,14 +6741,14 @@ exports[`regression tests > drags selected elements from point inside common bou "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1150084233, + "versionNonce": 1604849351, "width": 10, "x": 25, "y": 25, @@ -6298,14 +6770,14 @@ exports[`regression tests > drags selected elements from point inside common bou "roundness": { "type": 2, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "ellipse", "updated": 1, "version": 3, - "versionNonce": 1116226695, + "versionNonce": 23633383, "width": 10, "x": 135, "y": 135, @@ -6318,7 +6790,7 @@ exports[`regression tests > drags selected elements from point inside common bou exports[`regression tests > drags selected elements from point inside common bounding box that doesn't hit any element and keeps elements selected after dragging > [end of test] number of elements 1`] = `0`; -exports[`regression tests > drags selected elements from point inside common bounding box that doesn't hit any element and keeps elements selected after dragging > [end of test] number of renders 1`] = `18`; +exports[`regression tests > drags selected elements from point inside common bounding box that doesn't hit any element and keeps elements selected after dragging > [end of test] number of renders 1`] = `12`; exports[`regression tests > draw every type of shape > [end of test] appState 1`] = ` { @@ -6461,14 +6933,14 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 20, "x": 10, "y": -10, @@ -6504,14 +6976,14 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 20, "x": 10, "y": -10, @@ -6533,14 +7005,14 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 2, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "diamond", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 20, "x": 40, "y": -10, @@ -6576,14 +7048,14 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 20, "x": 10, "y": -10, @@ -6605,14 +7077,14 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 2, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "diamond", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 20, "x": 40, "y": -10, @@ -6634,14 +7106,14 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 2, }, - "seed": 401146281, + "seed": 238820263, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "ellipse", "updated": 1, "version": 2, - "versionNonce": 2019559783, + "versionNonce": 1604849351, "width": 20, "x": 70, "y": -10, @@ -6677,14 +7149,14 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 20, "x": 10, "y": -10, @@ -6706,14 +7178,14 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 2, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "diamond", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 20, "x": 40, "y": -10, @@ -6735,14 +7207,14 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 2, }, - "seed": 401146281, + "seed": 238820263, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "ellipse", "updated": 1, "version": 2, - "versionNonce": 2019559783, + "versionNonce": 1604849351, "width": 20, "x": 70, "y": -10, @@ -6777,7 +7249,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 2, }, - "seed": 1150084233, + "seed": 23633383, "startArrowhead": null, "startBinding": null, "strokeColor": "#1e1e1e", @@ -6786,7 +7258,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "type": "arrow", "updated": 1, "version": 3, - "versionNonce": 1014066025, + "versionNonce": 81784553, "width": 50, "x": 130, "y": -10, @@ -6822,14 +7294,14 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 20, "x": 10, "y": -10, @@ -6851,14 +7323,14 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 2, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "diamond", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 20, "x": 40, "y": -10, @@ -6880,14 +7352,14 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 2, }, - "seed": 401146281, + "seed": 238820263, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "ellipse", "updated": 1, "version": 2, - "versionNonce": 2019559783, + "versionNonce": 1604849351, "width": 20, "x": 70, "y": -10, @@ -6922,7 +7394,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 2, }, - "seed": 1150084233, + "seed": 23633383, "startArrowhead": null, "startBinding": null, "strokeColor": "#1e1e1e", @@ -6931,7 +7403,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "type": "arrow", "updated": 1, "version": 3, - "versionNonce": 1014066025, + "versionNonce": 81784553, "width": 50, "x": 130, "y": -10, @@ -6966,7 +7438,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 2, }, - "seed": 238820263, + "seed": 1723083209, "startArrowhead": null, "startBinding": null, "strokeColor": "#1e1e1e", @@ -6975,7 +7447,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "type": "line", "updated": 1, "version": 3, - "versionNonce": 1604849351, + "versionNonce": 289600103, "width": 50, "x": 220, "y": -10, @@ -7011,14 +7483,14 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 20, "x": 10, "y": -10, @@ -7040,14 +7512,14 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 2, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "diamond", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 20, "x": 40, "y": -10, @@ -7069,14 +7541,14 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 2, }, - "seed": 401146281, + "seed": 238820263, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "ellipse", "updated": 1, "version": 2, - "versionNonce": 2019559783, + "versionNonce": 1604849351, "width": 20, "x": 70, "y": -10, @@ -7111,7 +7583,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 2, }, - "seed": 1150084233, + "seed": 23633383, "startArrowhead": null, "startBinding": null, "strokeColor": "#1e1e1e", @@ -7120,7 +7592,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "type": "arrow", "updated": 1, "version": 3, - "versionNonce": 1014066025, + "versionNonce": 81784553, "width": 50, "x": 130, "y": -10, @@ -7155,7 +7627,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 2, }, - "seed": 238820263, + "seed": 1723083209, "startArrowhead": null, "startBinding": null, "strokeColor": "#1e1e1e", @@ -7164,7 +7636,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "type": "line", "updated": 1, "version": 3, - "versionNonce": 1604849351, + "versionNonce": 289600103, "width": 50, "x": 220, "y": -10, @@ -7202,7 +7674,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 2, }, - "seed": 1505387817, + "seed": 1898319239, "startArrowhead": null, "startBinding": null, "strokeColor": "#1e1e1e", @@ -7211,7 +7683,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "type": "arrow", "updated": 1, "version": 5, - "versionNonce": 81784553, + "versionNonce": 1349943049, "width": 50, "x": 310, "y": -10, @@ -7247,14 +7719,14 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 20, "x": 10, "y": -10, @@ -7276,14 +7748,14 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 2, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "diamond", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 20, "x": 40, "y": -10, @@ -7305,14 +7777,14 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 2, }, - "seed": 401146281, + "seed": 238820263, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "ellipse", "updated": 1, "version": 2, - "versionNonce": 2019559783, + "versionNonce": 1604849351, "width": 20, "x": 70, "y": -10, @@ -7347,7 +7819,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 2, }, - "seed": 1150084233, + "seed": 23633383, "startArrowhead": null, "startBinding": null, "strokeColor": "#1e1e1e", @@ -7356,7 +7828,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "type": "arrow", "updated": 1, "version": 3, - "versionNonce": 1014066025, + "versionNonce": 81784553, "width": 50, "x": 130, "y": -10, @@ -7391,7 +7863,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 2, }, - "seed": 238820263, + "seed": 1723083209, "startArrowhead": null, "startBinding": null, "strokeColor": "#1e1e1e", @@ -7400,7 +7872,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "type": "line", "updated": 1, "version": 3, - "versionNonce": 1604849351, + "versionNonce": 289600103, "width": 50, "x": 220, "y": -10, @@ -7442,7 +7914,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 2, }, - "seed": 1505387817, + "seed": 1898319239, "startArrowhead": null, "startBinding": null, "strokeColor": "#1e1e1e", @@ -7451,7 +7923,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "type": "arrow", "updated": 1, "version": 7, - "versionNonce": 1723083209, + "versionNonce": 1292308681, "width": 80, "x": 310, "y": -10, @@ -7487,14 +7959,14 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 20, "x": 10, "y": -10, @@ -7516,14 +7988,14 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 2, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "diamond", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 20, "x": 40, "y": -10, @@ -7545,14 +8017,14 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 2, }, - "seed": 401146281, + "seed": 238820263, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "ellipse", "updated": 1, "version": 2, - "versionNonce": 2019559783, + "versionNonce": 1604849351, "width": 20, "x": 70, "y": -10, @@ -7587,7 +8059,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 2, }, - "seed": 1150084233, + "seed": 23633383, "startArrowhead": null, "startBinding": null, "strokeColor": "#1e1e1e", @@ -7596,7 +8068,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "type": "arrow", "updated": 1, "version": 3, - "versionNonce": 1014066025, + "versionNonce": 81784553, "width": 50, "x": 130, "y": -10, @@ -7631,7 +8103,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 2, }, - "seed": 238820263, + "seed": 1723083209, "startArrowhead": null, "startBinding": null, "strokeColor": "#1e1e1e", @@ -7640,7 +8112,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "type": "line", "updated": 1, "version": 3, - "versionNonce": 1604849351, + "versionNonce": 289600103, "width": 50, "x": 220, "y": -10, @@ -7682,7 +8154,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 2, }, - "seed": 1505387817, + "seed": 1898319239, "startArrowhead": null, "startBinding": null, "strokeColor": "#1e1e1e", @@ -7691,7 +8163,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "type": "arrow", "updated": 1, "version": 7, - "versionNonce": 1723083209, + "versionNonce": 1292308681, "width": 80, "x": 310, "y": -10, @@ -7729,7 +8201,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 2, }, - "seed": 760410951, + "seed": 1508694887, "startArrowhead": null, "startBinding": null, "strokeColor": "#1e1e1e", @@ -7738,7 +8210,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "type": "line", "updated": 1, "version": 5, - "versionNonce": 1898319239, + "versionNonce": 1177973545, "width": 50, "x": 430, "y": -10, @@ -7774,14 +8246,14 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 20, "x": 10, "y": -10, @@ -7803,14 +8275,14 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 2, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "diamond", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 20, "x": 40, "y": -10, @@ -7832,14 +8304,14 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 2, }, - "seed": 401146281, + "seed": 238820263, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "ellipse", "updated": 1, "version": 2, - "versionNonce": 2019559783, + "versionNonce": 1604849351, "width": 20, "x": 70, "y": -10, @@ -7874,7 +8346,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 2, }, - "seed": 1150084233, + "seed": 23633383, "startArrowhead": null, "startBinding": null, "strokeColor": "#1e1e1e", @@ -7883,7 +8355,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "type": "arrow", "updated": 1, "version": 3, - "versionNonce": 1014066025, + "versionNonce": 81784553, "width": 50, "x": 130, "y": -10, @@ -7918,7 +8390,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 2, }, - "seed": 238820263, + "seed": 1723083209, "startArrowhead": null, "startBinding": null, "strokeColor": "#1e1e1e", @@ -7927,7 +8399,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "type": "line", "updated": 1, "version": 3, - "versionNonce": 1604849351, + "versionNonce": 289600103, "width": 50, "x": 220, "y": -10, @@ -7969,7 +8441,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 2, }, - "seed": 1505387817, + "seed": 1898319239, "startArrowhead": null, "startBinding": null, "strokeColor": "#1e1e1e", @@ -7978,7 +8450,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "type": "arrow", "updated": 1, "version": 7, - "versionNonce": 1723083209, + "versionNonce": 1292308681, "width": 80, "x": 310, "y": -10, @@ -8020,7 +8492,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 2, }, - "seed": 760410951, + "seed": 1508694887, "startArrowhead": null, "startBinding": null, "strokeColor": "#1e1e1e", @@ -8029,7 +8501,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "type": "line", "updated": 1, "version": 7, - "versionNonce": 406373543, + "versionNonce": 271613161, "width": 80, "x": 430, "y": -10, @@ -8063,14 +8535,14 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 20, "x": 10, "y": -10, @@ -8092,14 +8564,14 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 2, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "diamond", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 20, "x": 40, "y": -10, @@ -8121,14 +8593,14 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 2, }, - "seed": 401146281, + "seed": 238820263, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "ellipse", "updated": 1, "version": 2, - "versionNonce": 2019559783, + "versionNonce": 1604849351, "width": 20, "x": 70, "y": -10, @@ -8163,7 +8635,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 2, }, - "seed": 1150084233, + "seed": 23633383, "startArrowhead": null, "startBinding": null, "strokeColor": "#1e1e1e", @@ -8172,7 +8644,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "type": "arrow", "updated": 1, "version": 3, - "versionNonce": 1014066025, + "versionNonce": 81784553, "width": 50, "x": 130, "y": -10, @@ -8207,7 +8679,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 2, }, - "seed": 238820263, + "seed": 1723083209, "startArrowhead": null, "startBinding": null, "strokeColor": "#1e1e1e", @@ -8216,7 +8688,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "type": "line", "updated": 1, "version": 3, - "versionNonce": 1604849351, + "versionNonce": 289600103, "width": 50, "x": 220, "y": -10, @@ -8258,7 +8730,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 2, }, - "seed": 1505387817, + "seed": 1898319239, "startArrowhead": null, "startBinding": null, "strokeColor": "#1e1e1e", @@ -8267,7 +8739,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "type": "arrow", "updated": 1, "version": 7, - "versionNonce": 1723083209, + "versionNonce": 1292308681, "width": 80, "x": 310, "y": -10, @@ -8309,7 +8781,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "roundness": { "type": 2, }, - "seed": 760410951, + "seed": 1508694887, "startArrowhead": null, "startBinding": null, "strokeColor": "#1e1e1e", @@ -8318,7 +8790,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "type": "line", "updated": 1, "version": 7, - "versionNonce": 406373543, + "versionNonce": 271613161, "width": 80, "x": 430, "y": -10, @@ -8361,7 +8833,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] ], "roughness": 1, "roundness": null, - "seed": 941653321, + "seed": 1189086535, "simulatePressure": false, "strokeColor": "#1e1e1e", "strokeStyle": "solid", @@ -8369,7 +8841,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] "type": "freedraw", "updated": 1, "version": 4, - "versionNonce": 1359939303, + "versionNonce": 1439318121, "width": 50, "x": 550, "y": -10, @@ -8382,7 +8854,7 @@ exports[`regression tests > draw every type of shape > [end of test] history 1`] exports[`regression tests > draw every type of shape > [end of test] number of elements 1`] = `0`; -exports[`regression tests > draw every type of shape > [end of test] number of renders 1`] = `57`; +exports[`regression tests > draw every type of shape > [end of test] number of renders 1`] = `36`; exports[`regression tests > given a group of selected elements with an element that is not selected inside the group common bounding box when element that is not selected is clicked should switch selection to not selected element on pointer up > [end of test] appState 1`] = ` { @@ -8530,14 +9002,14 @@ exports[`regression tests > given a group of selected elements with an element t "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 0, "y": 0, @@ -8573,14 +9045,14 @@ exports[`regression tests > given a group of selected elements with an element t "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 0, "y": 0, @@ -8602,14 +9074,14 @@ exports[`regression tests > given a group of selected elements with an element t "roundness": { "type": 2, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "ellipse", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 100, "x": 110, "y": 110, @@ -8645,14 +9117,14 @@ exports[`regression tests > given a group of selected elements with an element t "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 0, "y": 0, @@ -8674,14 +9146,14 @@ exports[`regression tests > given a group of selected elements with an element t "roundness": { "type": 2, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "ellipse", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 100, "x": 110, "y": 110, @@ -8703,14 +9175,14 @@ exports[`regression tests > given a group of selected elements with an element t "roundness": { "type": 2, }, - "seed": 401146281, + "seed": 238820263, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "diamond", "updated": 1, "version": 2, - "versionNonce": 2019559783, + "versionNonce": 1604849351, "width": 100, "x": 310, "y": 310, @@ -8723,7 +9195,7 @@ exports[`regression tests > given a group of selected elements with an element t exports[`regression tests > given a group of selected elements with an element that is not selected inside the group common bounding box when element that is not selected is clicked should switch selection to not selected element on pointer up > [end of test] number of elements 1`] = `0`; -exports[`regression tests > given a group of selected elements with an element that is not selected inside the group common bounding box when element that is not selected is clicked should switch selection to not selected element on pointer up > [end of test] number of renders 1`] = `21`; +exports[`regression tests > given a group of selected elements with an element that is not selected inside the group common bounding box when element that is not selected is clicked should switch selection to not selected element on pointer up > [end of test] number of renders 1`] = `13`; exports[`regression tests > given a selected element A and a not selected element B with higher z-index than A and given B partially overlaps A when there's a shift-click on the overlapped section B is added to the selection > [end of test] appState 1`] = ` { @@ -8871,14 +9343,14 @@ exports[`regression tests > given a selected element A and a not selected elemen "roundness": { "type": 3, }, - "seed": 337897, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 401146281, "width": 1000, "x": 0, "y": 0, @@ -8914,14 +9386,14 @@ exports[`regression tests > given a selected element A and a not selected elemen "roundness": { "type": 3, }, - "seed": 337897, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 401146281, "width": 1000, "x": 0, "y": 0, @@ -8943,14 +9415,14 @@ exports[`regression tests > given a selected element A and a not selected elemen "roundness": { "type": 2, }, - "seed": 449462985, + "seed": 1150084233, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "ellipse", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1014066025, "width": 1000, "x": 500, "y": 500, @@ -8963,7 +9435,7 @@ exports[`regression tests > given a selected element A and a not selected elemen exports[`regression tests > given a selected element A and a not selected element B with higher z-index than A and given B partially overlaps A when there's a shift-click on the overlapped section B is added to the selection > [end of test] number of elements 1`] = `0`; -exports[`regression tests > given a selected element A and a not selected element B with higher z-index than A and given B partially overlaps A when there's a shift-click on the overlapped section B is added to the selection > [end of test] number of renders 1`] = `19`; +exports[`regression tests > given a selected element A and a not selected element B with higher z-index than A and given B partially overlaps A when there's a shift-click on the overlapped section B is added to the selection > [end of test] number of renders 1`] = `11`; exports[`regression tests > given selected element A with lower z-index than unselected element B and given B is partially over A when clicking intersection between A and B B should be selected on pointer up > [end of test] appState 1`] = ` { @@ -9110,7 +9582,7 @@ exports[`regression tests > given selected element A with lower z-index than uns "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, @@ -9139,7 +9611,7 @@ exports[`regression tests > given selected element A with lower z-index than uns "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, @@ -9159,7 +9631,7 @@ exports[`regression tests > given selected element A with lower z-index than uns exports[`regression tests > given selected element A with lower z-index than unselected element B and given B is partially over A when clicking intersection between A and B B should be selected on pointer up > [end of test] number of elements 1`] = `0`; -exports[`regression tests > given selected element A with lower z-index than unselected element B and given B is partially over A when clicking intersection between A and B B should be selected on pointer up > [end of test] number of renders 1`] = `12`; +exports[`regression tests > given selected element A with lower z-index than unselected element B and given B is partially over A when clicking intersection between A and B B should be selected on pointer up > [end of test] number of renders 1`] = `5`; exports[`regression tests > given selected element A with lower z-index than unselected element B and given B is partially over A when dragging on intersection between A and B A should be dragged and keep being selected > [end of test] appState 1`] = ` { @@ -9306,7 +9778,7 @@ exports[`regression tests > given selected element A with lower z-index than uns "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, @@ -9335,7 +9807,7 @@ exports[`regression tests > given selected element A with lower z-index than uns "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, @@ -9378,14 +9850,14 @@ exports[`regression tests > given selected element A with lower z-index than uns "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 401146281, + "versionNonce": 1150084233, "width": 1000, "x": 100, "y": 100, @@ -9407,7 +9879,7 @@ exports[`regression tests > given selected element A with lower z-index than uns "roundness": { "type": 3, }, - "seed": 1278240551, + "seed": 449462985, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, @@ -9427,7 +9899,7 @@ exports[`regression tests > given selected element A with lower z-index than uns exports[`regression tests > given selected element A with lower z-index than unselected element B and given B is partially over A when dragging on intersection between A and B A should be dragged and keep being selected > [end of test] number of elements 1`] = `0`; -exports[`regression tests > given selected element A with lower z-index than unselected element B and given B is partially over A when dragging on intersection between A and B A should be dragged and keep being selected > [end of test] number of renders 1`] = `13`; +exports[`regression tests > given selected element A with lower z-index than unselected element B and given B is partially over A when dragging on intersection between A and B A should be dragged and keep being selected > [end of test] number of renders 1`] = `7`; exports[`regression tests > key 2 selects rectangle tool > [end of test] appState 1`] = ` { @@ -9572,14 +10044,14 @@ exports[`regression tests > key 2 selects rectangle tool > [end of test] history "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 10, "y": 10, @@ -9592,7 +10064,7 @@ exports[`regression tests > key 2 selects rectangle tool > [end of test] history exports[`regression tests > key 2 selects rectangle tool > [end of test] number of elements 1`] = `0`; -exports[`regression tests > key 2 selects rectangle tool > [end of test] number of renders 1`] = `9`; +exports[`regression tests > key 2 selects rectangle tool > [end of test] number of renders 1`] = `7`; exports[`regression tests > key 3 selects diamond tool > [end of test] appState 1`] = ` { @@ -9737,14 +10209,14 @@ exports[`regression tests > key 3 selects diamond tool > [end of test] history 1 "roundness": { "type": 2, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "diamond", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 10, "y": 10, @@ -9757,7 +10229,7 @@ exports[`regression tests > key 3 selects diamond tool > [end of test] history 1 exports[`regression tests > key 3 selects diamond tool > [end of test] number of elements 1`] = `0`; -exports[`regression tests > key 3 selects diamond tool > [end of test] number of renders 1`] = `9`; +exports[`regression tests > key 3 selects diamond tool > [end of test] number of renders 1`] = `7`; exports[`regression tests > key 4 selects ellipse tool > [end of test] appState 1`] = ` { @@ -9902,14 +10374,14 @@ exports[`regression tests > key 4 selects ellipse tool > [end of test] history 1 "roundness": { "type": 2, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "ellipse", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 10, "y": 10, @@ -9922,7 +10394,7 @@ exports[`regression tests > key 4 selects ellipse tool > [end of test] history 1 exports[`regression tests > key 4 selects ellipse tool > [end of test] number of elements 1`] = `0`; -exports[`regression tests > key 4 selects ellipse tool > [end of test] number of renders 1`] = `9`; +exports[`regression tests > key 4 selects ellipse tool > [end of test] number of renders 1`] = `7`; exports[`regression tests > key 5 selects arrow tool > [end of test] appState 1`] = ` { @@ -10103,7 +10575,7 @@ exports[`regression tests > key 5 selects arrow tool > [end of test] history 1`] "roundness": { "type": 2, }, - "seed": 337897, + "seed": 1278240551, "startArrowhead": null, "startBinding": null, "strokeColor": "#1e1e1e", @@ -10112,7 +10584,7 @@ exports[`regression tests > key 5 selects arrow tool > [end of test] history 1`] "type": "arrow", "updated": 1, "version": 3, - "versionNonce": 449462985, + "versionNonce": 401146281, "width": 10, "x": 10, "y": 10, @@ -10125,7 +10597,7 @@ exports[`regression tests > key 5 selects arrow tool > [end of test] history 1`] exports[`regression tests > key 5 selects arrow tool > [end of test] number of elements 1`] = `0`; -exports[`regression tests > key 5 selects arrow tool > [end of test] number of renders 1`] = `10`; +exports[`regression tests > key 5 selects arrow tool > [end of test] number of renders 1`] = `7`; exports[`regression tests > key 6 selects line tool > [end of test] appState 1`] = ` { @@ -10306,7 +10778,7 @@ exports[`regression tests > key 6 selects line tool > [end of test] history 1`] "roundness": { "type": 2, }, - "seed": 337897, + "seed": 1278240551, "startArrowhead": null, "startBinding": null, "strokeColor": "#1e1e1e", @@ -10315,7 +10787,7 @@ exports[`regression tests > key 6 selects line tool > [end of test] history 1`] "type": "line", "updated": 1, "version": 3, - "versionNonce": 449462985, + "versionNonce": 401146281, "width": 10, "x": 10, "y": 10, @@ -10328,7 +10800,7 @@ exports[`regression tests > key 6 selects line tool > [end of test] history 1`] exports[`regression tests > key 6 selects line tool > [end of test] number of elements 1`] = `0`; -exports[`regression tests > key 6 selects line tool > [end of test] number of renders 1`] = `9`; +exports[`regression tests > key 6 selects line tool > [end of test] number of renders 1`] = `7`; exports[`regression tests > key 7 selects freedraw tool > [end of test] appState 1`] = ` { @@ -10490,7 +10962,7 @@ exports[`regression tests > key 7 selects freedraw tool > [end of test] history ], "roughness": 1, "roundness": null, - "seed": 337897, + "seed": 1278240551, "simulatePressure": false, "strokeColor": "#1e1e1e", "strokeStyle": "solid", @@ -10498,7 +10970,7 @@ exports[`regression tests > key 7 selects freedraw tool > [end of test] history "type": "freedraw", "updated": 1, "version": 4, - "versionNonce": 453191, + "versionNonce": 1150084233, "width": 10, "x": 10, "y": 10, @@ -10511,7 +10983,7 @@ exports[`regression tests > key 7 selects freedraw tool > [end of test] history exports[`regression tests > key 7 selects freedraw tool > [end of test] number of elements 1`] = `0`; -exports[`regression tests > key 7 selects freedraw tool > [end of test] number of renders 1`] = `9`; +exports[`regression tests > key 7 selects freedraw tool > [end of test] number of renders 1`] = `7`; exports[`regression tests > key a selects arrow tool > [end of test] appState 1`] = ` { @@ -10692,7 +11164,7 @@ exports[`regression tests > key a selects arrow tool > [end of test] history 1`] "roundness": { "type": 2, }, - "seed": 337897, + "seed": 1278240551, "startArrowhead": null, "startBinding": null, "strokeColor": "#1e1e1e", @@ -10701,7 +11173,7 @@ exports[`regression tests > key a selects arrow tool > [end of test] history 1`] "type": "arrow", "updated": 1, "version": 3, - "versionNonce": 449462985, + "versionNonce": 401146281, "width": 10, "x": 10, "y": 10, @@ -10714,7 +11186,7 @@ exports[`regression tests > key a selects arrow tool > [end of test] history 1`] exports[`regression tests > key a selects arrow tool > [end of test] number of elements 1`] = `0`; -exports[`regression tests > key a selects arrow tool > [end of test] number of renders 1`] = `10`; +exports[`regression tests > key a selects arrow tool > [end of test] number of renders 1`] = `7`; exports[`regression tests > key d selects diamond tool > [end of test] appState 1`] = ` { @@ -10859,14 +11331,14 @@ exports[`regression tests > key d selects diamond tool > [end of test] history 1 "roundness": { "type": 2, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "diamond", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 10, "y": 10, @@ -10879,7 +11351,7 @@ exports[`regression tests > key d selects diamond tool > [end of test] history 1 exports[`regression tests > key d selects diamond tool > [end of test] number of elements 1`] = `0`; -exports[`regression tests > key d selects diamond tool > [end of test] number of renders 1`] = `9`; +exports[`regression tests > key d selects diamond tool > [end of test] number of renders 1`] = `7`; exports[`regression tests > key l selects line tool > [end of test] appState 1`] = ` { @@ -11060,7 +11532,7 @@ exports[`regression tests > key l selects line tool > [end of test] history 1`] "roundness": { "type": 2, }, - "seed": 337897, + "seed": 1278240551, "startArrowhead": null, "startBinding": null, "strokeColor": "#1e1e1e", @@ -11069,7 +11541,7 @@ exports[`regression tests > key l selects line tool > [end of test] history 1`] "type": "line", "updated": 1, "version": 3, - "versionNonce": 449462985, + "versionNonce": 401146281, "width": 10, "x": 10, "y": 10, @@ -11082,7 +11554,7 @@ exports[`regression tests > key l selects line tool > [end of test] history 1`] exports[`regression tests > key l selects line tool > [end of test] number of elements 1`] = `0`; -exports[`regression tests > key l selects line tool > [end of test] number of renders 1`] = `9`; +exports[`regression tests > key l selects line tool > [end of test] number of renders 1`] = `7`; exports[`regression tests > key o selects ellipse tool > [end of test] appState 1`] = ` { @@ -11227,14 +11699,14 @@ exports[`regression tests > key o selects ellipse tool > [end of test] history 1 "roundness": { "type": 2, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "ellipse", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 10, "y": 10, @@ -11247,7 +11719,7 @@ exports[`regression tests > key o selects ellipse tool > [end of test] history 1 exports[`regression tests > key o selects ellipse tool > [end of test] number of elements 1`] = `0`; -exports[`regression tests > key o selects ellipse tool > [end of test] number of renders 1`] = `9`; +exports[`regression tests > key o selects ellipse tool > [end of test] number of renders 1`] = `7`; exports[`regression tests > key p selects freedraw tool > [end of test] appState 1`] = ` { @@ -11409,7 +11881,7 @@ exports[`regression tests > key p selects freedraw tool > [end of test] history ], "roughness": 1, "roundness": null, - "seed": 337897, + "seed": 1278240551, "simulatePressure": false, "strokeColor": "#1e1e1e", "strokeStyle": "solid", @@ -11417,7 +11889,7 @@ exports[`regression tests > key p selects freedraw tool > [end of test] history "type": "freedraw", "updated": 1, "version": 4, - "versionNonce": 453191, + "versionNonce": 1150084233, "width": 10, "x": 10, "y": 10, @@ -11430,7 +11902,7 @@ exports[`regression tests > key p selects freedraw tool > [end of test] history exports[`regression tests > key p selects freedraw tool > [end of test] number of elements 1`] = `0`; -exports[`regression tests > key p selects freedraw tool > [end of test] number of renders 1`] = `9`; +exports[`regression tests > key p selects freedraw tool > [end of test] number of renders 1`] = `7`; exports[`regression tests > key r selects rectangle tool > [end of test] appState 1`] = ` { @@ -11575,14 +12047,14 @@ exports[`regression tests > key r selects rectangle tool > [end of test] history "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 10, "y": 10, @@ -11595,7 +12067,7 @@ exports[`regression tests > key r selects rectangle tool > [end of test] history exports[`regression tests > key r selects rectangle tool > [end of test] number of elements 1`] = `0`; -exports[`regression tests > key r selects rectangle tool > [end of test] number of renders 1`] = `9`; +exports[`regression tests > key r selects rectangle tool > [end of test] number of renders 1`] = `7`; exports[`regression tests > make a group and duplicate it > [end of test] appState 1`] = ` { @@ -11748,14 +12220,14 @@ exports[`regression tests > make a group and duplicate it > [end of test] histor "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 10, "y": 10, @@ -11791,14 +12263,14 @@ exports[`regression tests > make a group and duplicate it > [end of test] histor "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 10, "y": 10, @@ -11820,14 +12292,14 @@ exports[`regression tests > make a group and duplicate it > [end of test] histor "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 10, "x": 30, "y": 10, @@ -11863,14 +12335,14 @@ exports[`regression tests > make a group and duplicate it > [end of test] histor "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 10, "y": 10, @@ -11892,14 +12364,14 @@ exports[`regression tests > make a group and duplicate it > [end of test] histor "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 10, "x": 30, "y": 10, @@ -11921,14 +12393,14 @@ exports[`regression tests > make a group and duplicate it > [end of test] histor "roundness": { "type": 3, }, - "seed": 401146281, + "seed": 238820263, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 2019559783, + "versionNonce": 1604849351, "width": 10, "x": 50, "y": 10, @@ -11970,14 +12442,14 @@ exports[`regression tests > make a group and duplicate it > [end of test] histor "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1014066025, + "versionNonce": 915032327, "width": 10, "x": 10, "y": 10, @@ -12001,14 +12473,14 @@ exports[`regression tests > make a group and duplicate it > [end of test] histor "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 238820263, + "versionNonce": 81784553, "width": 10, "x": 30, "y": 10, @@ -12032,14 +12504,14 @@ exports[`regression tests > make a group and duplicate it > [end of test] histor "roundness": { "type": 3, }, - "seed": 401146281, + "seed": 238820263, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 400692809, + "versionNonce": 747212839, "width": 10, "x": 50, "y": 10, @@ -12081,14 +12553,14 @@ exports[`regression tests > make a group and duplicate it > [end of test] histor "roundness": { "type": 3, }, - "seed": 915032327, + "seed": 941653321, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 5, - "versionNonce": 81784553, + "versionNonce": 908564423, "width": 10, "x": 10, "y": 10, @@ -12112,14 +12584,14 @@ exports[`regression tests > make a group and duplicate it > [end of test] histor "roundness": { "type": 3, }, - "seed": 747212839, + "seed": 1402203177, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 5, - "versionNonce": 1723083209, + "versionNonce": 1359939303, "width": 10, "x": 30, "y": 10, @@ -12143,14 +12615,14 @@ exports[`regression tests > make a group and duplicate it > [end of test] histor "roundness": { "type": 3, }, - "seed": 760410951, + "seed": 1349943049, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 5, - "versionNonce": 1006504105, + "versionNonce": 2004587015, "width": 10, "x": 50, "y": 10, @@ -12174,14 +12646,14 @@ exports[`regression tests > make a group and duplicate it > [end of test] histor "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 4, - "versionNonce": 1505387817, + "versionNonce": 1006504105, "width": 10, "x": 20, "y": 20, @@ -12205,14 +12677,14 @@ exports[`regression tests > make a group and duplicate it > [end of test] histor "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 4, - "versionNonce": 23633383, + "versionNonce": 1315507081, "width": 10, "x": 40, "y": 20, @@ -12236,14 +12708,14 @@ exports[`regression tests > make a group and duplicate it > [end of test] histor "roundness": { "type": 3, }, - "seed": 401146281, + "seed": 238820263, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 4, - "versionNonce": 493213705, + "versionNonce": 640725609, "width": 10, "x": 60, "y": 20, @@ -12256,7 +12728,7 @@ exports[`regression tests > make a group and duplicate it > [end of test] histor exports[`regression tests > make a group and duplicate it > [end of test] number of elements 1`] = `0`; -exports[`regression tests > make a group and duplicate it > [end of test] number of renders 1`] = `24`; +exports[`regression tests > make a group and duplicate it > [end of test] number of renders 1`] = `16`; exports[`regression tests > noop interaction after undo shouldn't create history entry > [end of test] appState 1`] = ` { @@ -12403,14 +12875,14 @@ exports[`regression tests > noop interaction after undo shouldn't create history "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 10, "y": 10, @@ -12446,14 +12918,14 @@ exports[`regression tests > noop interaction after undo shouldn't create history "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 10, "y": 10, @@ -12475,14 +12947,14 @@ exports[`regression tests > noop interaction after undo shouldn't create history "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 10, "x": 30, "y": 10, @@ -12495,7 +12967,7 @@ exports[`regression tests > noop interaction after undo shouldn't create history exports[`regression tests > noop interaction after undo shouldn't create history entry > [end of test] number of elements 1`] = `0`; -exports[`regression tests > noop interaction after undo shouldn't create history entry > [end of test] number of renders 1`] = `21`; +exports[`regression tests > noop interaction after undo shouldn't create history entry > [end of test] number of renders 1`] = `13`; exports[`regression tests > pinch-to-zoom works > [end of test] appState 1`] = ` { @@ -12615,7 +13087,7 @@ exports[`regression tests > pinch-to-zoom works > [end of test] history 1`] = ` exports[`regression tests > pinch-to-zoom works > [end of test] number of elements 1`] = `0`; -exports[`regression tests > pinch-to-zoom works > [end of test] number of renders 1`] = `11`; +exports[`regression tests > pinch-to-zoom works > [end of test] number of renders 1`] = `7`; exports[`regression tests > rerenders UI on language change > [end of test] appState 1`] = ` { @@ -12735,7 +13207,7 @@ exports[`regression tests > rerenders UI on language change > [end of test] hist exports[`regression tests > rerenders UI on language change > [end of test] number of elements 1`] = `0`; -exports[`regression tests > rerenders UI on language change > [end of test] number of renders 1`] = `11`; +exports[`regression tests > rerenders UI on language change > [end of test] number of renders 1`] = `4`; exports[`regression tests > shift click on selected element should deselect it on pointer up > [end of test] appState 1`] = ` { @@ -12880,14 +13352,14 @@ exports[`regression tests > shift click on selected element should deselect it o "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 0, "y": 0, @@ -12900,7 +13372,7 @@ exports[`regression tests > shift click on selected element should deselect it o exports[`regression tests > shift click on selected element should deselect it on pointer up > [end of test] number of elements 1`] = `0`; -exports[`regression tests > shift click on selected element should deselect it on pointer up > [end of test] number of renders 1`] = `11`; +exports[`regression tests > shift click on selected element should deselect it on pointer up > [end of test] number of renders 1`] = `7`; exports[`regression tests > shift-click to multiselect, then drag > [end of test] appState 1`] = ` { @@ -13049,14 +13521,14 @@ exports[`regression tests > shift-click to multiselect, then drag > [end of test "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 10, "y": 10, @@ -13092,14 +13564,14 @@ exports[`regression tests > shift-click to multiselect, then drag > [end of test "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 10, "y": 10, @@ -13121,14 +13593,14 @@ exports[`regression tests > shift-click to multiselect, then drag > [end of test "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 10, "x": 30, "y": 10, @@ -13165,14 +13637,14 @@ exports[`regression tests > shift-click to multiselect, then drag > [end of test "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1116226695, + "versionNonce": 1505387817, "width": 10, "x": 20, "y": 20, @@ -13194,14 +13666,14 @@ exports[`regression tests > shift-click to multiselect, then drag > [end of test "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1014066025, + "versionNonce": 493213705, "width": 10, "x": 40, "y": 20, @@ -13214,7 +13686,7 @@ exports[`regression tests > shift-click to multiselect, then drag > [end of test exports[`regression tests > shift-click to multiselect, then drag > [end of test] number of elements 1`] = `0`; -exports[`regression tests > shift-click to multiselect, then drag > [end of test] number of renders 1`] = `20`; +exports[`regression tests > shift-click to multiselect, then drag > [end of test] number of renders 1`] = `12`; exports[`regression tests > should group elements and ungroup them > [end of test] appState 1`] = ` { @@ -13365,14 +13837,14 @@ exports[`regression tests > should group elements and ungroup them > [end of tes "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 10, "y": 10, @@ -13408,14 +13880,14 @@ exports[`regression tests > should group elements and ungroup them > [end of tes "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 10, "y": 10, @@ -13437,14 +13909,14 @@ exports[`regression tests > should group elements and ungroup them > [end of tes "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 10, "x": 30, "y": 10, @@ -13480,14 +13952,14 @@ exports[`regression tests > should group elements and ungroup them > [end of tes "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 10, "y": 10, @@ -13509,14 +13981,14 @@ exports[`regression tests > should group elements and ungroup them > [end of tes "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 10, "x": 30, "y": 10, @@ -13538,14 +14010,14 @@ exports[`regression tests > should group elements and ungroup them > [end of tes "roundness": { "type": 3, }, - "seed": 401146281, + "seed": 238820263, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 2019559783, + "versionNonce": 1604849351, "width": 10, "x": 50, "y": 10, @@ -13587,14 +14059,14 @@ exports[`regression tests > should group elements and ungroup them > [end of tes "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1014066025, + "versionNonce": 915032327, "width": 10, "x": 10, "y": 10, @@ -13618,14 +14090,14 @@ exports[`regression tests > should group elements and ungroup them > [end of tes "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 238820263, + "versionNonce": 81784553, "width": 10, "x": 30, "y": 10, @@ -13649,14 +14121,14 @@ exports[`regression tests > should group elements and ungroup them > [end of tes "roundness": { "type": 3, }, - "seed": 401146281, + "seed": 238820263, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 400692809, + "versionNonce": 747212839, "width": 10, "x": 50, "y": 10, @@ -13694,14 +14166,14 @@ exports[`regression tests > should group elements and ungroup them > [end of tes "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 4, - "versionNonce": 23633383, + "versionNonce": 289600103, "width": 10, "x": 10, "y": 10, @@ -13723,14 +14195,14 @@ exports[`regression tests > should group elements and ungroup them > [end of tes "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 4, - "versionNonce": 493213705, + "versionNonce": 1315507081, "width": 10, "x": 30, "y": 10, @@ -13752,14 +14224,14 @@ exports[`regression tests > should group elements and ungroup them > [end of tes "roundness": { "type": 3, }, - "seed": 401146281, + "seed": 238820263, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 4, - "versionNonce": 915032327, + "versionNonce": 1898319239, "width": 10, "x": 50, "y": 10, @@ -13772,7 +14244,7 @@ exports[`regression tests > should group elements and ungroup them > [end of tes exports[`regression tests > should group elements and ungroup them > [end of test] number of elements 1`] = `0`; -exports[`regression tests > should group elements and ungroup them > [end of test] number of renders 1`] = `25`; +exports[`regression tests > should group elements and ungroup them > [end of test] number of renders 1`] = `15`; exports[`regression tests > should show fill icons when element has non transparent background > [end of test] appState 1`] = ` { @@ -13917,14 +14389,14 @@ exports[`regression tests > should show fill icons when element has non transpar "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 0, "y": 0, @@ -13960,14 +14432,14 @@ exports[`regression tests > should show fill icons when element has non transpar "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 449462985, + "versionNonce": 2019559783, "width": 10, "x": 0, "y": 0, @@ -13980,7 +14452,7 @@ exports[`regression tests > should show fill icons when element has non transpar exports[`regression tests > should show fill icons when element has non transparent background > [end of test] number of elements 1`] = `0`; -exports[`regression tests > should show fill icons when element has non transparent background > [end of test] number of renders 1`] = `13`; +exports[`regression tests > should show fill icons when element has non transparent background > [end of test] number of renders 1`] = `9`; exports[`regression tests > single-clicking on a subgroup of a selected group should not alter selection > [end of test] appState 1`] = ` { @@ -14135,14 +14607,14 @@ exports[`regression tests > single-clicking on a subgroup of a selected group sh "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 10, "y": 0, @@ -14178,14 +14650,14 @@ exports[`regression tests > single-clicking on a subgroup of a selected group sh "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 10, "y": 0, @@ -14207,14 +14679,14 @@ exports[`regression tests > single-clicking on a subgroup of a selected group sh "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 10, "x": 50, "y": 0, @@ -14255,14 +14727,14 @@ exports[`regression tests > single-clicking on a subgroup of a selected group sh "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1150084233, + "versionNonce": 1604849351, "width": 10, "x": 10, "y": 0, @@ -14286,14 +14758,14 @@ exports[`regression tests > single-clicking on a subgroup of a selected group sh "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1116226695, + "versionNonce": 1505387817, "width": 10, "x": 50, "y": 0, @@ -14331,14 +14803,14 @@ exports[`regression tests > single-clicking on a subgroup of a selected group sh "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1150084233, + "versionNonce": 1604849351, "width": 10, "x": 10, "y": 0, @@ -14362,14 +14834,14 @@ exports[`regression tests > single-clicking on a subgroup of a selected group sh "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1116226695, + "versionNonce": 1505387817, "width": 10, "x": 50, "y": 0, @@ -14391,14 +14863,14 @@ exports[`regression tests > single-clicking on a subgroup of a selected group sh "roundness": { "type": 3, }, - "seed": 1014066025, + "seed": 493213705, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 238820263, + "versionNonce": 81784553, "width": 10, "x": 10, "y": 50, @@ -14436,14 +14908,14 @@ exports[`regression tests > single-clicking on a subgroup of a selected group sh "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1150084233, + "versionNonce": 1604849351, "width": 10, "x": 10, "y": 0, @@ -14467,14 +14939,14 @@ exports[`regression tests > single-clicking on a subgroup of a selected group sh "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1116226695, + "versionNonce": 1505387817, "width": 10, "x": 50, "y": 0, @@ -14496,14 +14968,14 @@ exports[`regression tests > single-clicking on a subgroup of a selected group sh "roundness": { "type": 3, }, - "seed": 1014066025, + "seed": 493213705, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 238820263, + "versionNonce": 81784553, "width": 10, "x": 10, "y": 50, @@ -14525,14 +14997,14 @@ exports[`regression tests > single-clicking on a subgroup of a selected group sh "roundness": { "type": 3, }, - "seed": 400692809, + "seed": 1723083209, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1604849351, + "versionNonce": 1006504105, "width": 10, "x": 50, "y": 50, @@ -14573,14 +15045,14 @@ exports[`regression tests > single-clicking on a subgroup of a selected group sh "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1150084233, + "versionNonce": 1604849351, "width": 10, "x": 10, "y": 0, @@ -14604,14 +15076,14 @@ exports[`regression tests > single-clicking on a subgroup of a selected group sh "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1116226695, + "versionNonce": 1505387817, "width": 10, "x": 50, "y": 0, @@ -14635,14 +15107,14 @@ exports[`regression tests > single-clicking on a subgroup of a selected group sh "roundness": { "type": 3, }, - "seed": 1014066025, + "seed": 493213705, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 493213705, + "versionNonce": 640725609, "width": 10, "x": 10, "y": 50, @@ -14666,14 +15138,14 @@ exports[`regression tests > single-clicking on a subgroup of a selected group sh "roundness": { "type": 3, }, - "seed": 400692809, + "seed": 1723083209, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 915032327, + "versionNonce": 406373543, "width": 10, "x": 50, "y": 50, @@ -14717,14 +15189,14 @@ exports[`regression tests > single-clicking on a subgroup of a selected group sh "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 4, - "versionNonce": 81784553, + "versionNonce": 908564423, "width": 10, "x": 10, "y": 0, @@ -14749,14 +15221,14 @@ exports[`regression tests > single-clicking on a subgroup of a selected group sh "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 4, - "versionNonce": 747212839, + "versionNonce": 1402203177, "width": 10, "x": 50, "y": 0, @@ -14781,14 +15253,14 @@ exports[`regression tests > single-clicking on a subgroup of a selected group sh "roundness": { "type": 3, }, - "seed": 1014066025, + "seed": 493213705, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 4, - "versionNonce": 1723083209, + "versionNonce": 1359939303, "width": 10, "x": 10, "y": 50, @@ -14813,14 +15285,14 @@ exports[`regression tests > single-clicking on a subgroup of a selected group sh "roundness": { "type": 3, }, - "seed": 400692809, + "seed": 1723083209, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 4, - "versionNonce": 760410951, + "versionNonce": 1349943049, "width": 10, "x": 50, "y": 50, @@ -14833,7 +15305,7 @@ exports[`regression tests > single-clicking on a subgroup of a selected group sh exports[`regression tests > single-clicking on a subgroup of a selected group should not alter selection > [end of test] number of elements 1`] = `0`; -exports[`regression tests > single-clicking on a subgroup of a selected group should not alter selection > [end of test] number of renders 1`] = `39`; +exports[`regression tests > single-clicking on a subgroup of a selected group should not alter selection > [end of test] number of renders 1`] = `19`; exports[`regression tests > spacebar + drag scrolls the canvas > [end of test] appState 1`] = ` { @@ -14953,7 +15425,7 @@ exports[`regression tests > spacebar + drag scrolls the canvas > [end of test] h exports[`regression tests > spacebar + drag scrolls the canvas > [end of test] number of elements 1`] = `0`; -exports[`regression tests > spacebar + drag scrolls the canvas > [end of test] number of renders 1`] = `8`; +exports[`regression tests > spacebar + drag scrolls the canvas > [end of test] number of renders 1`] = `5`; exports[`regression tests > supports nested groups > [end of test] appState 1`] = ` { @@ -15100,14 +15572,14 @@ exports[`regression tests > supports nested groups > [end of test] history 1`] = "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 50, "x": 0, "y": 0, @@ -15143,14 +15615,14 @@ exports[`regression tests > supports nested groups > [end of test] history 1`] = "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 50, "x": 0, "y": 0, @@ -15172,14 +15644,14 @@ exports[`regression tests > supports nested groups > [end of test] history 1`] = "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 50, "x": 100, "y": 100, @@ -15215,14 +15687,14 @@ exports[`regression tests > supports nested groups > [end of test] history 1`] = "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 50, "x": 0, "y": 0, @@ -15244,14 +15716,14 @@ exports[`regression tests > supports nested groups > [end of test] history 1`] = "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 50, "x": 100, "y": 100, @@ -15273,14 +15745,14 @@ exports[`regression tests > supports nested groups > [end of test] history 1`] = "roundness": { "type": 3, }, - "seed": 401146281, + "seed": 238820263, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 2019559783, + "versionNonce": 1604849351, "width": 50, "x": 200, "y": 200, @@ -15322,14 +15794,14 @@ exports[`regression tests > supports nested groups > [end of test] history 1`] = "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1150084233, + "versionNonce": 23633383, "width": 50, "x": 0, "y": 0, @@ -15353,14 +15825,14 @@ exports[`regression tests > supports nested groups > [end of test] history 1`] = "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1116226695, + "versionNonce": 493213705, "width": 50, "x": 100, "y": 100, @@ -15384,14 +15856,14 @@ exports[`regression tests > supports nested groups > [end of test] history 1`] = "roundness": { "type": 3, }, - "seed": 401146281, + "seed": 238820263, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1014066025, + "versionNonce": 915032327, "width": 50, "x": 200, "y": 200, @@ -15430,14 +15902,14 @@ exports[`regression tests > supports nested groups > [end of test] history 1`] = "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1150084233, + "versionNonce": 23633383, "width": 50, "x": 0, "y": 0, @@ -15461,14 +15933,14 @@ exports[`regression tests > supports nested groups > [end of test] history 1`] = "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1116226695, + "versionNonce": 493213705, "width": 50, "x": 100, "y": 100, @@ -15492,14 +15964,14 @@ exports[`regression tests > supports nested groups > [end of test] history 1`] = "roundness": { "type": 3, }, - "seed": 401146281, + "seed": 238820263, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1014066025, + "versionNonce": 915032327, "width": 50, "x": 200, "y": 200, @@ -15540,14 +16012,14 @@ exports[`regression tests > supports nested groups > [end of test] history 1`] = "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1116226695, + "versionNonce": 493213705, "width": 50, "x": 100, "y": 100, @@ -15572,14 +16044,14 @@ exports[`regression tests > supports nested groups > [end of test] history 1`] = "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 4, - "versionNonce": 400692809, + "versionNonce": 1723083209, "width": 50, "x": 0, "y": 0, @@ -15604,14 +16076,14 @@ exports[`regression tests > supports nested groups > [end of test] history 1`] = "roundness": { "type": 3, }, - "seed": 401146281, + "seed": 238820263, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 4, - "versionNonce": 1604849351, + "versionNonce": 760410951, "width": 50, "x": 200, "y": 200, @@ -15653,14 +16125,14 @@ exports[`regression tests > supports nested groups > [end of test] history 1`] = "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 3, - "versionNonce": 1116226695, + "versionNonce": 493213705, "width": 50, "x": 100, "y": 100, @@ -15685,14 +16157,14 @@ exports[`regression tests > supports nested groups > [end of test] history 1`] = "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 4, - "versionNonce": 400692809, + "versionNonce": 1723083209, "width": 50, "x": 0, "y": 0, @@ -15717,14 +16189,14 @@ exports[`regression tests > supports nested groups > [end of test] history 1`] = "roundness": { "type": 3, }, - "seed": 401146281, + "seed": 238820263, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 4, - "versionNonce": 1604849351, + "versionNonce": 760410951, "width": 50, "x": 200, "y": 200, @@ -15737,7 +16209,7 @@ exports[`regression tests > supports nested groups > [end of test] history 1`] = exports[`regression tests > supports nested groups > [end of test] number of elements 1`] = `0`; -exports[`regression tests > supports nested groups > [end of test] number of renders 1`] = `32`; +exports[`regression tests > supports nested groups > [end of test] number of renders 1`] = `15`; exports[`regression tests > switches from group of selected elements to another element on pointer down > [end of test] appState 1`] = ` { @@ -15783,7 +16255,7 @@ exports[`regression tests > switches from group of selected elements to another "roundness": { "type": 2, }, - "seed": 1116226695, + "seed": 493213705, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, @@ -15866,7 +16338,7 @@ exports[`regression tests > switches from group of selected elements to another "roundness": { "type": 2, }, - "seed": 1116226695, + "seed": 493213705, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, @@ -15941,14 +16413,14 @@ exports[`regression tests > switches from group of selected elements to another "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 0, "y": 0, @@ -15984,14 +16456,14 @@ exports[`regression tests > switches from group of selected elements to another "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 0, "y": 0, @@ -16013,14 +16485,14 @@ exports[`regression tests > switches from group of selected elements to another "roundness": { "type": 2, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "ellipse", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 100, "x": 110, "y": 110, @@ -16056,14 +16528,14 @@ exports[`regression tests > switches from group of selected elements to another "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 0, "y": 0, @@ -16085,14 +16557,14 @@ exports[`regression tests > switches from group of selected elements to another "roundness": { "type": 2, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "ellipse", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 100, "x": 110, "y": 110, @@ -16114,14 +16586,14 @@ exports[`regression tests > switches from group of selected elements to another "roundness": { "type": 2, }, - "seed": 401146281, + "seed": 238820263, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "diamond", "updated": 1, "version": 2, - "versionNonce": 2019559783, + "versionNonce": 1604849351, "width": 100, "x": 310, "y": 310, @@ -16134,7 +16606,7 @@ exports[`regression tests > switches from group of selected elements to another exports[`regression tests > switches from group of selected elements to another element on pointer down > [end of test] number of elements 1`] = `0`; -exports[`regression tests > switches from group of selected elements to another element on pointer down > [end of test] number of renders 1`] = `20`; +exports[`regression tests > switches from group of selected elements to another element on pointer down > [end of test] number of renders 1`] = `13`; exports[`regression tests > switches selected element on pointer down > [end of test] appState 1`] = ` { @@ -16180,7 +16652,7 @@ exports[`regression tests > switches selected element on pointer down > [end of "roundness": { "type": 2, }, - "seed": 401146281, + "seed": 238820263, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, @@ -16262,7 +16734,7 @@ exports[`regression tests > switches selected element on pointer down > [end of "roundness": { "type": 2, }, - "seed": 401146281, + "seed": 238820263, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, @@ -16337,14 +16809,14 @@ exports[`regression tests > switches selected element on pointer down > [end of "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 0, "y": 0, @@ -16380,14 +16852,14 @@ exports[`regression tests > switches selected element on pointer down > [end of "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 10, "x": 0, "y": 0, @@ -16409,14 +16881,14 @@ exports[`regression tests > switches selected element on pointer down > [end of "roundness": { "type": 2, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "ellipse", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 10, "x": 20, "y": 20, @@ -16429,7 +16901,7 @@ exports[`regression tests > switches selected element on pointer down > [end of exports[`regression tests > switches selected element on pointer down > [end of test] number of elements 1`] = `0`; -exports[`regression tests > switches selected element on pointer down > [end of test] number of renders 1`] = `14`; +exports[`regression tests > switches selected element on pointer down > [end of test] number of renders 1`] = `10`; exports[`regression tests > two-finger scroll works > [end of test] appState 1`] = ` { @@ -16549,7 +17021,7 @@ exports[`regression tests > two-finger scroll works > [end of test] history 1`] exports[`regression tests > two-finger scroll works > [end of test] number of elements 1`] = `0`; -exports[`regression tests > two-finger scroll works > [end of test] number of renders 1`] = `13`; +exports[`regression tests > two-finger scroll works > [end of test] number of renders 1`] = `8`; exports[`regression tests > undo/redo drawing an element > [end of test] appState 1`] = ` { @@ -16682,14 +17154,14 @@ exports[`regression tests > undo/redo drawing an element > [end of test] history "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 20, "x": 10, "y": -10, @@ -16711,14 +17183,14 @@ exports[`regression tests > undo/redo drawing an element > [end of test] history "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 30, "x": 40, "y": 0, @@ -16760,7 +17232,7 @@ exports[`regression tests > undo/redo drawing an element > [end of test] history "roundness": { "type": 2, }, - "seed": 401146281, + "seed": 238820263, "startArrowhead": null, "startBinding": null, "strokeColor": "#1e1e1e", @@ -16769,7 +17241,7 @@ exports[`regression tests > undo/redo drawing an element > [end of test] history "type": "arrow", "updated": 1, "version": 7, - "versionNonce": 400692809, + "versionNonce": 1006504105, "width": 100, "x": 130, "y": 10, @@ -16805,14 +17277,14 @@ exports[`regression tests > undo/redo drawing an element > [end of test] history "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 20, "x": 10, "y": -10, @@ -16834,14 +17306,14 @@ exports[`regression tests > undo/redo drawing an element > [end of test] history "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 30, "x": 40, "y": 0, @@ -16879,7 +17351,7 @@ exports[`regression tests > undo/redo drawing an element > [end of test] history "roundness": { "type": 2, }, - "seed": 401146281, + "seed": 238820263, "startArrowhead": null, "startBinding": null, "strokeColor": "#1e1e1e", @@ -16888,7 +17360,7 @@ exports[`regression tests > undo/redo drawing an element > [end of test] history "type": "arrow", "updated": 1, "version": 5, - "versionNonce": 1014066025, + "versionNonce": 81784553, "width": 60, "x": 130, "y": 10, @@ -16937,14 +17409,14 @@ exports[`regression tests > undo/redo drawing an element > [end of test] history "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 20, "x": 10, "y": -10, @@ -16980,14 +17452,14 @@ exports[`regression tests > undo/redo drawing an element > [end of test] history "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 20, "x": 10, "y": -10, @@ -17009,14 +17481,14 @@ exports[`regression tests > undo/redo drawing an element > [end of test] history "roundness": { "type": 3, }, - "seed": 449462985, + "seed": 2019559783, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 453191, + "versionNonce": 1116226695, "width": 30, "x": 40, "y": 0, @@ -17029,7 +17501,7 @@ exports[`regression tests > undo/redo drawing an element > [end of test] history exports[`regression tests > undo/redo drawing an element > [end of test] number of elements 1`] = `0`; -exports[`regression tests > undo/redo drawing an element > [end of test] number of renders 1`] = `31`; +exports[`regression tests > undo/redo drawing an element > [end of test] number of renders 1`] = `21`; exports[`regression tests > updates fontSize & fontFamily appState > [end of test] appState 1`] = ` { @@ -17149,7 +17621,7 @@ exports[`regression tests > updates fontSize & fontFamily appState > [end of tes exports[`regression tests > updates fontSize & fontFamily appState > [end of test] number of elements 1`] = `0`; -exports[`regression tests > updates fontSize & fontFamily appState > [end of test] number of renders 1`] = `7`; +exports[`regression tests > updates fontSize & fontFamily appState > [end of test] number of renders 1`] = `5`; exports[`regression tests > zoom hotkeys > [end of test] appState 1`] = ` { @@ -17269,4 +17741,4 @@ exports[`regression tests > zoom hotkeys > [end of test] history 1`] = ` exports[`regression tests > zoom hotkeys > [end of test] number of elements 1`] = `0`; -exports[`regression tests > zoom hotkeys > [end of test] number of renders 1`] = `7`; +exports[`regression tests > zoom hotkeys > [end of test] number of renders 1`] = `6`; diff --git a/src/tests/__snapshots__/selection.test.tsx.snap b/src/tests/__snapshots__/selection.test.tsx.snap index 3296dca7..33635bca 100644 --- a/src/tests/__snapshots__/selection.test.tsx.snap +++ b/src/tests/__snapshots__/selection.test.tsx.snap @@ -31,7 +31,7 @@ exports[`select single element on the scene > arrow 1`] = ` "roundness": { "type": 2, }, - "seed": 337897, + "seed": 1278240551, "startArrowhead": null, "startBinding": null, "strokeColor": "#1e1e1e", @@ -40,7 +40,7 @@ exports[`select single element on the scene > arrow 1`] = ` "type": "arrow", "updated": 1, "version": 3, - "versionNonce": 449462985, + "versionNonce": 401146281, "width": 30, "x": 10, "y": 10, @@ -78,7 +78,7 @@ exports[`select single element on the scene > arrow escape 1`] = ` "roundness": { "type": 2, }, - "seed": 337897, + "seed": 1278240551, "startArrowhead": null, "startBinding": null, "strokeColor": "#1e1e1e", @@ -87,7 +87,7 @@ exports[`select single element on the scene > arrow escape 1`] = ` "type": "line", "updated": 1, "version": 3, - "versionNonce": 449462985, + "versionNonce": 401146281, "width": 30, "x": 10, "y": 10, @@ -112,14 +112,14 @@ exports[`select single element on the scene > diamond 1`] = ` "roundness": { "type": 2, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "diamond", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 30, "x": 10, "y": 10, @@ -144,14 +144,14 @@ exports[`select single element on the scene > ellipse 1`] = ` "roundness": { "type": 2, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "ellipse", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 30, "x": 10, "y": 10, @@ -176,14 +176,14 @@ exports[`select single element on the scene > rectangle 1`] = ` "roundness": { "type": 3, }, - "seed": 337897, + "seed": 1278240551, "strokeColor": "#1e1e1e", "strokeStyle": "solid", "strokeWidth": 1, "type": "rectangle", "updated": 1, "version": 2, - "versionNonce": 1278240551, + "versionNonce": 453191, "width": 30, "x": 10, "y": 10, diff --git a/src/tests/contextmenu.test.tsx b/src/tests/contextmenu.test.tsx index c581a0ff..1474c522 100644 --- a/src/tests/contextmenu.test.tsx +++ b/src/tests/contextmenu.test.tsx @@ -24,7 +24,7 @@ import { LibraryItem } from "../types"; import { vi } from "vitest"; const checkpoint = (name: string) => { - expect(renderScene.mock.calls.length).toMatchSnapshot( + expect(renderStaticScene.mock.calls.length).toMatchSnapshot( `[${name}] number of renders`, ); expect(h.state).toMatchSnapshot(`[${name}] appState`); @@ -40,10 +40,10 @@ const mouse = new Pointer("mouse"); // Unmount ReactDOM from root ReactDOM.unmountComponentAtNode(document.getElementById("root")!); -const renderScene = vi.spyOn(Renderer, "renderScene"); +const renderStaticScene = vi.spyOn(Renderer, "renderStaticScene"); beforeEach(() => { localStorage.clear(); - renderScene.mockClear(); + renderStaticScene.mockClear(); reseed(7); }); @@ -52,7 +52,7 @@ const { h } = window; describe("contextMenu element", () => { beforeEach(async () => { localStorage.clear(); - renderScene.mockClear(); + renderStaticScene.mockClear(); reseed(7); setDateTimeForTests("201933152653"); @@ -75,7 +75,7 @@ describe("contextMenu element", () => { }); it("shows context menu for canvas", () => { - fireEvent.contextMenu(GlobalTestState.canvas, { + fireEvent.contextMenu(GlobalTestState.interactiveCanvas, { button: 2, clientX: 1, clientY: 1, @@ -105,7 +105,7 @@ describe("contextMenu element", () => { mouse.down(10, 10); mouse.up(20, 20); - fireEvent.contextMenu(GlobalTestState.canvas, { + fireEvent.contextMenu(GlobalTestState.interactiveCanvas, { button: 2, clientX: 1, clientY: 1, @@ -159,7 +159,7 @@ describe("contextMenu element", () => { API.setSelectedElements([rect1]); // lower z-index - fireEvent.contextMenu(GlobalTestState.canvas, { + fireEvent.contextMenu(GlobalTestState.interactiveCanvas, { button: 2, clientX: 100, clientY: 100, @@ -169,7 +169,7 @@ describe("contextMenu element", () => { // higher z-index API.setSelectedElements([rect2]); - fireEvent.contextMenu(GlobalTestState.canvas, { + fireEvent.contextMenu(GlobalTestState.interactiveCanvas, { button: 2, clientX: 100, clientY: 100, @@ -193,7 +193,7 @@ describe("contextMenu element", () => { mouse.click(20, 0); }); - fireEvent.contextMenu(GlobalTestState.canvas, { + fireEvent.contextMenu(GlobalTestState.interactiveCanvas, { button: 2, clientX: 1, clientY: 1, @@ -246,7 +246,7 @@ describe("contextMenu element", () => { Keyboard.keyPress(KEYS.G); }); - fireEvent.contextMenu(GlobalTestState.canvas, { + fireEvent.contextMenu(GlobalTestState.interactiveCanvas, { button: 2, clientX: 1, clientY: 1, @@ -285,7 +285,7 @@ describe("contextMenu element", () => { mouse.down(10, 10); mouse.up(20, 20); - fireEvent.contextMenu(GlobalTestState.canvas, { + fireEvent.contextMenu(GlobalTestState.interactiveCanvas, { button: 2, clientX: 1, clientY: 1, @@ -333,7 +333,7 @@ describe("contextMenu element", () => { mouse.reset(); // Copy styles of second rectangle - fireEvent.contextMenu(GlobalTestState.canvas, { + fireEvent.contextMenu(GlobalTestState.interactiveCanvas, { button: 2, clientX: 40, clientY: 40, @@ -346,7 +346,7 @@ describe("contextMenu element", () => { mouse.reset(); // Paste styles to first rectangle - fireEvent.contextMenu(GlobalTestState.canvas, { + fireEvent.contextMenu(GlobalTestState.interactiveCanvas, { button: 2, clientX: 10, clientY: 10, @@ -370,7 +370,7 @@ describe("contextMenu element", () => { mouse.down(10, 10); mouse.up(20, 20); - fireEvent.contextMenu(GlobalTestState.canvas, { + fireEvent.contextMenu(GlobalTestState.interactiveCanvas, { button: 2, clientX: 1, clientY: 1, @@ -386,7 +386,7 @@ describe("contextMenu element", () => { mouse.down(10, 10); mouse.up(20, 20); - fireEvent.contextMenu(GlobalTestState.canvas, { + fireEvent.contextMenu(GlobalTestState.interactiveCanvas, { button: 2, clientX: 1, clientY: 1, @@ -407,7 +407,7 @@ describe("contextMenu element", () => { mouse.down(10, 10); mouse.up(20, 20); - fireEvent.contextMenu(GlobalTestState.canvas, { + fireEvent.contextMenu(GlobalTestState.interactiveCanvas, { button: 2, clientX: 1, clientY: 1, @@ -430,7 +430,7 @@ describe("contextMenu element", () => { mouse.up(20, 20); mouse.reset(); - fireEvent.contextMenu(GlobalTestState.canvas, { + fireEvent.contextMenu(GlobalTestState.interactiveCanvas, { button: 2, clientX: 40, clientY: 40, @@ -452,7 +452,7 @@ describe("contextMenu element", () => { mouse.up(20, 20); mouse.reset(); - fireEvent.contextMenu(GlobalTestState.canvas, { + fireEvent.contextMenu(GlobalTestState.interactiveCanvas, { button: 2, clientX: 10, clientY: 10, @@ -474,7 +474,7 @@ describe("contextMenu element", () => { mouse.up(20, 20); mouse.reset(); - fireEvent.contextMenu(GlobalTestState.canvas, { + fireEvent.contextMenu(GlobalTestState.interactiveCanvas, { button: 2, clientX: 40, clientY: 40, @@ -495,7 +495,7 @@ describe("contextMenu element", () => { mouse.up(20, 20); mouse.reset(); - fireEvent.contextMenu(GlobalTestState.canvas, { + fireEvent.contextMenu(GlobalTestState.interactiveCanvas, { button: 2, clientX: 10, clientY: 10, @@ -520,7 +520,7 @@ describe("contextMenu element", () => { mouse.click(10, 10); }); - fireEvent.contextMenu(GlobalTestState.canvas, { + fireEvent.contextMenu(GlobalTestState.interactiveCanvas, { button: 2, clientX: 1, clientY: 1, @@ -550,7 +550,7 @@ describe("contextMenu element", () => { Keyboard.keyPress(KEYS.G); }); - fireEvent.contextMenu(GlobalTestState.canvas, { + fireEvent.contextMenu(GlobalTestState.interactiveCanvas, { button: 2, clientX: 1, clientY: 1, diff --git a/src/tests/dragCreate.test.tsx b/src/tests/dragCreate.test.tsx index 3e01af04..2f0b0a27 100644 --- a/src/tests/dragCreate.test.tsx +++ b/src/tests/dragCreate.test.tsx @@ -15,10 +15,13 @@ import { vi } from "vitest"; // Unmount ReactDOM from root ReactDOM.unmountComponentAtNode(document.getElementById("root")!); -const renderScene = vi.spyOn(Renderer, "renderScene"); +const renderInteractiveScene = vi.spyOn(Renderer, "renderInteractiveScene"); +const renderStaticScene = vi.spyOn(Renderer, "renderStaticScene"); + beforeEach(() => { localStorage.clear(); - renderScene.mockClear(); + renderInteractiveScene.mockClear(); + renderStaticScene.mockClear(); reseed(7); }); @@ -32,7 +35,7 @@ describe("Test dragCreate", () => { const tool = getByToolName("rectangle"); fireEvent.click(tool); - const canvas = container.querySelector("canvas")!; + const canvas = container.querySelector("canvas.interactive")!; // start from (30, 20) fireEvent.pointerDown(canvas, { clientX: 30, clientY: 20 }); @@ -43,7 +46,8 @@ describe("Test dragCreate", () => { // finish (position does not matter) fireEvent.pointerUp(canvas); - expect(renderScene).toHaveBeenCalledTimes(9); + expect(renderInteractiveScene).toHaveBeenCalledTimes(6); + expect(renderStaticScene).toHaveBeenCalledTimes(6); expect(h.state.selectionElement).toBeNull(); expect(h.elements.length).toEqual(1); @@ -63,7 +67,7 @@ describe("Test dragCreate", () => { const tool = getByToolName("ellipse"); fireEvent.click(tool); - const canvas = container.querySelector("canvas")!; + const canvas = container.querySelector("canvas.interactive")!; // start from (30, 20) fireEvent.pointerDown(canvas, { clientX: 30, clientY: 20 }); @@ -74,7 +78,9 @@ describe("Test dragCreate", () => { // finish (position does not matter) fireEvent.pointerUp(canvas); - expect(renderScene).toHaveBeenCalledTimes(9); + expect(renderInteractiveScene).toHaveBeenCalledTimes(6); + expect(renderStaticScene).toHaveBeenCalledTimes(6); + expect(h.state.selectionElement).toBeNull(); expect(h.elements.length).toEqual(1); @@ -94,7 +100,7 @@ describe("Test dragCreate", () => { const tool = getByToolName("diamond"); fireEvent.click(tool); - const canvas = container.querySelector("canvas")!; + const canvas = container.querySelector("canvas.interactive")!; // start from (30, 20) fireEvent.pointerDown(canvas, { clientX: 30, clientY: 20 }); @@ -105,7 +111,8 @@ describe("Test dragCreate", () => { // finish (position does not matter) fireEvent.pointerUp(canvas); - expect(renderScene).toHaveBeenCalledTimes(9); + expect(renderInteractiveScene).toHaveBeenCalledTimes(6); + expect(renderStaticScene).toHaveBeenCalledTimes(6); expect(h.state.selectionElement).toBeNull(); expect(h.elements.length).toEqual(1); @@ -125,7 +132,7 @@ describe("Test dragCreate", () => { const tool = getByToolName("arrow"); fireEvent.click(tool); - const canvas = container.querySelector("canvas")!; + const canvas = container.querySelector("canvas.interactive")!; // start from (30, 20) fireEvent.pointerDown(canvas, { clientX: 30, clientY: 20 }); @@ -136,7 +143,8 @@ describe("Test dragCreate", () => { // finish (position does not matter) fireEvent.pointerUp(canvas); - expect(renderScene).toHaveBeenCalledTimes(9); + expect(renderInteractiveScene).toHaveBeenCalledTimes(6); + expect(renderStaticScene).toHaveBeenCalledTimes(6); expect(h.state.selectionElement).toBeNull(); expect(h.elements.length).toEqual(1); @@ -160,7 +168,7 @@ describe("Test dragCreate", () => { const tool = getByToolName("line"); fireEvent.click(tool); - const canvas = container.querySelector("canvas")!; + const canvas = container.querySelector("canvas.interactive")!; // start from (30, 20) fireEvent.pointerDown(canvas, { clientX: 30, clientY: 20 }); @@ -171,7 +179,8 @@ describe("Test dragCreate", () => { // finish (position does not matter) fireEvent.pointerUp(canvas); - expect(renderScene).toHaveBeenCalledTimes(9); + expect(renderInteractiveScene).toHaveBeenCalledTimes(6); + expect(renderStaticScene).toHaveBeenCalledTimes(6); expect(h.state.selectionElement).toBeNull(); expect(h.elements.length).toEqual(1); @@ -203,7 +212,7 @@ describe("Test dragCreate", () => { const tool = getByToolName("rectangle"); fireEvent.click(tool); - const canvas = container.querySelector("canvas")!; + const canvas = container.querySelector("canvas.interactive")!; // start from (30, 20) fireEvent.pointerDown(canvas, { clientX: 30, clientY: 20 }); @@ -211,7 +220,8 @@ describe("Test dragCreate", () => { // finish (position does not matter) fireEvent.pointerUp(canvas); - expect(renderScene).toHaveBeenCalledTimes(7); + expect(renderInteractiveScene).toHaveBeenCalledTimes(5); + expect(renderStaticScene).toHaveBeenCalledTimes(5); expect(h.state.selectionElement).toBeNull(); expect(h.elements.length).toEqual(0); }); @@ -222,7 +232,7 @@ describe("Test dragCreate", () => { const tool = getByToolName("ellipse"); fireEvent.click(tool); - const canvas = container.querySelector("canvas")!; + const canvas = container.querySelector("canvas.interactive")!; // start from (30, 20) fireEvent.pointerDown(canvas, { clientX: 30, clientY: 20 }); @@ -230,7 +240,8 @@ describe("Test dragCreate", () => { // finish (position does not matter) fireEvent.pointerUp(canvas); - expect(renderScene).toHaveBeenCalledTimes(7); + expect(renderInteractiveScene).toHaveBeenCalledTimes(5); + expect(renderStaticScene).toHaveBeenCalledTimes(5); expect(h.state.selectionElement).toBeNull(); expect(h.elements.length).toEqual(0); }); @@ -241,7 +252,7 @@ describe("Test dragCreate", () => { const tool = getByToolName("diamond"); fireEvent.click(tool); - const canvas = container.querySelector("canvas")!; + const canvas = container.querySelector("canvas.interactive")!; // start from (30, 20) fireEvent.pointerDown(canvas, { clientX: 30, clientY: 20 }); @@ -249,7 +260,8 @@ describe("Test dragCreate", () => { // finish (position does not matter) fireEvent.pointerUp(canvas); - expect(renderScene).toHaveBeenCalledTimes(7); + expect(renderInteractiveScene).toHaveBeenCalledTimes(5); + expect(renderStaticScene).toHaveBeenCalledTimes(5); expect(h.state.selectionElement).toBeNull(); expect(h.elements.length).toEqual(0); }); @@ -260,7 +272,7 @@ describe("Test dragCreate", () => { const tool = getByToolName("arrow"); fireEvent.click(tool); - const canvas = container.querySelector("canvas")!; + const canvas = container.querySelector("canvas.interactive")!; // start from (30, 20) fireEvent.pointerDown(canvas, { clientX: 30, clientY: 20 }); @@ -273,7 +285,8 @@ describe("Test dragCreate", () => { key: KEYS.ENTER, }); - expect(renderScene).toHaveBeenCalledTimes(8); + expect(renderInteractiveScene).toHaveBeenCalledTimes(6); + expect(renderStaticScene).toHaveBeenCalledTimes(6); expect(h.state.selectionElement).toBeNull(); expect(h.elements.length).toEqual(0); }); @@ -284,7 +297,7 @@ describe("Test dragCreate", () => { const tool = getByToolName("line"); fireEvent.click(tool); - const canvas = container.querySelector("canvas")!; + const canvas = container.querySelector("canvas.interactive")!; // start from (30, 20) fireEvent.pointerDown(canvas, { clientX: 30, clientY: 20 }); @@ -297,7 +310,8 @@ describe("Test dragCreate", () => { key: KEYS.ENTER, }); - expect(renderScene).toHaveBeenCalledTimes(8); + expect(renderInteractiveScene).toHaveBeenCalledTimes(6); + expect(renderStaticScene).toHaveBeenCalledTimes(6); expect(h.state.selectionElement).toBeNull(); expect(h.elements.length).toEqual(0); }); diff --git a/src/tests/helpers/api.ts b/src/tests/helpers/api.ts index 824a2295..46361cf3 100644 --- a/src/tests/helpers/api.ts +++ b/src/tests/helpers/api.ts @@ -279,7 +279,7 @@ export class API { }; static drop = async (blob: Blob) => { - const fileDropEvent = createEvent.drop(GlobalTestState.canvas); + const fileDropEvent = createEvent.drop(GlobalTestState.interactiveCanvas); const text = await new Promise((resolve, reject) => { try { const reader = new FileReader(); @@ -306,6 +306,6 @@ export class API { }, }, }); - fireEvent(GlobalTestState.canvas, fileDropEvent); + fireEvent(GlobalTestState.interactiveCanvas, fileDropEvent); }; } diff --git a/src/tests/helpers/ui.ts b/src/tests/helpers/ui.ts index c8820113..f815b07d 100644 --- a/src/tests/helpers/ui.ts +++ b/src/tests/helpers/ui.ts @@ -107,7 +107,7 @@ export class Pointer { restorePosition(x = 0, y = 0) { this.clientX = x; this.clientY = y; - fireEvent.pointerMove(GlobalTestState.canvas, this.getEvent()); + fireEvent.pointerMove(GlobalTestState.interactiveCanvas, this.getEvent()); } private getEvent() { @@ -129,18 +129,18 @@ export class Pointer { if (dx !== 0 || dy !== 0) { this.clientX += dx; this.clientY += dy; - fireEvent.pointerMove(GlobalTestState.canvas, this.getEvent()); + fireEvent.pointerMove(GlobalTestState.interactiveCanvas, this.getEvent()); } } down(dx = 0, dy = 0) { this.move(dx, dy); - fireEvent.pointerDown(GlobalTestState.canvas, this.getEvent()); + fireEvent.pointerDown(GlobalTestState.interactiveCanvas, this.getEvent()); } up(dx = 0, dy = 0) { this.move(dx, dy); - fireEvent.pointerUp(GlobalTestState.canvas, this.getEvent()); + fireEvent.pointerUp(GlobalTestState.interactiveCanvas, this.getEvent()); } click(dx = 0, dy = 0) { @@ -150,7 +150,7 @@ export class Pointer { doubleClick(dx = 0, dy = 0) { this.move(dx, dy); - fireEvent.doubleClick(GlobalTestState.canvas, this.getEvent()); + fireEvent.doubleClick(GlobalTestState.interactiveCanvas, this.getEvent()); } // absolute coords @@ -159,19 +159,19 @@ export class Pointer { moveTo(x: number = this.clientX, y: number = this.clientY) { this.clientX = x; this.clientY = y; - fireEvent.pointerMove(GlobalTestState.canvas, this.getEvent()); + fireEvent.pointerMove(GlobalTestState.interactiveCanvas, this.getEvent()); } downAt(x = this.clientX, y = this.clientY) { this.clientX = x; this.clientY = y; - fireEvent.pointerDown(GlobalTestState.canvas, this.getEvent()); + fireEvent.pointerDown(GlobalTestState.interactiveCanvas, this.getEvent()); } upAt(x = this.clientX, y = this.clientY) { this.clientX = x; this.clientY = y; - fireEvent.pointerUp(GlobalTestState.canvas, this.getEvent()); + fireEvent.pointerUp(GlobalTestState.interactiveCanvas, this.getEvent()); } clickAt(x: number, y: number) { @@ -180,7 +180,7 @@ export class Pointer { } rightClickAt(x: number, y: number) { - fireEvent.contextMenu(GlobalTestState.canvas, { + fireEvent.contextMenu(GlobalTestState.interactiveCanvas, { button: 2, clientX: x, clientY: y, @@ -189,7 +189,7 @@ export class Pointer { doubleClickAt(x: number, y: number) { this.moveTo(x, y); - fireEvent.doubleClick(GlobalTestState.canvas, this.getEvent()); + fireEvent.doubleClick(GlobalTestState.interactiveCanvas, this.getEvent()); } // --------------------------------------------------------------------------- @@ -327,6 +327,13 @@ export class UI { }); } + static ungroup(elements: ExcalidrawElement[]) { + mouse.select(elements); + Keyboard.withModifierKeys({ ctrl: true, shift: true }, () => { + Keyboard.keyPress(KEYS.G); + }); + } + static queryContextMenu = () => { return GlobalTestState.renderResult.container.querySelector( ".context-menu", diff --git a/src/tests/linearElementEditor.test.tsx b/src/tests/linearElementEditor.test.tsx index bcca0b1e..92e87491 100644 --- a/src/tests/linearElementEditor.test.tsx +++ b/src/tests/linearElementEditor.test.tsx @@ -26,26 +26,28 @@ import * as textElementUtils from "../element/textElement"; import { ROUNDNESS, VERTICAL_ALIGN } from "../constants"; import { vi } from "vitest"; -const renderScene = vi.spyOn(Renderer, "renderScene"); +const renderInteractiveScene = vi.spyOn(Renderer, "renderInteractiveScene"); +const renderStaticScene = vi.spyOn(Renderer, "renderStaticScene"); const { h } = window; const font = "20px Cascadia, width: Segoe UI Emoji" as FontString; describe("Test Linear Elements", () => { let container: HTMLElement; - let canvas: HTMLCanvasElement; + let interactiveCanvas: HTMLCanvasElement; beforeEach(async () => { // Unmount ReactDOM from root ReactDOM.unmountComponentAtNode(document.getElementById("root")!); localStorage.clear(); - renderScene.mockClear(); + renderInteractiveScene.mockClear(); + renderStaticScene.mockClear(); reseed(7); const comp = await render(); + h.state.width = 1000; + h.state.height = 1000; container = comp.container; - canvas = container.querySelector("canvas")!; - canvas.width = 1000; - canvas.height = 1000; + interactiveCanvas = container.querySelector("canvas.interactive")!; }); const p1: Point = [20, 20]; @@ -120,26 +122,26 @@ describe("Test Linear Elements", () => { }; const drag = (startPoint: Point, endPoint: Point) => { - fireEvent.pointerDown(canvas, { + fireEvent.pointerDown(interactiveCanvas, { clientX: startPoint[0], clientY: startPoint[1], }); - fireEvent.pointerMove(canvas, { + fireEvent.pointerMove(interactiveCanvas, { clientX: endPoint[0], clientY: endPoint[1], }); - fireEvent.pointerUp(canvas, { + fireEvent.pointerUp(interactiveCanvas, { clientX: endPoint[0], clientY: endPoint[1], }); }; const deletePoint = (point: Point) => { - fireEvent.pointerDown(canvas, { + fireEvent.pointerDown(interactiveCanvas, { clientX: point[0], clientY: point[1], }); - fireEvent.pointerUp(canvas, { + fireEvent.pointerUp(interactiveCanvas, { clientX: point[0], clientY: point[1], }); @@ -172,12 +174,14 @@ describe("Test Linear Elements", () => { createTwoPointerLinearElement("line"); const line = h.elements[0] as ExcalidrawLinearElement; - expect(renderScene).toHaveBeenCalledTimes(7); + expect(renderInteractiveScene).toHaveBeenCalledTimes(5); + expect(renderStaticScene).toHaveBeenCalledTimes(4); expect((h.elements[0] as ExcalidrawLinearElement).points.length).toEqual(2); // drag line from midpoint drag(midpoint, [midpoint[0] + delta, midpoint[1] + delta]); - expect(renderScene).toHaveBeenCalledTimes(11); + expect(renderInteractiveScene).toHaveBeenCalledTimes(9); + expect(renderStaticScene).toHaveBeenCalledTimes(5); expect(line.points.length).toEqual(3); expect(line.points).toMatchInlineSnapshot(` [ @@ -199,14 +203,14 @@ describe("Test Linear Elements", () => { it("should allow entering and exiting line editor via context menu", () => { createTwoPointerLinearElement("line"); - fireEvent.contextMenu(GlobalTestState.canvas, { + fireEvent.contextMenu(GlobalTestState.interactiveCanvas, { button: 2, clientX: midpoint[0], clientY: midpoint[1], }); // Enter line editor let contextMenu = document.querySelector(".context-menu"); - fireEvent.contextMenu(GlobalTestState.canvas, { + fireEvent.contextMenu(GlobalTestState.interactiveCanvas, { button: 2, clientX: midpoint[0], clientY: midpoint[1], @@ -216,13 +220,13 @@ describe("Test Linear Elements", () => { expect(h.state.editingLinearElement?.elementId).toEqual(h.elements[0].id); // Exiting line editor - fireEvent.contextMenu(GlobalTestState.canvas, { + fireEvent.contextMenu(GlobalTestState.interactiveCanvas, { button: 2, clientX: midpoint[0], clientY: midpoint[1], }); contextMenu = document.querySelector(".context-menu"); - fireEvent.contextMenu(GlobalTestState.canvas, { + fireEvent.contextMenu(GlobalTestState.interactiveCanvas, { button: 2, clientX: midpoint[0], clientY: midpoint[1], @@ -270,7 +274,8 @@ describe("Test Linear Elements", () => { // drag line from midpoint drag(midpoint, [midpoint[0] + delta, midpoint[1] + delta]); - expect(renderScene).toHaveBeenCalledTimes(15); + expect(renderInteractiveScene).toHaveBeenCalledTimes(14); + expect(renderStaticScene).toHaveBeenCalledTimes(5); expect(line.points.length).toEqual(3); expect(line.points).toMatchInlineSnapshot(` @@ -307,7 +312,9 @@ describe("Test Linear Elements", () => { // update roundness fireEvent.click(screen.getByTitle("Round")); - expect(renderScene).toHaveBeenCalledTimes(12); + expect(renderInteractiveScene).toHaveBeenCalledTimes(10); + expect(renderStaticScene).toHaveBeenCalledTimes(6); + const midPointsWithRoundEdge = LinearElementEditor.getEditorMidPoints( h.elements[0] as ExcalidrawLinearElement, h.state, @@ -351,7 +358,9 @@ describe("Test Linear Elements", () => { // Move the element drag(startPoint, endPoint); - expect(renderScene).toHaveBeenCalledTimes(16); + expect(renderInteractiveScene).toHaveBeenCalledTimes(14); + expect(renderStaticScene).toHaveBeenCalledTimes(7); + expect([line.x, line.y]).toEqual([ points[0][0] + deltaX, points[0][1] + deltaY, @@ -408,7 +417,9 @@ describe("Test Linear Elements", () => { lastSegmentMidpoint[1] + delta, ]); - expect(renderScene).toHaveBeenCalledTimes(21); + expect(renderInteractiveScene).toHaveBeenCalledTimes(21); + expect(renderStaticScene).toHaveBeenCalledTimes(7); + expect(line.points.length).toEqual(5); expect((h.elements[0] as ExcalidrawLinearElement).points) @@ -447,7 +458,8 @@ describe("Test Linear Elements", () => { // Drag from first point drag(hitCoords, [hitCoords[0] - delta, hitCoords[1] - delta]); - expect(renderScene).toHaveBeenCalledTimes(16); + expect(renderInteractiveScene).toHaveBeenCalledTimes(14); + expect(renderStaticScene).toHaveBeenCalledTimes(6); const newPoints = LinearElementEditor.getPointsGlobalCoordinates(line); expect([newPoints[0][0], newPoints[0][1]]).toEqual([ @@ -473,7 +485,8 @@ describe("Test Linear Elements", () => { // Drag from first point drag(hitCoords, [hitCoords[0] + delta, hitCoords[1] + delta]); - expect(renderScene).toHaveBeenCalledTimes(16); + expect(renderInteractiveScene).toHaveBeenCalledTimes(14); + expect(renderStaticScene).toHaveBeenCalledTimes(6); const newPoints = LinearElementEditor.getPointsGlobalCoordinates(line); expect([newPoints[0][0], newPoints[0][1]]).toEqual([ @@ -507,7 +520,8 @@ describe("Test Linear Elements", () => { // delete 3rd point deletePoint(points[2]); expect(line.points.length).toEqual(3); - expect(renderScene).toHaveBeenCalledTimes(22); + expect(renderInteractiveScene).toHaveBeenCalledTimes(21); + expect(renderStaticScene).toHaveBeenCalledTimes(7); const newMidPoints = LinearElementEditor.getEditorMidPoints( line, @@ -553,8 +567,8 @@ describe("Test Linear Elements", () => { lastSegmentMidpoint[0] + delta, lastSegmentMidpoint[1] + delta, ]); - expect(renderScene).toHaveBeenCalledTimes(21); - + expect(renderInteractiveScene).toHaveBeenCalledTimes(21); + expect(renderStaticScene).toHaveBeenCalledTimes(7); expect(line.points.length).toEqual(5); expect((h.elements[0] as ExcalidrawLinearElement).points) @@ -629,7 +643,8 @@ describe("Test Linear Elements", () => { // Drag from first point drag(hitCoords, [hitCoords[0] + delta, hitCoords[1] + delta]); - expect(renderScene).toHaveBeenCalledTimes(16); + expect(renderInteractiveScene).toHaveBeenCalledTimes(14); + expect(renderStaticScene).toHaveBeenCalledTimes(6); const newPoints = LinearElementEditor.getPointsGlobalCoordinates(line); expect([newPoints[0][0], newPoints[0][1]]).toEqual([ @@ -870,10 +885,10 @@ describe("Test Linear Elements", () => { ]); expect((h.elements[1] as ExcalidrawTextElementWithContainer).text) .toMatchInlineSnapshot(` - "Online whiteboard - collaboration made - easy" - `); + "Online whiteboard + collaboration made + easy" + `); }); it("should bind text to arrow when clicked on arrow and enter pressed", async () => { @@ -904,10 +919,10 @@ describe("Test Linear Elements", () => { ]); expect((h.elements[1] as ExcalidrawTextElementWithContainer).text) .toMatchInlineSnapshot(` - "Online whiteboard - collaboration made - easy" - `); + "Online whiteboard + collaboration made + easy" + `); }); it("should not bind text to line when double clicked", async () => { @@ -1046,9 +1061,9 @@ describe("Test Linear Elements", () => { `); expect((h.elements[1] as ExcalidrawTextElementWithContainer).text) .toMatchInlineSnapshot(` - "Online whiteboard - collaboration made easy" - `); + "Online whiteboard + collaboration made easy" + `); expect(LinearElementEditor.getElementAbsoluteCoords(container, true)) .toMatchInlineSnapshot(` [ @@ -1206,7 +1221,7 @@ describe("Test Linear Elements", () => { const container = h.elements[0]; API.setSelectedElements([container, text]); - fireEvent.contextMenu(GlobalTestState.canvas, { + fireEvent.contextMenu(GlobalTestState.interactiveCanvas, { button: 2, clientX: 20, clientY: 30, @@ -1231,7 +1246,7 @@ describe("Test Linear Elements", () => { mouse.up(); API.setSelectedElements([h.elements[0], h.elements[1]]); - fireEvent.contextMenu(GlobalTestState.canvas, { + fireEvent.contextMenu(GlobalTestState.interactiveCanvas, { button: 2, clientX: 20, clientY: 30, diff --git a/src/tests/move.test.tsx b/src/tests/move.test.tsx index 034a1fff..e3a9b69b 100644 --- a/src/tests/move.test.tsx +++ b/src/tests/move.test.tsx @@ -17,10 +17,13 @@ import { vi } from "vitest"; // Unmount ReactDOM from root ReactDOM.unmountComponentAtNode(document.getElementById("root")!); -const renderScene = vi.spyOn(Renderer, "renderScene"); +const renderInteractiveScene = vi.spyOn(Renderer, "renderInteractiveScene"); +const renderStaticScene = vi.spyOn(Renderer, "renderStaticScene"); + beforeEach(() => { localStorage.clear(); - renderScene.mockClear(); + renderInteractiveScene.mockClear(); + renderStaticScene.mockClear(); reseed(7); }); @@ -29,7 +32,7 @@ const { h } = window; describe("move element", () => { it("rectangle", async () => { const { getByToolName, container } = await render(); - const canvas = container.querySelector("canvas")!; + const canvas = container.querySelector("canvas.interactive")!; { // create element @@ -39,20 +42,23 @@ describe("move element", () => { fireEvent.pointerMove(canvas, { clientX: 60, clientY: 70 }); fireEvent.pointerUp(canvas); - expect(renderScene).toHaveBeenCalledTimes(9); + expect(renderInteractiveScene).toHaveBeenCalledTimes(6); + expect(renderStaticScene).toHaveBeenCalledTimes(6); expect(h.state.selectionElement).toBeNull(); expect(h.elements.length).toEqual(1); expect(h.state.selectedElementIds[h.elements[0].id]).toBeTruthy(); expect([h.elements[0].x, h.elements[0].y]).toEqual([30, 20]); - renderScene.mockClear(); + renderInteractiveScene.mockClear(); + renderStaticScene.mockClear(); } fireEvent.pointerDown(canvas, { clientX: 50, clientY: 20 }); fireEvent.pointerMove(canvas, { clientX: 20, clientY: 40 }); fireEvent.pointerUp(canvas); - expect(renderScene).toHaveBeenCalledTimes(3); + expect(renderInteractiveScene).toHaveBeenCalledTimes(3); + expect(renderStaticScene).toHaveBeenCalledTimes(2); expect(h.state.selectionElement).toBeNull(); expect(h.elements.length).toEqual(1); expect([h.elements[0].x, h.elements[0].y]).toEqual([0, 40]); @@ -78,7 +84,8 @@ describe("move element", () => { // select the second rectangles new Pointer("mouse").clickOn(rectB); - expect(renderScene).toHaveBeenCalledTimes(23); + expect(renderInteractiveScene).toHaveBeenCalledTimes(21); + expect(renderStaticScene).toHaveBeenCalledTimes(16); expect(h.state.selectionElement).toBeNull(); expect(h.elements.length).toEqual(3); expect(h.state.selectedElementIds[rectB.id]).toBeTruthy(); @@ -87,7 +94,8 @@ describe("move element", () => { expect([line.x, line.y]).toEqual([110, 50]); expect([line.width, line.height]).toEqual([80, 80]); - renderScene.mockClear(); + renderInteractiveScene.mockClear(); + renderStaticScene.mockClear(); // Move selected rectangle Keyboard.keyDown(KEYS.ARROW_RIGHT); @@ -95,7 +103,8 @@ describe("move element", () => { Keyboard.keyDown(KEYS.ARROW_DOWN); // Check that the arrow size has been changed according to moving the rectangle - expect(renderScene).toHaveBeenCalledTimes(3); + expect(renderInteractiveScene).toHaveBeenCalledTimes(3); + expect(renderStaticScene).toHaveBeenCalledTimes(3); expect(h.state.selectionElement).toBeNull(); expect(h.elements.length).toEqual(3); expect(h.state.selectedElementIds[rectB.id]).toBeTruthy(); @@ -111,7 +120,7 @@ describe("move element", () => { describe("duplicate element on move when ALT is clicked", () => { it("rectangle", async () => { const { getByToolName, container } = await render(); - const canvas = container.querySelector("canvas")!; + const canvas = container.querySelector("canvas.interactive")!; { // create element @@ -121,13 +130,15 @@ describe("duplicate element on move when ALT is clicked", () => { fireEvent.pointerMove(canvas, { clientX: 60, clientY: 70 }); fireEvent.pointerUp(canvas); - expect(renderScene).toHaveBeenCalledTimes(9); + expect(renderInteractiveScene).toHaveBeenCalledTimes(6); + expect(renderStaticScene).toHaveBeenCalledTimes(6); expect(h.state.selectionElement).toBeNull(); expect(h.elements.length).toEqual(1); expect(h.state.selectedElementIds[h.elements[0].id]).toBeTruthy(); expect([h.elements[0].x, h.elements[0].y]).toEqual([30, 20]); - renderScene.mockClear(); + renderInteractiveScene.mockClear(); + renderStaticScene.mockClear(); } fireEvent.pointerDown(canvas, { clientX: 50, clientY: 20 }); @@ -141,7 +152,8 @@ describe("duplicate element on move when ALT is clicked", () => { // TODO: This used to be 4, but binding made it go up to 5. Do we need // that additional render? - expect(renderScene).toHaveBeenCalledTimes(5); + expect(renderInteractiveScene).toHaveBeenCalledTimes(5); + expect(renderStaticScene).toHaveBeenCalledTimes(3); expect(h.state.selectionElement).toBeNull(); expect(h.elements.length).toEqual(2); diff --git a/src/tests/multiPointCreate.test.tsx b/src/tests/multiPointCreate.test.tsx index 7037138f..a5277088 100644 --- a/src/tests/multiPointCreate.test.tsx +++ b/src/tests/multiPointCreate.test.tsx @@ -15,10 +15,13 @@ import { vi } from "vitest"; // Unmount ReactDOM from root ReactDOM.unmountComponentAtNode(document.getElementById("root")!); -const renderScene = vi.spyOn(Renderer, "renderScene"); +const renderInteractiveScene = vi.spyOn(Renderer, "renderInteractiveScene"); +const renderStaticScene = vi.spyOn(Renderer, "renderStaticScene"); + beforeEach(() => { localStorage.clear(); - renderScene.mockClear(); + renderInteractiveScene.mockClear(); + renderStaticScene.mockClear(); reseed(7); }); @@ -39,11 +42,12 @@ describe("remove shape in non linear elements", () => { const tool = getByToolName("rectangle"); fireEvent.click(tool); - const canvas = container.querySelector("canvas")!; + const canvas = container.querySelector("canvas.interactive")!; fireEvent.pointerDown(canvas, { clientX: 30, clientY: 20 }); fireEvent.pointerUp(canvas, { clientX: 30, clientY: 30 }); - expect(renderScene).toHaveBeenCalledTimes(7); + expect(renderInteractiveScene).toHaveBeenCalledTimes(5); + expect(renderStaticScene).toHaveBeenCalledTimes(5); expect(h.elements.length).toEqual(0); }); @@ -53,11 +57,12 @@ describe("remove shape in non linear elements", () => { const tool = getByToolName("ellipse"); fireEvent.click(tool); - const canvas = container.querySelector("canvas")!; + const canvas = container.querySelector("canvas.interactive")!; fireEvent.pointerDown(canvas, { clientX: 30, clientY: 20 }); fireEvent.pointerUp(canvas, { clientX: 30, clientY: 30 }); - expect(renderScene).toHaveBeenCalledTimes(7); + expect(renderInteractiveScene).toHaveBeenCalledTimes(5); + expect(renderStaticScene).toHaveBeenCalledTimes(5); expect(h.elements.length).toEqual(0); }); @@ -67,11 +72,12 @@ describe("remove shape in non linear elements", () => { const tool = getByToolName("diamond"); fireEvent.click(tool); - const canvas = container.querySelector("canvas")!; + const canvas = container.querySelector("canvas.interactive")!; fireEvent.pointerDown(canvas, { clientX: 30, clientY: 20 }); fireEvent.pointerUp(canvas, { clientX: 30, clientY: 30 }); - expect(renderScene).toHaveBeenCalledTimes(7); + expect(renderInteractiveScene).toHaveBeenCalledTimes(5); + expect(renderStaticScene).toHaveBeenCalledTimes(5); expect(h.elements.length).toEqual(0); }); }); @@ -83,7 +89,7 @@ describe("multi point mode in linear elements", () => { const tool = getByToolName("arrow"); fireEvent.click(tool); - const canvas = container.querySelector("canvas")!; + const canvas = container.querySelector("canvas.interactive")!; // first point is added on pointer down fireEvent.pointerDown(canvas, { clientX: 30, clientY: 30 }); @@ -103,7 +109,8 @@ describe("multi point mode in linear elements", () => { key: KEYS.ENTER, }); - expect(renderScene).toHaveBeenCalledTimes(15); + expect(renderInteractiveScene).toHaveBeenCalledTimes(10); + expect(renderStaticScene).toHaveBeenCalledTimes(10); expect(h.elements.length).toEqual(1); const element = h.elements[0] as ExcalidrawLinearElement; @@ -126,7 +133,7 @@ describe("multi point mode in linear elements", () => { const tool = getByToolName("line"); fireEvent.click(tool); - const canvas = container.querySelector("canvas")!; + const canvas = container.querySelector("canvas.interactive")!; // first point is added on pointer down fireEvent.pointerDown(canvas, { clientX: 30, clientY: 30 }); @@ -146,7 +153,8 @@ describe("multi point mode in linear elements", () => { key: KEYS.ENTER, }); - expect(renderScene).toHaveBeenCalledTimes(15); + expect(renderInteractiveScene).toHaveBeenCalledTimes(10); + expect(renderStaticScene).toHaveBeenCalledTimes(10); expect(h.elements.length).toEqual(1); const element = h.elements[0] as ExcalidrawLinearElement; diff --git a/src/tests/packages/excalidraw.test.tsx b/src/tests/packages/excalidraw.test.tsx index 20852a2a..02ea208e 100644 --- a/src/tests/packages/excalidraw.test.tsx +++ b/src/tests/packages/excalidraw.test.tsx @@ -1,6 +1,6 @@ import { fireEvent, GlobalTestState, toggleMenu, render } from "../test-utils"; import { Excalidraw, Footer, MainMenu } from "../../packages/excalidraw/index"; -import { queryByText, queryByTestId, screen } from "@testing-library/react"; +import { queryByText, queryByTestId } from "@testing-library/react"; import { GRID_SIZE, THEME } from "../../constants"; import { t } from "../../i18n"; import { useMemo } from "react"; @@ -23,7 +23,7 @@ describe("", () => { ).toBe(0); expect(h.state.zenModeEnabled).toBe(false); - fireEvent.contextMenu(GlobalTestState.canvas, { + fireEvent.contextMenu(GlobalTestState.interactiveCanvas, { button: 2, clientX: 1, clientY: 1, @@ -42,8 +42,8 @@ describe("", () => { container.getElementsByClassName("disable-zen-mode--visible").length, ).toBe(0); expect(h.state.zenModeEnabled).toBe(true); - screen.debug(); - fireEvent.contextMenu(GlobalTestState.canvas, { + + fireEvent.contextMenu(GlobalTestState.interactiveCanvas, { button: 2, clientX: 1, clientY: 1, @@ -95,7 +95,7 @@ describe("", () => { expect( container.getElementsByClassName("disable-zen-mode--visible").length, ).toBe(0); - fireEvent.contextMenu(GlobalTestState.canvas, { + fireEvent.contextMenu(GlobalTestState.interactiveCanvas, { button: 2, clientX: 1, clientY: 1, @@ -114,7 +114,7 @@ describe("", () => { expect( container.getElementsByClassName("disable-zen-mode--visible").length, ).toBe(0); - fireEvent.contextMenu(GlobalTestState.canvas, { + fireEvent.contextMenu(GlobalTestState.interactiveCanvas, { button: 2, clientX: 1, clientY: 1, diff --git a/src/tests/regressionTests.test.tsx b/src/tests/regressionTests.test.tsx index 8cb483c9..47fa9208 100644 --- a/src/tests/regressionTests.test.tsx +++ b/src/tests/regressionTests.test.tsx @@ -21,7 +21,7 @@ import { vi } from "vitest"; const { h } = window; -const renderScene = vi.spyOn(Renderer, "renderScene"); +const renderStaticScene = vi.spyOn(Renderer, "renderStaticScene"); const mouse = new Pointer("mouse"); const finger1 = new Pointer("touch", 1); @@ -33,7 +33,7 @@ const finger2 = new Pointer("touch", 2); * to debug where a test failure came from. */ const checkpoint = (name: string) => { - expect(renderScene.mock.calls.length).toMatchSnapshot( + expect(renderStaticScene.mock.calls.length).toMatchSnapshot( `[${name}] number of renders`, ); expect(h.state).toMatchSnapshot(`[${name}] appState`); @@ -48,7 +48,7 @@ beforeEach(async () => { ReactDOM.unmountComponentAtNode(document.getElementById("root")!); localStorage.clear(); - renderScene.mockClear(); + renderStaticScene.mockClear(); reseed(7); setDateTimeForTests("201933152653"); @@ -1056,6 +1056,28 @@ describe("regression tests", () => { expect(API.getSelectedElements()).toEqual(selectedElements_prev); }); + it("deleting last but one element in editing group should unselect the group", () => { + const rect1 = UI.createElement("rectangle", { x: 10 }); + const rect2 = UI.createElement("rectangle", { x: 50 }); + + UI.group([rect1, rect2]); + + mouse.doubleClickOn(rect1); + Keyboard.keyDown(KEYS.DELETE); + + // Clicking on the deleted element, hence in the empty space + mouse.clickOn(rect1); + + expect(h.state.selectedGroupIds).toEqual({}); + expect(API.getSelectedElements()).toEqual([]); + + // Clicking back in and expecting no group selection + mouse.clickOn(rect2); + + expect(h.state.selectedGroupIds).toEqual({ [rect2.groupIds[0]]: false }); + expect(API.getSelectedElements()).toEqual([rect2.get()]); + }); + it("Cmd/Ctrl-click exclusively select element under pointer", () => { const rect1 = UI.createElement("rectangle", { x: 0 }); const rect2 = UI.createElement("rectangle", { x: 30 }); diff --git a/src/tests/resize.test.tsx b/src/tests/resize.test.tsx index 13f757a9..fdecf8fb 100644 --- a/src/tests/resize.test.tsx +++ b/src/tests/resize.test.tsx @@ -14,10 +14,11 @@ import { vi } from "vitest"; // Unmount ReactDOM from root ReactDOM.unmountComponentAtNode(document.getElementById("root")!); -const renderScene = vi.spyOn(Renderer, "renderScene"); +const renderStaticScene = vi.spyOn(Renderer, "renderStaticScene"); + beforeEach(() => { localStorage.clear(); - renderScene.mockClear(); + renderStaticScene.mockClear(); reseed(7); }); diff --git a/src/tests/selection.test.tsx b/src/tests/selection.test.tsx index aa8b64a8..8df93351 100644 --- a/src/tests/selection.test.tsx +++ b/src/tests/selection.test.tsx @@ -18,10 +18,13 @@ import { vi } from "vitest"; // Unmount ReactDOM from root ReactDOM.unmountComponentAtNode(document.getElementById("root")!); -const renderScene = vi.spyOn(Renderer, "renderScene"); +const renderInteractiveScene = vi.spyOn(Renderer, "renderInteractiveScene"); +const renderStaticScene = vi.spyOn(Renderer, "renderStaticScene"); + beforeEach(() => { localStorage.clear(); - renderScene.mockClear(); + renderInteractiveScene.mockClear(); + renderStaticScene.mockClear(); reseed(7); }); @@ -201,7 +204,7 @@ describe("inner box-selection", () => { }); h.elements = [rect1, rect2, rect3]; Keyboard.withModifierKeys({ ctrl: true }, () => { - mouse.downAt(rect2.x - 20, rect2.x - 20); + mouse.downAt(rect2.x - 20, rect2.y - 20); mouse.moveTo(rect2.x + rect2.width + 10, rect2.y + rect2.height + 10); assertSelectedElements([rect2.id, rect3.id]); expect(h.state.selectedGroupIds).toEqual({ A: true }); @@ -220,10 +223,11 @@ describe("selection element", () => { const tool = getByToolName("selection"); fireEvent.click(tool); - const canvas = container.querySelector("canvas")!; + const canvas = container.querySelector("canvas.interactive")!; fireEvent.pointerDown(canvas, { clientX: 60, clientY: 100 }); - expect(renderScene).toHaveBeenCalledTimes(5); + expect(renderInteractiveScene).toHaveBeenCalledTimes(3); + expect(renderStaticScene).toHaveBeenCalledTimes(3); const selectionElement = h.state.selectionElement!; expect(selectionElement).not.toBeNull(); expect(selectionElement.type).toEqual("selection"); @@ -240,11 +244,12 @@ describe("selection element", () => { const tool = getByToolName("selection"); fireEvent.click(tool); - const canvas = container.querySelector("canvas")!; + const canvas = container.querySelector("canvas.interactive")!; fireEvent.pointerDown(canvas, { clientX: 60, clientY: 100 }); fireEvent.pointerMove(canvas, { clientX: 150, clientY: 30 }); - expect(renderScene).toHaveBeenCalledTimes(6); + expect(renderInteractiveScene).toHaveBeenCalledTimes(4); + expect(renderStaticScene).toHaveBeenCalledTimes(3); const selectionElement = h.state.selectionElement!; expect(selectionElement).not.toBeNull(); expect(selectionElement.type).toEqual("selection"); @@ -261,12 +266,13 @@ describe("selection element", () => { const tool = getByToolName("selection"); fireEvent.click(tool); - const canvas = container.querySelector("canvas")!; + const canvas = container.querySelector("canvas.interactive")!; fireEvent.pointerDown(canvas, { clientX: 60, clientY: 100 }); fireEvent.pointerMove(canvas, { clientX: 150, clientY: 30 }); fireEvent.pointerUp(canvas); - expect(renderScene).toHaveBeenCalledTimes(7); + expect(renderInteractiveScene).toHaveBeenCalledTimes(5); + expect(renderStaticScene).toHaveBeenCalledTimes(3); expect(h.state.selectionElement).toBeNull(); }); }); @@ -282,7 +288,7 @@ describe("select single element on the scene", () => { it("rectangle", async () => { const { getByToolName, container } = await render(); - const canvas = container.querySelector("canvas")!; + const canvas = container.querySelector("canvas.interactive")!; { // create element const tool = getByToolName("rectangle"); @@ -301,7 +307,8 @@ describe("select single element on the scene", () => { fireEvent.pointerDown(canvas, { clientX: 45, clientY: 20 }); fireEvent.pointerUp(canvas); - expect(renderScene).toHaveBeenCalledTimes(11); + expect(renderInteractiveScene).toHaveBeenCalledTimes(9); + expect(renderStaticScene).toHaveBeenCalledTimes(7); expect(h.state.selectionElement).toBeNull(); expect(h.elements.length).toEqual(1); expect(h.state.selectedElementIds[h.elements[0].id]).toBeTruthy(); @@ -311,7 +318,7 @@ describe("select single element on the scene", () => { it("diamond", async () => { const { getByToolName, container } = await render(); - const canvas = container.querySelector("canvas")!; + const canvas = container.querySelector("canvas.interactive")!; { // create element const tool = getByToolName("diamond"); @@ -330,7 +337,8 @@ describe("select single element on the scene", () => { fireEvent.pointerDown(canvas, { clientX: 45, clientY: 20 }); fireEvent.pointerUp(canvas); - expect(renderScene).toHaveBeenCalledTimes(11); + expect(renderInteractiveScene).toHaveBeenCalledTimes(9); + expect(renderStaticScene).toHaveBeenCalledTimes(7); expect(h.state.selectionElement).toBeNull(); expect(h.elements.length).toEqual(1); expect(h.state.selectedElementIds[h.elements[0].id]).toBeTruthy(); @@ -340,7 +348,7 @@ describe("select single element on the scene", () => { it("ellipse", async () => { const { getByToolName, container } = await render(); - const canvas = container.querySelector("canvas")!; + const canvas = container.querySelector("canvas.interactive")!; { // create element const tool = getByToolName("ellipse"); @@ -359,7 +367,8 @@ describe("select single element on the scene", () => { fireEvent.pointerDown(canvas, { clientX: 45, clientY: 20 }); fireEvent.pointerUp(canvas); - expect(renderScene).toHaveBeenCalledTimes(11); + expect(renderInteractiveScene).toHaveBeenCalledTimes(9); + expect(renderStaticScene).toHaveBeenCalledTimes(7); expect(h.state.selectionElement).toBeNull(); expect(h.elements.length).toEqual(1); expect(h.state.selectedElementIds[h.elements[0].id]).toBeTruthy(); @@ -369,7 +378,7 @@ describe("select single element on the scene", () => { it("arrow", async () => { const { getByToolName, container } = await render(); - const canvas = container.querySelector("canvas")!; + const canvas = container.querySelector("canvas.interactive")!; { // create element const tool = getByToolName("arrow"); @@ -401,7 +410,8 @@ describe("select single element on the scene", () => { fireEvent.pointerDown(canvas, { clientX: 40, clientY: 40 }); fireEvent.pointerUp(canvas); - expect(renderScene).toHaveBeenCalledTimes(11); + expect(renderInteractiveScene).toHaveBeenCalledTimes(9); + expect(renderStaticScene).toHaveBeenCalledTimes(7); expect(h.state.selectionElement).toBeNull(); expect(h.elements.length).toEqual(1); expect(h.state.selectedElementIds[h.elements[0].id]).toBeTruthy(); @@ -410,7 +420,7 @@ describe("select single element on the scene", () => { it("arrow escape", async () => { const { getByToolName, container } = await render(); - const canvas = container.querySelector("canvas")!; + const canvas = container.querySelector("canvas.interactive")!; { // create element const tool = getByToolName("line"); @@ -442,7 +452,8 @@ describe("select single element on the scene", () => { fireEvent.pointerDown(canvas, { clientX: 40, clientY: 40 }); fireEvent.pointerUp(canvas); - expect(renderScene).toHaveBeenCalledTimes(11); + expect(renderInteractiveScene).toHaveBeenCalledTimes(9); + expect(renderStaticScene).toHaveBeenCalledTimes(7); expect(h.state.selectionElement).toBeNull(); expect(h.elements.length).toEqual(1); expect(h.state.selectedElementIds[h.elements[0].id]).toBeTruthy(); diff --git a/src/tests/test-utils.ts b/src/tests/test-utils.ts index 1855a7fe..4a8a9f1f 100644 --- a/src/tests/test-utils.ts +++ b/src/tests/test-utils.ts @@ -49,15 +49,30 @@ const renderApp: TestRenderFn = async (ui, options) => { // child App component isn't likely mounted yet (and thus canvas not // present in DOM) get() { - return renderResult.container.querySelector("canvas")!; + return renderResult.container.querySelector("canvas.static")!; + }, + }); + + Object.defineProperty(GlobalTestState, "interactiveCanvas", { + // must be a getter because at the time of ExcalidrawApp render the + // child App component isn't likely mounted yet (and thus canvas not + // present in DOM) + get() { + return renderResult.container.querySelector("canvas.interactive")!; }, }); await waitFor(() => { - const canvas = renderResult.container.querySelector("canvas"); + const canvas = renderResult.container.querySelector("canvas.static"); if (!canvas) { throw new Error("not initialized yet"); } + + const interactiveCanvas = + renderResult.container.querySelector("canvas.interactive"); + if (!interactiveCanvas) { + throw new Error("not initialized yet"); + } }); return renderResult; @@ -81,11 +96,17 @@ export class GlobalTestState { */ static renderResult: RenderResult = null!; /** - * retrieves canvas for currently rendered app instance + * retrieves static canvas for currently rendered app instance */ static get canvas(): HTMLCanvasElement { return null!; } + /** + * retrieves interactive canvas for currently rendered app instance + */ + static get interactiveCanvas(): HTMLCanvasElement { + return null!; + } } const initLocalStorage = (data: ImportedDataState) => { diff --git a/src/tests/viewMode.test.tsx b/src/tests/viewMode.test.tsx index 277b306e..bc29f81c 100644 --- a/src/tests/viewMode.test.tsx +++ b/src/tests/viewMode.test.tsx @@ -17,7 +17,9 @@ describe("view mode", () => { it("after switching to view mode – cursor type should be pointer", async () => { h.setState({ viewModeEnabled: true }); - expect(GlobalTestState.canvas.style.cursor).toBe(CURSOR_TYPE.GRAB); + expect(GlobalTestState.interactiveCanvas.style.cursor).toBe( + CURSOR_TYPE.GRAB, + ); }); it("after switching to view mode, moving, clicking, and pressing space key – cursor type should be pointer", async () => { @@ -29,7 +31,9 @@ describe("view mode", () => { pointer.move(100, 100); pointer.click(); Keyboard.keyPress(KEYS.SPACE); - expect(GlobalTestState.canvas.style.cursor).toBe(CURSOR_TYPE.GRAB); + expect(GlobalTestState.interactiveCanvas.style.cursor).toBe( + CURSOR_TYPE.GRAB, + ); }); }); @@ -45,13 +49,19 @@ describe("view mode", () => { pointer.moveTo(50, 50); // eslint-disable-next-line dot-notation if (pointerType["pointerType"] === "mouse") { - expect(GlobalTestState.canvas.style.cursor).toBe(CURSOR_TYPE.MOVE); + expect(GlobalTestState.interactiveCanvas.style.cursor).toBe( + CURSOR_TYPE.MOVE, + ); } else { - expect(GlobalTestState.canvas.style.cursor).toBe(CURSOR_TYPE.GRAB); + expect(GlobalTestState.interactiveCanvas.style.cursor).toBe( + CURSOR_TYPE.GRAB, + ); } h.setState({ viewModeEnabled: true }); - expect(GlobalTestState.canvas.style.cursor).toBe(CURSOR_TYPE.GRAB); + expect(GlobalTestState.interactiveCanvas.style.cursor).toBe( + CURSOR_TYPE.GRAB, + ); }); }); }); diff --git a/src/tests/zindex.test.tsx b/src/tests/zindex.test.tsx index de421338..2047c032 100644 --- a/src/tests/zindex.test.tsx +++ b/src/tests/zindex.test.tsx @@ -94,7 +94,7 @@ const populateElements = ( ), ...appState, selectedElementIds, - }); + } as AppState); return selectedElementIds; }; diff --git a/src/types.ts b/src/types.ts index 052bf231..9eeaf728 100644 --- a/src/types.ts +++ b/src/types.ts @@ -104,6 +104,52 @@ export type LastActiveTool = export type SidebarName = string; export type SidebarTabName = string; +export type CommonCanvasAppState = { + zoom: AppState["zoom"]; + scrollX: AppState["scrollX"]; + scrollY: AppState["scrollY"]; + width: AppState["width"]; + height: AppState["height"]; + viewModeEnabled: AppState["viewModeEnabled"]; + editingElement: AppState["editingElement"]; + editingGroupId: AppState["editingGroupId"]; // TODO: move to interactive canvas if possible + selectedElementIds: AppState["selectedElementIds"]; // TODO: move to interactive canvas if possible + frameToHighlight: AppState["frameToHighlight"]; // TODO: move to interactive canvas if possible + offsetLeft: AppState["offsetLeft"]; + offsetTop: AppState["offsetTop"]; + theme: AppState["theme"]; + pendingImageElementId: AppState["pendingImageElementId"]; +}; + +export type StaticCanvasAppState = CommonCanvasAppState & { + shouldCacheIgnoreZoom: AppState["shouldCacheIgnoreZoom"]; + /** null indicates transparent bg */ + viewBackgroundColor: AppState["viewBackgroundColor"] | null; + exportScale: AppState["exportScale"]; + selectedElementsAreBeingDragged: AppState["selectedElementsAreBeingDragged"]; + gridSize: AppState["gridSize"]; + frameRendering: AppState["frameRendering"]; +}; + +export type InteractiveCanvasAppState = CommonCanvasAppState & { + // renderInteractiveScene + activeEmbeddable: AppState["activeEmbeddable"]; + editingLinearElement: AppState["editingLinearElement"]; + selectionElement: AppState["selectionElement"]; + selectedGroupIds: AppState["selectedGroupIds"]; + selectedLinearElement: AppState["selectedLinearElement"]; + multiElement: AppState["multiElement"]; + isBindingEnabled: AppState["isBindingEnabled"]; + suggestedBindings: AppState["suggestedBindings"]; + isRotating: AppState["isRotating"]; + elementsToHighlight: AppState["elementsToHighlight"]; + // App + openSidebar: AppState["openSidebar"]; + showHyperlinkPopup: AppState["showHyperlinkPopup"]; + // Collaborators + collaborators: AppState["collaborators"]; +}; + export type AppState = { contextMenu: { items: ContextMenuItems; @@ -407,13 +453,13 @@ export type ExportOpts = { exportedElements: readonly NonDeletedExcalidrawElement[], appState: UIAppState, files: BinaryFiles, - canvas: HTMLCanvasElement | null, + canvas: HTMLCanvasElement, ) => void; renderCustomUI?: ( exportedElements: readonly NonDeletedExcalidrawElement[], appState: UIAppState, files: BinaryFiles, - canvas: HTMLCanvasElement | null, + canvas: HTMLCanvasElement, ) => JSX.Element; }; @@ -458,7 +504,8 @@ export type AppProps = Merge< * in the app, eg Manager. Factored out into a separate type to keep DRY. */ export type AppClassProperties = { props: AppProps; - canvas: HTMLCanvasElement | null; + canvas: HTMLCanvasElement; + interactiveCanvas: HTMLCanvasElement | null; focusContainer(): void; library: Library; imageCache: Map< diff --git a/src/utils.ts b/src/utils.ts index 407fecd2..8b142744 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -20,6 +20,7 @@ import { unstable_batchedUpdates } from "react-dom"; import { SHAPES } from "./shapes"; import { isEraserActive, isHandToolActive } from "./appState"; import { ResolutionType } from "./utility-types"; +import React from "react"; let mockDateTime: string | null = null; @@ -399,22 +400,25 @@ export const updateActiveTool = ( }; }; -export const resetCursor = (canvas: HTMLCanvasElement | null) => { - if (canvas) { - canvas.style.cursor = ""; +export const resetCursor = (interactiveCanvas: HTMLCanvasElement | null) => { + if (interactiveCanvas) { + interactiveCanvas.style.cursor = ""; } }; -export const setCursor = (canvas: HTMLCanvasElement | null, cursor: string) => { - if (canvas) { - canvas.style.cursor = cursor; +export const setCursor = ( + interactiveCanvas: HTMLCanvasElement | null, + cursor: string, +) => { + if (interactiveCanvas) { + interactiveCanvas.style.cursor = cursor; } }; let eraserCanvasCache: any; let previewDataURL: string; export const setEraserCursor = ( - canvas: HTMLCanvasElement | null, + interactiveCanvas: HTMLCanvasElement | null, theme: AppState["theme"], ) => { const cursorImageSizePx = 20; @@ -446,7 +450,7 @@ export const setEraserCursor = ( } setCursor( - canvas, + interactiveCanvas, `url(${previewDataURL}) ${cursorImageSizePx / 2} ${ cursorImageSizePx / 2 }, auto`, @@ -454,23 +458,23 @@ export const setEraserCursor = ( }; export const setCursorForShape = ( - canvas: HTMLCanvasElement | null, + interactiveCanvas: HTMLCanvasElement | null, appState: Pick, ) => { - if (!canvas) { + if (!interactiveCanvas) { return; } if (appState.activeTool.type === "selection") { - resetCursor(canvas); + resetCursor(interactiveCanvas); } else if (isHandToolActive(appState)) { - canvas.style.cursor = CURSOR_TYPE.GRAB; + interactiveCanvas.style.cursor = CURSOR_TYPE.GRAB; } else if (isEraserActive(appState)) { - setEraserCursor(canvas, appState.theme); + setEraserCursor(interactiveCanvas, appState.theme); // do nothing if image tool is selected which suggests there's // a image-preview set as the cursor // Ignore custom type as well and let host decide } else if (!["image", "custom"].includes(appState.activeTool.type)) { - canvas.style.cursor = CURSOR_TYPE.CROSSHAIR; + interactiveCanvas.style.cursor = CURSOR_TYPE.CROSSHAIR; } }; @@ -927,3 +931,74 @@ export const assertNever = ( throw new Error(message); }; + +/** + * Memoizes on values of `opts` object (strict equality). + */ +export const memoize = , R extends any>( + func: (opts: T) => R, +) => { + let lastArgs: Map | undefined; + let lastResult: R | undefined; + + const ret = function (opts: T) { + const currentArgs = Object.entries(opts); + + if (lastArgs) { + let argsAreEqual = true; + for (const [key, value] of currentArgs) { + if (lastArgs.get(key) !== value) { + argsAreEqual = false; + break; + } + } + if (argsAreEqual) { + return lastResult; + } + } + + const result = func(opts); + + lastArgs = new Map(currentArgs); + lastResult = result; + + return result; + }; + + ret.clear = () => { + lastArgs = undefined; + lastResult = undefined; + }; + + return ret as typeof func & { clear: () => void }; +}; + +export const isRenderThrottlingEnabled = (() => { + // we don't want to throttle in react < 18 because of #5439 and it was + // getting more complex to maintain the fix + let IS_REACT_18_AND_UP: boolean; + try { + const version = React.version.split("."); + IS_REACT_18_AND_UP = Number(version[0]) > 17; + } catch { + IS_REACT_18_AND_UP = false; + } + + let hasWarned = false; + + return () => { + if (window.EXCALIDRAW_THROTTLE_RENDER === true) { + if (!IS_REACT_18_AND_UP) { + if (!hasWarned) { + hasWarned = true; + console.warn( + "Excalidraw: render throttling is disabled on React versions < 18.", + ); + } + return false; + } + return true; + } + return false; + }; +})(); diff --git a/yarn.lock b/yarn.lock index 0dce0be7..a6c986fd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2813,40 +2813,39 @@ test-exclude "^6.0.0" v8-to-istanbul "^9.1.0" -"@vitest/expect@0.32.2": - version "0.32.2" - resolved "https://registry.yarnpkg.com/@vitest/expect/-/expect-0.32.2.tgz#8111f6ab1ff3b203efbe3a25e8bb2d160ce4b720" - integrity sha512-6q5yzweLnyEv5Zz1fqK5u5E83LU+gOMVBDuxBl2d2Jfx1BAp5M+rZgc5mlyqdnxquyoiOXpXmFNkcGcfFnFH3Q== +"@vitest/expect@0.34.1": + version "0.34.1" + resolved "https://registry.yarnpkg.com/@vitest/expect/-/expect-0.34.1.tgz#2ba6cb96695f4b4388c6d955423a81afc79b8da0" + integrity sha512-q2CD8+XIsQ+tHwypnoCk8Mnv5e6afLFvinVGCq3/BOT4kQdVQmY6rRfyKkwcg635lbliLPqbunXZr+L1ssUWiQ== dependencies: - "@vitest/spy" "0.32.2" - "@vitest/utils" "0.32.2" + "@vitest/spy" "0.34.1" + "@vitest/utils" "0.34.1" chai "^4.3.7" -"@vitest/runner@0.32.2": - version "0.32.2" - resolved "https://registry.yarnpkg.com/@vitest/runner/-/runner-0.32.2.tgz#18dd979ce4e8766bcc90948d11b4c8ae6ed90b89" - integrity sha512-06vEL0C1pomOEktGoLjzZw+1Fb+7RBRhmw/06WkDrd1akkT9i12su0ku+R/0QM69dfkIL/rAIDTG+CSuQVDcKw== +"@vitest/runner@0.34.1": + version "0.34.1" + resolved "https://registry.yarnpkg.com/@vitest/runner/-/runner-0.34.1.tgz#23c21ba1db8bff610988c72744db590d0fb6c4ba" + integrity sha512-YfQMpYzDsYB7yqgmlxZ06NI4LurHWfrH7Wy3Pvf/z/vwUSgq1zLAb1lWcItCzQG+NVox+VvzlKQrYEXb47645g== dependencies: - "@vitest/utils" "0.32.2" - concordance "^5.0.4" + "@vitest/utils" "0.34.1" p-limit "^4.0.0" - pathe "^1.1.0" + pathe "^1.1.1" -"@vitest/snapshot@0.32.2": - version "0.32.2" - resolved "https://registry.yarnpkg.com/@vitest/snapshot/-/snapshot-0.32.2.tgz#500b6453e88e4c50a0aded39839352c16b519b9e" - integrity sha512-JwhpeH/PPc7GJX38vEfCy9LtRzf9F4er7i4OsAJyV7sjPwjj+AIR8cUgpMTWK4S3TiamzopcTyLsZDMuldoi5A== +"@vitest/snapshot@0.34.1": + version "0.34.1" + resolved "https://registry.yarnpkg.com/@vitest/snapshot/-/snapshot-0.34.1.tgz#814c65f8e714eaf255f47838541004b2a2ba28e6" + integrity sha512-0O9LfLU0114OqdF8lENlrLsnn024Tb1CsS9UwG0YMWY2oGTQfPtkW+B/7ieyv0X9R2Oijhi3caB1xgGgEgclSQ== dependencies: - magic-string "^0.30.0" - pathe "^1.1.0" - pretty-format "^27.5.1" + magic-string "^0.30.1" + pathe "^1.1.1" + pretty-format "^29.5.0" -"@vitest/spy@0.32.2": - version "0.32.2" - resolved "https://registry.yarnpkg.com/@vitest/spy/-/spy-0.32.2.tgz#f3ef7afe0d34e863b90df7c959fa5af540a6aaf9" - integrity sha512-Q/ZNILJ4ca/VzQbRM8ur3Si5Sardsh1HofatG9wsJY1RfEaw0XKP8IVax2lI1qnrk9YPuG9LA2LkZ0EI/3d4ug== +"@vitest/spy@0.34.1": + version "0.34.1" + resolved "https://registry.yarnpkg.com/@vitest/spy/-/spy-0.34.1.tgz#2f77234a3d554c5dea664943f2caaab92d304f3c" + integrity sha512-UT4WcI3EAPUNO8n6y9QoEqynGGEPmmRxC+cLzneFFXpmacivjHZsNbiKD88KUScv5DCHVDgdBsLD7O7s1enFcQ== dependencies: - tinyspy "^2.1.0" + tinyspy "^2.1.1" "@vitest/ui@0.32.2": version "0.32.2" @@ -2870,6 +2869,15 @@ loupe "^2.3.6" pretty-format "^27.5.1" +"@vitest/utils@0.34.1": + version "0.34.1" + resolved "https://registry.yarnpkg.com/@vitest/utils/-/utils-0.34.1.tgz#e5545c6618775fb9a2dae2a80d94fc2f35222233" + integrity sha512-/ql9dsFi4iuEbiNcjNHQWXBum7aL8pyhxvfnD9gNtbjR9fUKAjxhj4AA3yfLXg6gJpMGGecvtF8Au2G9y3q47Q== + dependencies: + diff-sequences "^29.4.3" + loupe "^2.3.6" + pretty-format "^29.5.0" + abab@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291" @@ -3236,11 +3244,6 @@ blob@0.0.5: resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683" integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig== -blueimp-md5@^2.10.0: - version "2.19.0" - resolved "https://registry.yarnpkg.com/blueimp-md5/-/blueimp-md5-2.19.0.tgz#b53feea5498dcb53dc6ec4b823adb84b729c4af0" - integrity sha512-DRQrD6gJyy8FbiE4s+bDoXS9hiW3Vbx5uCdwvcCf3zLHL+Iv7LtGHLpr+GZV8rHG8tK766FGYBwRbu8pELTt+w== - brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" @@ -3510,20 +3513,6 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== -concordance@^5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/concordance/-/concordance-5.0.4.tgz#9896073261adced72f88d60e4d56f8efc4bbbbd2" - integrity sha512-OAcsnTEYu1ARJqWVGwf4zh4JDfHZEaSNlNccFmt8YjB2l/n19/PF2viLINHc57vO4FKIAFl2FWASIGZZWZ2Kxw== - dependencies: - date-time "^3.1.0" - esutils "^2.0.3" - fast-diff "^1.2.0" - js-string-escape "^1.0.1" - lodash "^4.17.15" - md5-hex "^3.0.1" - semver "^7.3.2" - well-known-symbols "^2.0.0" - confusing-browser-globals@^1.0.11: version "1.0.11" resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz#ae40e9b57cdd3915408a2805ebd3a5585608dc81" @@ -3638,13 +3627,6 @@ data-urls@^4.0.0: whatwg-mimetype "^3.0.0" whatwg-url "^12.0.0" -date-time@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/date-time/-/date-time-3.1.0.tgz#0d1e934d170579f481ed8df1e2b8ff70ee845e1e" - integrity sha512-uqCUKXE5q1PNBXjPqvwhwJf9SwMoAHBgWJ6DcrnS5o+W2JOiIILl0JEdVD8SGujrNS02GGxgwAg2PN2zONgtjg== - dependencies: - time-zone "^1.0.0" - debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.3, debug@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" @@ -4294,7 +4276,7 @@ estree-walker@^2.0.2: resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac" integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w== -esutils@^2.0.2, esutils@^2.0.3: +esutils@^2.0.2: version "2.0.3" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== @@ -4347,11 +4329,6 @@ fast-diff@^1.1.2: resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03" integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w== -fast-diff@^1.2.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.3.0.tgz#ece407fa550a64d638536cd727e129c61616e0f0" - integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw== - fast-glob@^3.2.12, fast-glob@^3.2.9: version "3.2.12" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80" @@ -5245,11 +5222,6 @@ jotai@1.13.1: resolved "https://registry.yarnpkg.com/jotai/-/jotai-1.13.1.tgz#20cc46454cbb39096b12fddfa635b873b3668236" integrity sha512-RUmH1S4vLsG3V6fbGlKzGJnLrDcC/HNb5gH2AeA9DzuJknoVxSGvvg8OBB7lke+gDc4oXmdVsaKn/xDUhWZ0vw== -js-string-escape@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef" - integrity sha512-Smw4xcfIQ5LVjAOuJCvN/zIodzA/BBSsluuoSykP+lUvScIi4U6RJLfwHet5cxFnCswUjISV8oAXaqaJDY3chg== - "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" @@ -5561,13 +5533,6 @@ magic-string@^0.27.0: dependencies: "@jridgewell/sourcemap-codec" "^1.4.13" -magic-string@^0.30.0: - version "0.30.0" - resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.0.tgz#fd58a4748c5c4547338a424e90fa5dd17f4de529" - integrity sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ== - dependencies: - "@jridgewell/sourcemap-codec" "^1.4.13" - magic-string@^0.30.1: version "0.30.2" resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.2.tgz#dcf04aad3d0d1314bc743d076c50feb29b3c7aca" @@ -5582,13 +5547,6 @@ make-dir@^4.0.0: dependencies: semver "^7.5.3" -md5-hex@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/md5-hex/-/md5-hex-3.0.1.tgz#be3741b510591434b2784d79e556eefc2c9a8e5c" - integrity sha512-BUiRtTtV39LIJwinWBjqVsU9xhdnz7/i889V859IBFpuqGAj6LuOvHv5XLbgZ2R7ptJoJaEcxkv88/h25T7Ciw== - dependencies: - blueimp-md5 "^2.10.0" - merge-stream@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" @@ -5660,7 +5618,7 @@ mkdirp@^0.5.6: dependencies: minimist "^1.2.6" -mlly@^1.2.0: +mlly@^1.2.0, mlly@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/mlly/-/mlly-1.4.0.tgz#830c10d63f1f97bd8785377b24dc2a15d972832b" integrity sha512-ua8PAThnTwpprIaU47EPeZ/bPUVp2QYBbWMphUQpVdBI3Lgqzm5KZQ45Agm3YJedHXaIHl6pBGabaLSUPPSptg== @@ -6525,7 +6483,7 @@ semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.2.1, semver@^7.3.2, semver@^7.3.7: +semver@^7.2.1, semver@^7.3.7: version "7.4.0" resolved "https://registry.yarnpkg.com/semver/-/semver-7.4.0.tgz#8481c92feffc531ab1e012a8ffc15bdd3a0f4318" integrity sha512-RgOxM8Mw+7Zus0+zcLEUn8+JfoLpj/huFTItQy2hsM4khuC1HYRDp0cU482Ewn/Fcy6bCjufD8vAj7voC66KQw== @@ -6703,7 +6661,7 @@ stackback@0.0.2: resolved "https://registry.yarnpkg.com/stackback/-/stackback-0.0.2.tgz#1ac8a0d9483848d1695e418b6d031a3c3ce68e3b" integrity sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw== -std-env@^3.3.2, std-env@^3.3.3: +std-env@^3.3.3: version "3.3.3" resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.3.3.tgz#a54f06eb245fdcfef53d56f3c0251f1d5c3d01fe" integrity sha512-Rz6yejtVyWnVjC1RFvNmYL10kgjC49EOghxWn0RFqlCHGFpQx+Xe7yW3I4ceK1SGrWIGMjD5Kbue8W/udkbMJg== @@ -6930,11 +6888,6 @@ through@^2.3.8: resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== -time-zone@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/time-zone/-/time-zone-1.0.0.tgz#99c5bf55958966af6d06d83bdf3800dc82faec5d" - integrity sha512-TIsDdtKo6+XrPtiTm1ssmMngN1sAhyKnTO2kunQWqNPWIVvCm15Wmw4SWInwTVgJ5u/Tr04+8Ei9TNcw4x4ONA== - tiny-invariant@^1.1.0: version "1.3.1" resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.1.tgz#8560808c916ef02ecfd55e66090df23a4b7aa642" @@ -6945,12 +6898,12 @@ tinybench@^2.5.0: resolved "https://registry.yarnpkg.com/tinybench/-/tinybench-2.5.0.tgz#4711c99bbf6f3e986f67eb722fed9cddb3a68ba5" integrity sha512-kRwSG8Zx4tjF9ZiyH4bhaebu+EDz1BOx9hOigYHlUW4xxI/wKIUQUqo018UlU4ar6ATPBsaMrdbKZ+tmPdohFA== -tinypool@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/tinypool/-/tinypool-0.5.0.tgz#3861c3069bf71e4f1f5aa2d2e6b3aaacc278961e" - integrity sha512-paHQtnrlS1QZYKF/GnLoOM/DN9fqaGOFbCbxzAhwniySnzl9Ebk8w73/dd34DAhe/obUbPAOldTyYXQZxnPBPQ== +tinypool@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/tinypool/-/tinypool-0.7.0.tgz#88053cc99b4a594382af23190c609d93fddf8021" + integrity sha512-zSYNUlYSMhJ6Zdou4cJwo/p7w5nmAH17GRfU/ui3ctvjXFErXXkruT4MWW6poDeXgCaIBlGLrfU6TbTXxyGMww== -tinyspy@^2.1.0: +tinyspy@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/tinyspy/-/tinyspy-2.1.1.tgz#9e6371b00c259e5c5b301917ca18c01d40ae558c" integrity sha512-XPJL2uSzcOyBMky6OFrusqWlzfFrXtE0hPuMgW8A2HmaqrPo4ZQHRN/V0QXN3FSjKxpsbRrFc5LI7KOwBsT1/w== @@ -7231,15 +7184,15 @@ v8-to-istanbul@^9.1.0: "@types/istanbul-lib-coverage" "^2.0.1" convert-source-map "^1.6.0" -vite-node@0.32.2: - version "0.32.2" - resolved "https://registry.yarnpkg.com/vite-node/-/vite-node-0.32.2.tgz#bfccdfeb708b2309ea9e5fe424951c75bb9c0096" - integrity sha512-dTQ1DCLwl2aEseov7cfQ+kDMNJpM1ebpyMMMwWzBvLbis8Nla/6c9WQcqpPssTwS6Rp/+U6KwlIj8Eapw4bLdA== +vite-node@0.34.1: + version "0.34.1" + resolved "https://registry.yarnpkg.com/vite-node/-/vite-node-0.34.1.tgz#144900ca4bd54cc419c501d671350bcbc07eb1ee" + integrity sha512-odAZAL9xFMuAg8aWd7nSPT+hU8u2r9gU3LRm9QKjxBEF2rRdWpMuqkrkjvyVQEdNFiBctqr2Gg4uJYizm5Le6w== dependencies: cac "^6.7.14" debug "^4.3.4" - mlly "^1.2.0" - pathe "^1.1.0" + mlly "^1.4.0" + pathe "^1.1.1" picocolors "^1.0.0" vite "^3.0.0 || ^4.0.0" @@ -7321,35 +7274,34 @@ vitest-canvas-mock@0.3.2: dependencies: jest-canvas-mock "~2.4.0" -vitest@0.32.2: - version "0.32.2" - resolved "https://registry.yarnpkg.com/vitest/-/vitest-0.32.2.tgz#758ce2220f609e240ac054eca7ad11a5140679ab" - integrity sha512-hU8GNNuQfwuQmqTLfiKcqEhZY72Zxb7nnN07koCUNmntNxbKQnVbeIS6sqUgR3eXSlbOpit8+/gr1KpqoMgWCQ== +vitest@0.34.1: + version "0.34.1" + resolved "https://registry.yarnpkg.com/vitest/-/vitest-0.34.1.tgz#3ad7f845e7a9fb0d72ab703cae832a54b8469e1e" + integrity sha512-G1PzuBEq9A75XSU88yO5G4vPT20UovbC/2osB2KEuV/FisSIIsw7m5y2xMdB7RsAGHAfg2lPmp2qKr3KWliVlQ== dependencies: "@types/chai" "^4.3.5" "@types/chai-subset" "^1.3.3" "@types/node" "*" - "@vitest/expect" "0.32.2" - "@vitest/runner" "0.32.2" - "@vitest/snapshot" "0.32.2" - "@vitest/spy" "0.32.2" - "@vitest/utils" "0.32.2" - acorn "^8.8.2" + "@vitest/expect" "0.34.1" + "@vitest/runner" "0.34.1" + "@vitest/snapshot" "0.34.1" + "@vitest/spy" "0.34.1" + "@vitest/utils" "0.34.1" + acorn "^8.9.0" acorn-walk "^8.2.0" cac "^6.7.14" chai "^4.3.7" - concordance "^5.0.4" debug "^4.3.4" local-pkg "^0.4.3" - magic-string "^0.30.0" - pathe "^1.1.0" + magic-string "^0.30.1" + pathe "^1.1.1" picocolors "^1.0.0" - std-env "^3.3.2" + std-env "^3.3.3" strip-literal "^1.0.1" tinybench "^2.5.0" - tinypool "^0.5.0" + tinypool "^0.7.0" vite "^3.0.0 || ^4.0.0" - vite-node "0.32.2" + vite-node "0.34.1" why-is-node-running "^2.2.2" vscode-jsonrpc@6.0.0: @@ -7437,11 +7389,6 @@ webworkify@^1.5.0: resolved "https://registry.yarnpkg.com/webworkify/-/webworkify-1.5.0.tgz#734ad87a774de6ebdd546e1d3e027da5b8f4a42c" integrity sha512-AMcUeyXAhbACL8S2hqqdqOLqvJ8ylmIbNwUIqQujRSouf4+eUFaXbG6F1Rbu+srlJMmxQWsiU7mOJi0nMBfM1g== -well-known-symbols@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/well-known-symbols/-/well-known-symbols-2.0.0.tgz#e9c7c07dbd132b7b84212c8174391ec1f9871ba5" - integrity sha512-ZMjC3ho+KXo0BfJb7JgtQ5IBuvnShdlACNkKkdsqBmYw3bPAaJfPeYUo6tLUaT5tG/Gkh7xkpBhKRQ9e7pyg9Q== - whatwg-encoding@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz#e7635f597fd87020858626805a2729fa7698ac53" @@ -7534,9 +7481,9 @@ why-is-node-running@^2.2.2: stackback "0.0.2" word-wrap@^1.2.3: - version "1.2.5" - resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34" - integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA== + version "1.2.3" + resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" + integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== workbox-background-sync@7.0.0: version "7.0.0"