feat: Rounding coordinates

Signed-off-by: Mark Tolmacs <mark@lazycat.hu>
This commit is contained in:
Mark Tolmacs committed 2026-09-17 19:42:56 +02:00
1 parent c0ad61c674
commit 588ac55fba
15 files changed
+536 -488

No files matched your search

+2 -1
View File
@@ -11,6 +11,7 @@
*/
import { clearAppStateForLocalStorage } from "@excalidraw/excalidraw/appState";
import { stringifyWithPrecision } from "@excalidraw/excalidraw/data/json";
import {
CANVAS_SEARCH_TAB,
DEFAULT_SIDEBAR,
@@ -89,7 +90,7 @@ const saveDataStateToLocalStorage = (
localStorage.setItem(
STORAGE_KEYS.LOCAL_STORAGE_ELEMENTS,
JSON.stringify(getNonDeletedElements(elements)),
stringifyWithPrecision(getNonDeletedElements(elements)),
);
localStorage.setItem(
STORAGE_KEYS.LOCAL_STORAGE_APP_STATE,
+2 -1
View File
@@ -1,6 +1,7 @@
import { reconcileElements } from "@excalidraw/excalidraw";
import { MIME_TYPES, toBrandedType } from "@excalidraw/common";
import { decompressData } from "@excalidraw/excalidraw/data/encode";
import { stringifyWithPrecision } from "@excalidraw/excalidraw/data/json";
import {
encryptData,
decryptData,
@@ -94,7 +95,7 @@ const encryptElements = async (
key: string,
elements: readonly ExcalidrawElement[],
): Promise<{ ciphertext: ArrayBuffer; iv: Uint8Array }> => {
const json = JSON.stringify(elements);
const json = stringifyWithPrecision(elements);
const encoded = new TextEncoder().encode(json);
const { encryptedBuffer, iv } = await encryptData(key, encoded);
+12 -2
View File
@@ -1,4 +1,4 @@
import { average } from "@excalidraw/math";
import { average, round } from "@excalidraw/math";
import type { GlobalCoord } from "@excalidraw/math";
@@ -329,11 +329,21 @@ export const viewportCoordsToSceneCoords = (
scrollX: number;
scrollY: number;
},
decimals: number = 2,
) => {
const x = (clientX - offsetLeft) / zoom.value - scrollX;
const y = (clientY - offsetTop) / zoom.value - scrollY;
return { x, y } as GlobalCoord;
if (decimals === 0) {
return toBrandedType<GlobalCoord>({ x, y });
}
const precision = Math.pow(10, decimals);
return toBrandedType<GlobalCoord>({
x: round(x, precision),
y: round(y, precision),
});
};
export const sceneCoordsToViewportCoords = (
+300 -300
View File
@@ -72,123 +72,123 @@ describe("aligning", () => {
it("aligns two objects correctly to the top", () => {
createAndSelectTwoRectangles();
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(110);
expect(API.getSelectedElements()[0].x).toBeCloseTo(0);
expect(API.getSelectedElements()[1].x).toBeCloseTo(110);
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(110);
expect(API.getSelectedElements()[0].y).toBeCloseTo(0);
expect(API.getSelectedElements()[1].y).toBeCloseTo(110);
Keyboard.withModifierKeys({ ctrl: true, shift: true }, () => {
Keyboard.keyPress(KEYS.ARROW_UP);
});
// Check if x position did not change
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(110);
expect(API.getSelectedElements()[0].x).toBeCloseTo(0);
expect(API.getSelectedElements()[1].x).toBeCloseTo(110);
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(0);
expect(API.getSelectedElements()[0].y).toBeCloseTo(0);
expect(API.getSelectedElements()[1].y).toBeCloseTo(0);
});
it("aligns two objects correctly to the bottom", () => {
createAndSelectTwoRectangles();
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(110);
expect(API.getSelectedElements()[0].x).toBeCloseTo(0);
expect(API.getSelectedElements()[1].x).toBeCloseTo(110);
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(110);
expect(API.getSelectedElements()[0].y).toBeCloseTo(0);
expect(API.getSelectedElements()[1].y).toBeCloseTo(110);
Keyboard.withModifierKeys({ ctrl: true, shift: true }, () => {
Keyboard.keyPress(KEYS.ARROW_DOWN);
});
// Check if x position did not change
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(110);
expect(API.getSelectedElements()[0].x).toBeCloseTo(0);
expect(API.getSelectedElements()[1].x).toBeCloseTo(110);
expect(API.getSelectedElements()[0].y).toEqual(110);
expect(API.getSelectedElements()[1].y).toEqual(110);
expect(API.getSelectedElements()[0].y).toBeCloseTo(110);
expect(API.getSelectedElements()[1].y).toBeCloseTo(110);
});
it("aligns two objects correctly to the left", () => {
createAndSelectTwoRectangles();
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(110);
expect(API.getSelectedElements()[0].x).toBeCloseTo(0);
expect(API.getSelectedElements()[1].x).toBeCloseTo(110);
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(110);
expect(API.getSelectedElements()[0].y).toBeCloseTo(0);
expect(API.getSelectedElements()[1].y).toBeCloseTo(110);
Keyboard.withModifierKeys({ ctrl: true, shift: true }, () => {
Keyboard.keyPress(KEYS.ARROW_LEFT);
});
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(0);
expect(API.getSelectedElements()[0].x).toBeCloseTo(0);
expect(API.getSelectedElements()[1].x).toBeCloseTo(0);
// Check if y position did not change
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(110);
expect(API.getSelectedElements()[0].y).toBeCloseTo(0);
expect(API.getSelectedElements()[1].y).toBeCloseTo(110);
});
it("aligns two objects correctly to the right", () => {
createAndSelectTwoRectangles();
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(110);
expect(API.getSelectedElements()[0].x).toBeCloseTo(0);
expect(API.getSelectedElements()[1].x).toBeCloseTo(110);
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(110);
expect(API.getSelectedElements()[0].y).toBeCloseTo(0);
expect(API.getSelectedElements()[1].y).toBeCloseTo(110);
Keyboard.withModifierKeys({ ctrl: true, shift: true }, () => {
Keyboard.keyPress(KEYS.ARROW_RIGHT);
});
expect(API.getSelectedElements()[0].x).toEqual(110);
expect(API.getSelectedElements()[1].x).toEqual(110);
expect(API.getSelectedElements()[0].x).toBeCloseTo(110);
expect(API.getSelectedElements()[1].x).toBeCloseTo(110);
// Check if y position did not change
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(110);
expect(API.getSelectedElements()[0].y).toBeCloseTo(0);
expect(API.getSelectedElements()[1].y).toBeCloseTo(110);
});
it("centers two objects with different sizes correctly vertically", () => {
createAndSelectTwoRectanglesWithDifferentSizes();
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(110);
expect(API.getSelectedElements()[0].x).toBeCloseTo(0);
expect(API.getSelectedElements()[1].x).toBeCloseTo(110);
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(110);
expect(API.getSelectedElements()[0].y).toBeCloseTo(0);
expect(API.getSelectedElements()[1].y).toBeCloseTo(110);
API.executeAction(actionAlignVerticallyCentered);
// Check if x position did not change
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(110);
expect(API.getSelectedElements()[0].x).toBeCloseTo(0);
expect(API.getSelectedElements()[1].x).toBeCloseTo(110);
expect(API.getSelectedElements()[0].y).toEqual(60);
expect(API.getSelectedElements()[1].y).toEqual(55);
expect(API.getSelectedElements()[0].y).toBeCloseTo(60);
expect(API.getSelectedElements()[1].y).toBeCloseTo(55);
});
it("centers two objects with different sizes correctly horizontally", () => {
createAndSelectTwoRectanglesWithDifferentSizes();
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(110);
expect(API.getSelectedElements()[0].x).toBeCloseTo(0);
expect(API.getSelectedElements()[1].x).toBeCloseTo(110);
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(110);
expect(API.getSelectedElements()[0].y).toBeCloseTo(0);
expect(API.getSelectedElements()[1].y).toBeCloseTo(110);
API.executeAction(actionAlignHorizontallyCentered);
expect(API.getSelectedElements()[0].x).toEqual(60);
expect(API.getSelectedElements()[1].x).toEqual(55);
expect(API.getSelectedElements()[0].x).toBeCloseTo(60);
expect(API.getSelectedElements()[1].x).toBeCloseTo(55);
// Check if y position did not change
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(110);
expect(API.getSelectedElements()[0].y).toBeCloseTo(0);
expect(API.getSelectedElements()[1].y).toBeCloseTo(110);
});
const createAndSelectGroupAndRectangle = () => {
@@ -226,85 +226,85 @@ describe("aligning", () => {
it("aligns a group with another element correctly to the top", () => {
createAndSelectGroupAndRectangle();
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[0].y).toBeCloseTo(0);
expect(API.getSelectedElements()[1].y).toBeCloseTo(100);
expect(API.getSelectedElements()[2].y).toBeCloseTo(200);
API.executeAction(actionAlignTop);
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(0);
expect(API.getSelectedElements()[0].y).toBeCloseTo(0);
expect(API.getSelectedElements()[1].y).toBeCloseTo(100);
expect(API.getSelectedElements()[2].y).toBeCloseTo(0);
});
it("aligns a group with another element correctly to the bottom", () => {
createAndSelectGroupAndRectangle();
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[0].y).toBeCloseTo(0);
expect(API.getSelectedElements()[1].y).toBeCloseTo(100);
expect(API.getSelectedElements()[2].y).toBeCloseTo(200);
API.executeAction(actionAlignBottom);
expect(API.getSelectedElements()[0].y).toEqual(100);
expect(API.getSelectedElements()[1].y).toEqual(200);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[0].y).toBeCloseTo(100);
expect(API.getSelectedElements()[1].y).toBeCloseTo(200);
expect(API.getSelectedElements()[2].y).toBeCloseTo(200);
});
it("aligns a group with another element correctly to the left", () => {
createAndSelectGroupAndRectangle();
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[0].x).toBeCloseTo(0);
expect(API.getSelectedElements()[1].x).toBeCloseTo(100);
expect(API.getSelectedElements()[2].x).toBeCloseTo(200);
API.executeAction(actionAlignLeft);
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(0);
expect(API.getSelectedElements()[0].x).toBeCloseTo(0);
expect(API.getSelectedElements()[1].x).toBeCloseTo(100);
expect(API.getSelectedElements()[2].x).toBeCloseTo(0);
});
it("aligns a group with another element correctly to the right", () => {
createAndSelectGroupAndRectangle();
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[0].x).toBeCloseTo(0);
expect(API.getSelectedElements()[1].x).toBeCloseTo(100);
expect(API.getSelectedElements()[2].x).toBeCloseTo(200);
API.executeAction(actionAlignRight);
expect(API.getSelectedElements()[0].x).toEqual(100);
expect(API.getSelectedElements()[1].x).toEqual(200);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[0].x).toBeCloseTo(100);
expect(API.getSelectedElements()[1].x).toBeCloseTo(200);
expect(API.getSelectedElements()[2].x).toBeCloseTo(200);
});
it("centers a group with another element correctly vertically", () => {
createAndSelectGroupAndRectangle();
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[0].y).toBeCloseTo(0);
expect(API.getSelectedElements()[1].y).toBeCloseTo(100);
expect(API.getSelectedElements()[2].y).toBeCloseTo(200);
API.executeAction(actionAlignVerticallyCentered);
expect(API.getSelectedElements()[0].y).toEqual(50);
expect(API.getSelectedElements()[1].y).toEqual(150);
expect(API.getSelectedElements()[2].y).toEqual(100);
expect(API.getSelectedElements()[0].y).toBeCloseTo(50);
expect(API.getSelectedElements()[1].y).toBeCloseTo(150);
expect(API.getSelectedElements()[2].y).toBeCloseTo(100);
});
it("centers a group with another element correctly horizontally", () => {
createAndSelectGroupAndRectangle();
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[0].x).toBeCloseTo(0);
expect(API.getSelectedElements()[1].x).toBeCloseTo(100);
expect(API.getSelectedElements()[2].x).toBeCloseTo(200);
API.executeAction(actionAlignHorizontallyCentered);
expect(API.getSelectedElements()[0].x).toEqual(50);
expect(API.getSelectedElements()[1].x).toEqual(150);
expect(API.getSelectedElements()[2].x).toEqual(100);
expect(API.getSelectedElements()[0].x).toBeCloseTo(50);
expect(API.getSelectedElements()[1].x).toBeCloseTo(150);
expect(API.getSelectedElements()[2].x).toBeCloseTo(100);
});
const createAndSelectTwoGroups = () => {
@@ -354,97 +354,97 @@ describe("aligning", () => {
it("aligns two groups correctly to the top", () => {
createAndSelectTwoGroups();
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300);
expect(API.getSelectedElements()[0].y).toBeCloseTo(0);
expect(API.getSelectedElements()[1].y).toBeCloseTo(100);
expect(API.getSelectedElements()[2].y).toBeCloseTo(200);
expect(API.getSelectedElements()[3].y).toBeCloseTo(300);
API.executeAction(actionAlignTop);
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(0);
expect(API.getSelectedElements()[3].y).toEqual(100);
expect(API.getSelectedElements()[0].y).toBeCloseTo(0);
expect(API.getSelectedElements()[1].y).toBeCloseTo(100);
expect(API.getSelectedElements()[2].y).toBeCloseTo(0);
expect(API.getSelectedElements()[3].y).toBeCloseTo(100);
});
it("aligns two groups correctly to the bottom", () => {
createAndSelectTwoGroups();
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300);
expect(API.getSelectedElements()[0].y).toBeCloseTo(0);
expect(API.getSelectedElements()[1].y).toBeCloseTo(100);
expect(API.getSelectedElements()[2].y).toBeCloseTo(200);
expect(API.getSelectedElements()[3].y).toBeCloseTo(300);
API.executeAction(actionAlignBottom);
expect(API.getSelectedElements()[0].y).toEqual(200);
expect(API.getSelectedElements()[1].y).toEqual(300);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300);
expect(API.getSelectedElements()[0].y).toBeCloseTo(200);
expect(API.getSelectedElements()[1].y).toBeCloseTo(300);
expect(API.getSelectedElements()[2].y).toBeCloseTo(200);
expect(API.getSelectedElements()[3].y).toBeCloseTo(300);
});
it("aligns two groups correctly to the left", () => {
createAndSelectTwoGroups();
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300);
expect(API.getSelectedElements()[0].x).toBeCloseTo(0);
expect(API.getSelectedElements()[1].x).toBeCloseTo(100);
expect(API.getSelectedElements()[2].x).toBeCloseTo(200);
expect(API.getSelectedElements()[3].x).toBeCloseTo(300);
API.executeAction(actionAlignLeft);
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(0);
expect(API.getSelectedElements()[3].x).toEqual(100);
expect(API.getSelectedElements()[0].x).toBeCloseTo(0);
expect(API.getSelectedElements()[1].x).toBeCloseTo(100);
expect(API.getSelectedElements()[2].x).toBeCloseTo(0);
expect(API.getSelectedElements()[3].x).toBeCloseTo(100);
});
it("aligns two groups correctly to the right", () => {
createAndSelectTwoGroups();
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300);
expect(API.getSelectedElements()[0].x).toBeCloseTo(0);
expect(API.getSelectedElements()[1].x).toBeCloseTo(100);
expect(API.getSelectedElements()[2].x).toBeCloseTo(200);
expect(API.getSelectedElements()[3].x).toBeCloseTo(300);
API.executeAction(actionAlignRight);
expect(API.getSelectedElements()[0].x).toEqual(200);
expect(API.getSelectedElements()[1].x).toEqual(300);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300);
expect(API.getSelectedElements()[0].x).toBeCloseTo(200);
expect(API.getSelectedElements()[1].x).toBeCloseTo(300);
expect(API.getSelectedElements()[2].x).toBeCloseTo(200);
expect(API.getSelectedElements()[3].x).toBeCloseTo(300);
});
it("centers two groups correctly vertically", () => {
createAndSelectTwoGroups();
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300);
expect(API.getSelectedElements()[0].y).toBeCloseTo(0);
expect(API.getSelectedElements()[1].y).toBeCloseTo(100);
expect(API.getSelectedElements()[2].y).toBeCloseTo(200);
expect(API.getSelectedElements()[3].y).toBeCloseTo(300);
API.executeAction(actionAlignVerticallyCentered);
expect(API.getSelectedElements()[0].y).toEqual(100);
expect(API.getSelectedElements()[1].y).toEqual(200);
expect(API.getSelectedElements()[2].y).toEqual(100);
expect(API.getSelectedElements()[3].y).toEqual(200);
expect(API.getSelectedElements()[0].y).toBeCloseTo(100);
expect(API.getSelectedElements()[1].y).toBeCloseTo(200);
expect(API.getSelectedElements()[2].y).toBeCloseTo(100);
expect(API.getSelectedElements()[3].y).toBeCloseTo(200);
});
it("centers two groups correctly horizontally", () => {
createAndSelectTwoGroups();
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300);
expect(API.getSelectedElements()[0].x).toBeCloseTo(0);
expect(API.getSelectedElements()[1].x).toBeCloseTo(100);
expect(API.getSelectedElements()[2].x).toBeCloseTo(200);
expect(API.getSelectedElements()[3].x).toBeCloseTo(300);
API.executeAction(actionAlignHorizontallyCentered);
expect(API.getSelectedElements()[0].x).toEqual(100);
expect(API.getSelectedElements()[1].x).toEqual(200);
expect(API.getSelectedElements()[2].x).toEqual(100);
expect(API.getSelectedElements()[3].x).toEqual(200);
expect(API.getSelectedElements()[0].x).toBeCloseTo(100);
expect(API.getSelectedElements()[1].x).toBeCloseTo(200);
expect(API.getSelectedElements()[2].x).toBeCloseTo(100);
expect(API.getSelectedElements()[3].x).toBeCloseTo(200);
});
const createAndSelectNestedGroupAndRectangle = () => {
@@ -497,97 +497,97 @@ describe("aligning", () => {
it("aligns nested group and other element correctly to the top", () => {
createAndSelectNestedGroupAndRectangle();
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300);
expect(API.getSelectedElements()[0].y).toBeCloseTo(0);
expect(API.getSelectedElements()[1].y).toBeCloseTo(100);
expect(API.getSelectedElements()[2].y).toBeCloseTo(200);
expect(API.getSelectedElements()[3].y).toBeCloseTo(300);
API.executeAction(actionAlignTop);
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(0);
expect(API.getSelectedElements()[0].y).toBeCloseTo(0);
expect(API.getSelectedElements()[1].y).toBeCloseTo(100);
expect(API.getSelectedElements()[2].y).toBeCloseTo(200);
expect(API.getSelectedElements()[3].y).toBeCloseTo(0);
});
it("aligns nested group and other element correctly to the bottom", () => {
createAndSelectNestedGroupAndRectangle();
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300);
expect(API.getSelectedElements()[0].y).toBeCloseTo(0);
expect(API.getSelectedElements()[1].y).toBeCloseTo(100);
expect(API.getSelectedElements()[2].y).toBeCloseTo(200);
expect(API.getSelectedElements()[3].y).toBeCloseTo(300);
API.executeAction(actionAlignBottom);
expect(API.getSelectedElements()[0].y).toEqual(100);
expect(API.getSelectedElements()[1].y).toEqual(200);
expect(API.getSelectedElements()[2].y).toEqual(300);
expect(API.getSelectedElements()[3].y).toEqual(300);
expect(API.getSelectedElements()[0].y).toBeCloseTo(100);
expect(API.getSelectedElements()[1].y).toBeCloseTo(200);
expect(API.getSelectedElements()[2].y).toBeCloseTo(300);
expect(API.getSelectedElements()[3].y).toBeCloseTo(300);
});
it("aligns nested group and other element correctly to the left", () => {
createAndSelectNestedGroupAndRectangle();
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300);
expect(API.getSelectedElements()[0].x).toBeCloseTo(0);
expect(API.getSelectedElements()[1].x).toBeCloseTo(100);
expect(API.getSelectedElements()[2].x).toBeCloseTo(200);
expect(API.getSelectedElements()[3].x).toBeCloseTo(300);
API.executeAction(actionAlignLeft);
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(0);
expect(API.getSelectedElements()[0].x).toBeCloseTo(0);
expect(API.getSelectedElements()[1].x).toBeCloseTo(100);
expect(API.getSelectedElements()[2].x).toBeCloseTo(200);
expect(API.getSelectedElements()[3].x).toBeCloseTo(0);
});
it("aligns nested group and other element correctly to the right", () => {
createAndSelectNestedGroupAndRectangle();
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300);
expect(API.getSelectedElements()[0].x).toBeCloseTo(0);
expect(API.getSelectedElements()[1].x).toBeCloseTo(100);
expect(API.getSelectedElements()[2].x).toBeCloseTo(200);
expect(API.getSelectedElements()[3].x).toBeCloseTo(300);
API.executeAction(actionAlignRight);
expect(API.getSelectedElements()[0].x).toEqual(100);
expect(API.getSelectedElements()[1].x).toEqual(200);
expect(API.getSelectedElements()[2].x).toEqual(300);
expect(API.getSelectedElements()[3].x).toEqual(300);
expect(API.getSelectedElements()[0].x).toBeCloseTo(100);
expect(API.getSelectedElements()[1].x).toBeCloseTo(200);
expect(API.getSelectedElements()[2].x).toBeCloseTo(300);
expect(API.getSelectedElements()[3].x).toBeCloseTo(300);
});
it("centers nested group and other element correctly vertically", () => {
createAndSelectNestedGroupAndRectangle();
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300);
expect(API.getSelectedElements()[0].y).toBeCloseTo(0);
expect(API.getSelectedElements()[1].y).toBeCloseTo(100);
expect(API.getSelectedElements()[2].y).toBeCloseTo(200);
expect(API.getSelectedElements()[3].y).toBeCloseTo(300);
API.executeAction(actionAlignVerticallyCentered);
expect(API.getSelectedElements()[0].y).toEqual(50);
expect(API.getSelectedElements()[1].y).toEqual(150);
expect(API.getSelectedElements()[2].y).toEqual(250);
expect(API.getSelectedElements()[3].y).toEqual(150);
expect(API.getSelectedElements()[0].y).toBeCloseTo(50);
expect(API.getSelectedElements()[1].y).toBeCloseTo(150);
expect(API.getSelectedElements()[2].y).toBeCloseTo(250);
expect(API.getSelectedElements()[3].y).toBeCloseTo(150);
});
it("centers nested group and other element correctly horizontally", () => {
createAndSelectNestedGroupAndRectangle();
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300);
expect(API.getSelectedElements()[0].x).toBeCloseTo(0);
expect(API.getSelectedElements()[1].x).toBeCloseTo(100);
expect(API.getSelectedElements()[2].x).toBeCloseTo(200);
expect(API.getSelectedElements()[3].x).toBeCloseTo(300);
API.executeAction(actionAlignHorizontallyCentered);
expect(API.getSelectedElements()[0].x).toEqual(50);
expect(API.getSelectedElements()[1].x).toEqual(150);
expect(API.getSelectedElements()[2].x).toEqual(250);
expect(API.getSelectedElements()[3].x).toEqual(150);
expect(API.getSelectedElements()[0].x).toBeCloseTo(50);
expect(API.getSelectedElements()[1].x).toBeCloseTo(150);
expect(API.getSelectedElements()[2].x).toBeCloseTo(250);
expect(API.getSelectedElements()[3].x).toBeCloseTo(150);
});
const createGroupAndSelectInEditGroupMode = () => {
@@ -622,68 +622,68 @@ describe("aligning", () => {
it("aligns elements within a group while in group edit mode correctly to the top", () => {
createGroupAndSelectInEditGroupMode();
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[0].y).toBeCloseTo(0);
expect(API.getSelectedElements()[1].y).toBeCloseTo(100);
API.executeAction(actionAlignTop);
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(0);
expect(API.getSelectedElements()[0].y).toBeCloseTo(0);
expect(API.getSelectedElements()[1].y).toBeCloseTo(0);
});
it("aligns elements within a group while in group edit mode correctly to the bottom", () => {
createGroupAndSelectInEditGroupMode();
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[0].y).toBeCloseTo(0);
expect(API.getSelectedElements()[1].y).toBeCloseTo(100);
API.executeAction(actionAlignBottom);
expect(API.getSelectedElements()[0].y).toEqual(100);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[0].y).toBeCloseTo(100);
expect(API.getSelectedElements()[1].y).toBeCloseTo(100);
});
it("aligns elements within a group while in group edit mode correctly to the left", () => {
createGroupAndSelectInEditGroupMode();
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[0].x).toBeCloseTo(0);
expect(API.getSelectedElements()[1].x).toBeCloseTo(100);
API.executeAction(actionAlignLeft);
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(0);
expect(API.getSelectedElements()[0].x).toBeCloseTo(0);
expect(API.getSelectedElements()[1].x).toBeCloseTo(0);
});
it("aligns elements within a group while in group edit mode correctly to the right", () => {
createGroupAndSelectInEditGroupMode();
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[0].x).toBeCloseTo(0);
expect(API.getSelectedElements()[1].x).toBeCloseTo(100);
API.executeAction(actionAlignRight);
expect(API.getSelectedElements()[0].x).toEqual(100);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[0].x).toBeCloseTo(100);
expect(API.getSelectedElements()[1].x).toBeCloseTo(100);
});
it("aligns elements within a group while in group edit mode correctly to the vertical center", () => {
createGroupAndSelectInEditGroupMode();
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[0].y).toBeCloseTo(0);
expect(API.getSelectedElements()[1].y).toBeCloseTo(100);
API.executeAction(actionAlignVerticallyCentered);
expect(API.getSelectedElements()[0].y).toEqual(50);
expect(API.getSelectedElements()[1].y).toEqual(50);
expect(API.getSelectedElements()[0].y).toBeCloseTo(50);
expect(API.getSelectedElements()[1].y).toBeCloseTo(50);
});
it("aligns elements within a group while in group edit mode correctly to the horizontal center", () => {
createGroupAndSelectInEditGroupMode();
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[0].x).toBeCloseTo(0);
expect(API.getSelectedElements()[1].x).toBeCloseTo(100);
API.executeAction(actionAlignHorizontallyCentered);
expect(API.getSelectedElements()[0].x).toEqual(50);
expect(API.getSelectedElements()[1].x).toEqual(50);
expect(API.getSelectedElements()[0].x).toBeCloseTo(50);
expect(API.getSelectedElements()[1].x).toBeCloseTo(50);
});
const createNestedGroupAndSelectInEditGroupMode = () => {
@@ -735,80 +735,80 @@ describe("aligning", () => {
it("aligns element and nested group while in group edit mode correctly to the top", () => {
createNestedGroupAndSelectInEditGroupMode();
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[0].y).toBeCloseTo(0);
expect(API.getSelectedElements()[1].y).toBeCloseTo(100);
expect(API.getSelectedElements()[2].y).toBeCloseTo(200);
API.executeAction(actionAlignTop);
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(0);
expect(API.getSelectedElements()[0].y).toBeCloseTo(0);
expect(API.getSelectedElements()[1].y).toBeCloseTo(100);
expect(API.getSelectedElements()[2].y).toBeCloseTo(0);
});
it("aligns element and nested group while in group edit mode correctly to the bottom", () => {
createNestedGroupAndSelectInEditGroupMode();
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[0].y).toBeCloseTo(0);
expect(API.getSelectedElements()[1].y).toBeCloseTo(100);
expect(API.getSelectedElements()[2].y).toBeCloseTo(200);
API.executeAction(actionAlignBottom);
expect(API.getSelectedElements()[0].y).toEqual(100);
expect(API.getSelectedElements()[1].y).toEqual(200);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[0].y).toBeCloseTo(100);
expect(API.getSelectedElements()[1].y).toBeCloseTo(200);
expect(API.getSelectedElements()[2].y).toBeCloseTo(200);
});
it("aligns element and nested group while in group edit mode correctly to the left", () => {
createNestedGroupAndSelectInEditGroupMode();
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[0].x).toBeCloseTo(0);
expect(API.getSelectedElements()[1].x).toBeCloseTo(100);
expect(API.getSelectedElements()[2].x).toBeCloseTo(200);
API.executeAction(actionAlignLeft);
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(0);
expect(API.getSelectedElements()[0].x).toBeCloseTo(0);
expect(API.getSelectedElements()[1].x).toBeCloseTo(100);
expect(API.getSelectedElements()[2].x).toBeCloseTo(0);
});
it("aligns element and nested group while in group edit mode correctly to the right", () => {
createNestedGroupAndSelectInEditGroupMode();
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[0].x).toBeCloseTo(0);
expect(API.getSelectedElements()[1].x).toBeCloseTo(100);
expect(API.getSelectedElements()[2].x).toBeCloseTo(200);
API.executeAction(actionAlignRight);
expect(API.getSelectedElements()[0].x).toEqual(100);
expect(API.getSelectedElements()[1].x).toEqual(200);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[0].x).toBeCloseTo(100);
expect(API.getSelectedElements()[1].x).toBeCloseTo(200);
expect(API.getSelectedElements()[2].x).toBeCloseTo(200);
});
it("aligns element and nested group while in group edit mode correctly to the vertical center", () => {
createNestedGroupAndSelectInEditGroupMode();
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[0].y).toBeCloseTo(0);
expect(API.getSelectedElements()[1].y).toBeCloseTo(100);
expect(API.getSelectedElements()[2].y).toBeCloseTo(200);
API.executeAction(actionAlignVerticallyCentered);
expect(API.getSelectedElements()[0].y).toEqual(50);
expect(API.getSelectedElements()[1].y).toEqual(150);
expect(API.getSelectedElements()[2].y).toEqual(100);
expect(API.getSelectedElements()[0].y).toBeCloseTo(50);
expect(API.getSelectedElements()[1].y).toBeCloseTo(150);
expect(API.getSelectedElements()[2].y).toBeCloseTo(100);
});
it("aligns elements and nested group within a group while in group edit mode correctly to the horizontal center", () => {
createNestedGroupAndSelectInEditGroupMode();
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[0].x).toBeCloseTo(0);
expect(API.getSelectedElements()[1].x).toBeCloseTo(100);
expect(API.getSelectedElements()[2].x).toBeCloseTo(200);
API.executeAction(actionAlignHorizontallyCentered);
expect(API.getSelectedElements()[0].x).toEqual(50);
expect(API.getSelectedElements()[1].x).toEqual(150);
expect(API.getSelectedElements()[2].x).toEqual(100);
expect(API.getSelectedElements()[0].x).toBeCloseTo(50);
expect(API.getSelectedElements()[1].x).toBeCloseTo(150);
expect(API.getSelectedElements()[2].x).toBeCloseTo(100);
});
const createAndSelectSingleGroup = () => {
@@ -834,68 +834,68 @@ describe("aligning", () => {
it("aligns elements within a single-selected group correctly to the top", () => {
createAndSelectSingleGroup();
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[0].y).toBeCloseTo(0);
expect(API.getSelectedElements()[1].y).toBeCloseTo(100);
API.executeAction(actionAlignTop);
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(0);
expect(API.getSelectedElements()[0].y).toBeCloseTo(0);
expect(API.getSelectedElements()[1].y).toBeCloseTo(0);
});
it("aligns elements within a single-selected group correctly to the bottom", () => {
createAndSelectSingleGroup();
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[0].y).toBeCloseTo(0);
expect(API.getSelectedElements()[1].y).toBeCloseTo(100);
API.executeAction(actionAlignBottom);
expect(API.getSelectedElements()[0].y).toEqual(100);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[0].y).toBeCloseTo(100);
expect(API.getSelectedElements()[1].y).toBeCloseTo(100);
});
it("aligns elements within a single-selected group correctly to the left", () => {
createAndSelectSingleGroup();
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[0].x).toBeCloseTo(0);
expect(API.getSelectedElements()[1].x).toBeCloseTo(100);
API.executeAction(actionAlignLeft);
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(0);
expect(API.getSelectedElements()[0].x).toBeCloseTo(0);
expect(API.getSelectedElements()[1].x).toBeCloseTo(0);
});
it("aligns elements within a single-selected group correctly to the right", () => {
createAndSelectSingleGroup();
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[0].x).toBeCloseTo(0);
expect(API.getSelectedElements()[1].x).toBeCloseTo(100);
API.executeAction(actionAlignRight);
expect(API.getSelectedElements()[0].x).toEqual(100);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[0].x).toBeCloseTo(100);
expect(API.getSelectedElements()[1].x).toBeCloseTo(100);
});
it("aligns elements within a single-selected group correctly to the vertical center", () => {
createAndSelectSingleGroup();
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[0].y).toBeCloseTo(0);
expect(API.getSelectedElements()[1].y).toBeCloseTo(100);
API.executeAction(actionAlignVerticallyCentered);
expect(API.getSelectedElements()[0].y).toEqual(50);
expect(API.getSelectedElements()[1].y).toEqual(50);
expect(API.getSelectedElements()[0].y).toBeCloseTo(50);
expect(API.getSelectedElements()[1].y).toBeCloseTo(50);
});
it("aligns elements within a single-selected group correctly to the horizontal center", () => {
createAndSelectSingleGroup();
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[0].x).toBeCloseTo(0);
expect(API.getSelectedElements()[1].x).toBeCloseTo(100);
API.executeAction(actionAlignHorizontallyCentered);
expect(API.getSelectedElements()[0].x).toEqual(50);
expect(API.getSelectedElements()[1].x).toEqual(50);
expect(API.getSelectedElements()[0].x).toBeCloseTo(50);
expect(API.getSelectedElements()[1].x).toBeCloseTo(50);
});
const createAndSelectSingleGroupWithNestedGroup = () => {
@@ -934,80 +934,80 @@ describe("aligning", () => {
it("aligns elements within a single-selected group containing a nested group correctly to the top", () => {
createAndSelectSingleGroupWithNestedGroup();
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[0].y).toBeCloseTo(0);
expect(API.getSelectedElements()[1].y).toBeCloseTo(100);
expect(API.getSelectedElements()[2].y).toBeCloseTo(200);
API.executeAction(actionAlignTop);
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(0);
expect(API.getSelectedElements()[0].y).toBeCloseTo(0);
expect(API.getSelectedElements()[1].y).toBeCloseTo(100);
expect(API.getSelectedElements()[2].y).toBeCloseTo(0);
});
it("aligns elements within a single-selected group containing a nested group correctly to the bottom", () => {
createAndSelectSingleGroupWithNestedGroup();
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[0].y).toBeCloseTo(0);
expect(API.getSelectedElements()[1].y).toBeCloseTo(100);
expect(API.getSelectedElements()[2].y).toBeCloseTo(200);
API.executeAction(actionAlignBottom);
expect(API.getSelectedElements()[0].y).toEqual(100);
expect(API.getSelectedElements()[1].y).toEqual(200);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[0].y).toBeCloseTo(100);
expect(API.getSelectedElements()[1].y).toBeCloseTo(200);
expect(API.getSelectedElements()[2].y).toBeCloseTo(200);
});
it("aligns elements within a single-selected group containing a nested group correctly to the left", () => {
createAndSelectSingleGroupWithNestedGroup();
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[0].x).toBeCloseTo(0);
expect(API.getSelectedElements()[1].x).toBeCloseTo(100);
expect(API.getSelectedElements()[2].x).toBeCloseTo(200);
API.executeAction(actionAlignLeft);
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(0);
expect(API.getSelectedElements()[0].x).toBeCloseTo(0);
expect(API.getSelectedElements()[1].x).toBeCloseTo(100);
expect(API.getSelectedElements()[2].x).toBeCloseTo(0);
});
it("aligns elements within a single-selected group containing a nested group correctly to the right", () => {
createAndSelectSingleGroupWithNestedGroup();
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[0].x).toBeCloseTo(0);
expect(API.getSelectedElements()[1].x).toBeCloseTo(100);
expect(API.getSelectedElements()[2].x).toBeCloseTo(200);
API.executeAction(actionAlignRight);
expect(API.getSelectedElements()[0].x).toEqual(100);
expect(API.getSelectedElements()[1].x).toEqual(200);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[0].x).toBeCloseTo(100);
expect(API.getSelectedElements()[1].x).toBeCloseTo(200);
expect(API.getSelectedElements()[2].x).toBeCloseTo(200);
});
it("aligns elements within a single-selected group containing a nested group correctly to the vertical center", () => {
createAndSelectSingleGroupWithNestedGroup();
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[0].y).toBeCloseTo(0);
expect(API.getSelectedElements()[1].y).toBeCloseTo(100);
expect(API.getSelectedElements()[2].y).toBeCloseTo(200);
API.executeAction(actionAlignVerticallyCentered);
expect(API.getSelectedElements()[0].y).toEqual(50);
expect(API.getSelectedElements()[1].y).toEqual(150);
expect(API.getSelectedElements()[2].y).toEqual(100);
expect(API.getSelectedElements()[0].y).toBeCloseTo(50);
expect(API.getSelectedElements()[1].y).toBeCloseTo(150);
expect(API.getSelectedElements()[2].y).toBeCloseTo(100);
});
it("aligns elements within a single-selected group containing a nested group correctly to the horizontal center", () => {
createAndSelectSingleGroupWithNestedGroup();
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[0].x).toBeCloseTo(0);
expect(API.getSelectedElements()[1].x).toBeCloseTo(100);
expect(API.getSelectedElements()[2].x).toBeCloseTo(200);
API.executeAction(actionAlignHorizontallyCentered);
expect(API.getSelectedElements()[0].x).toEqual(50);
expect(API.getSelectedElements()[1].x).toEqual(150);
expect(API.getSelectedElements()[2].x).toEqual(100);
expect(API.getSelectedElements()[0].x).toBeCloseTo(50);
expect(API.getSelectedElements()[1].x).toBeCloseTo(150);
expect(API.getSelectedElements()[2].x).toBeCloseTo(100);
});
const createAndSelectGroupWithBoundTextAndRectangle = () => {
+24 -24
View File
@@ -76,53 +76,53 @@ describe("distributing", () => {
it("should distribute selected elements horizontally", async () => {
createAndSelectThreeRectanglesWithGap();
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(10);
expect(API.getSelectedElements()[2].x).toEqual(300);
expect(API.getSelectedElements()[0].x).toBeCloseTo(0);
expect(API.getSelectedElements()[1].x).toBeCloseTo(10);
expect(API.getSelectedElements()[2].x).toBeCloseTo(300);
API.executeAction(distributeHorizontally);
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(150);
expect(API.getSelectedElements()[2].x).toEqual(300);
expect(API.getSelectedElements()[0].x).toBeCloseTo(0);
expect(API.getSelectedElements()[1].x).toBeCloseTo(150);
expect(API.getSelectedElements()[2].x).toBeCloseTo(300);
});
it("should distribute selected elements vertically", async () => {
createAndSelectThreeRectanglesWithGap();
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(10);
expect(API.getSelectedElements()[2].y).toEqual(300);
expect(API.getSelectedElements()[0].y).toBeCloseTo(0);
expect(API.getSelectedElements()[1].y).toBeCloseTo(10);
expect(API.getSelectedElements()[2].y).toBeCloseTo(300);
API.executeAction(distributeVertically);
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(150);
expect(API.getSelectedElements()[2].y).toEqual(300);
expect(API.getSelectedElements()[0].y).toBeCloseTo(0);
expect(API.getSelectedElements()[1].y).toBeCloseTo(150);
expect(API.getSelectedElements()[2].y).toBeCloseTo(300);
});
it("should distribute selected elements horizontally based on their centers", async () => {
createAndSelectThreeRectanglesWithoutGap();
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(10);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[0].x).toBeCloseTo(0);
expect(API.getSelectedElements()[1].x).toBeCloseTo(10);
expect(API.getSelectedElements()[2].x).toBeCloseTo(200);
API.executeAction(distributeHorizontally);
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(50);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[0].x).toBeCloseTo(0);
expect(API.getSelectedElements()[1].x).toBeCloseTo(50);
expect(API.getSelectedElements()[2].x).toBeCloseTo(200);
});
it("should distribute selected elements vertically with based on their centers", async () => {
createAndSelectThreeRectanglesWithoutGap();
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(10);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[0].y).toBeCloseTo(0);
expect(API.getSelectedElements()[1].y).toBeCloseTo(10);
expect(API.getSelectedElements()[2].y).toBeCloseTo(200);
API.executeAction(distributeVertically);
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(50);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[0].y).toBeCloseTo(0);
expect(API.getSelectedElements()[1].y).toBeCloseTo(50);
expect(API.getSelectedElements()[2].y).toBeCloseTo(200);
});
});
@@ -1533,8 +1533,8 @@ describe("Test Linear Elements", () => {
expect(arrow.endBinding?.elementId).toBe(rect.id);
expect(arrow.width).toBeCloseTo(404);
expect(rect.x).toBe(400);
expect(rect.y).toBe(0);
expect(rect.x).toBeCloseTo(400);
expect(rect.y).toBeCloseTo(0);
expect(
wrapText(
textElement.originalText,
@@ -1555,9 +1555,8 @@ describe("Test Linear Elements", () => {
expect(rect.x).toBe(200);
expect(rect.y).toBe(0);
expect(handleBindTextResizeSpy).toHaveBeenCalledWith(
h.elements[0],
h.elements[1],
h.app.scene,
"nw",
false,
false,
false,
+3 -1
View File
@@ -26,6 +26,8 @@ import type {
NonDeletedExcalidrawElement,
} from "@excalidraw/element/types";
import { stringifyWithPrecision } from "./data/json";
import { ExcalidrawError } from "./errors";
import {
createFile,
@@ -189,7 +191,7 @@ export const serializeAsClipboardJSON = ({
files: files ? _files : undefined,
};
return JSON.stringify(contents);
return stringifyWithPrecision(contents);
};
export const copyToClipboard = async (
+37 -2
View File
@@ -22,6 +22,41 @@ import type {
ImportedLibraryData,
} from "./types";
const SCALAR_ROUNDED_KEYS = new Set(["x", "y", "width", "height"]);
// JSON.stringify encodes \x00 as \u0000 (6-char literal sequence) in the output
// string. We use this as a sentinel so we can strip the surrounding quotes
// afterward, emitting raw number tokens without a float round-trip.
const PRECISION_SENTINEL = "\x00";
const PRECISION_SENTINEL_RE = /"\\u0000([^"]+)\\u0000"/g;
export const stringifyWithPrecision = (
value: unknown,
precision = 2,
space?: number | string,
): string => {
const fmt = (n: number) =>
`${PRECISION_SENTINEL}${n.toFixed(precision)}${PRECISION_SENTINEL}`;
return JSON.stringify(
value,
(key, val) => {
if (SCALAR_ROUNDED_KEYS.has(key) && typeof val === "number") {
return fmt(val);
}
if (key === "points" && Array.isArray(val)) {
return (val as number[][]).map((pt) =>
Array.isArray(pt)
? pt.map((n) => (typeof n === "number" ? fmt(n) : n))
: pt,
);
}
return val;
},
space,
).replace(PRECISION_SENTINEL_RE, "$1");
};
export type JSONExportData = {
elements: readonly ExcalidrawElement[];
appState: AppState;
@@ -71,7 +106,7 @@ export const serializeAsJSON = (
undefined,
};
return JSON.stringify(data, null, 2);
return stringifyWithPrecision(data, 2, 2);
};
export const saveAsJSON = async ({
@@ -141,7 +176,7 @@ export const serializeLibraryAsJSON = (libraryItems: LibraryItems) => {
source: getExportSource(),
libraryItems,
};
return JSON.stringify(data, null, 2);
return stringifyWithPrecision(data, 2, 2);
};
export const saveLibraryAsJSON = async (libraryItems: LibraryItems) => {
@@ -1503,7 +1503,7 @@ exports[`contextMenu element > selecting 'Bring forward' in context menu brings
"versionNonce": 493213705,
"width": 20,
"x": -10,
"y": 0,
"y": "0.00000",
}
`;
@@ -1556,7 +1556,7 @@ exports[`contextMenu element > selecting 'Bring forward' in context menu brings
"version": 3,
"width": 20,
"x": -10,
"y": 0,
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -1849,7 +1849,7 @@ exports[`contextMenu element > selecting 'Bring to front' in context menu brings
"versionNonce": 493213705,
"width": 20,
"x": -10,
"y": 0,
"y": "0.00000",
}
`;
@@ -1902,7 +1902,7 @@ exports[`contextMenu element > selecting 'Bring to front' in context menu brings
"version": 3,
"width": 20,
"x": -10,
"y": 0,
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -2584,7 +2584,7 @@ exports[`contextMenu element > selecting 'Duplicate' in context menu duplicates
"scrollConstraints": null,
"scrollX": 0,
"scrollY": 0,
"scrolledOutside": false,
"scrolledOutside": true,
"searchMatches": null,
"selectedElementIds": {
"id3": true,
@@ -2963,7 +2963,7 @@ exports[`contextMenu element > selecting 'Group selection' in context menu group
"versionNonce": 915032327,
"width": 20,
"x": -10,
"y": 0,
"y": "0.00000",
}
`;
@@ -3051,7 +3051,7 @@ exports[`contextMenu element > selecting 'Group selection' in context menu group
"version": 3,
"width": 20,
"x": -10,
"y": 0,
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -3345,7 +3345,7 @@ exports[`contextMenu element > selecting 'Paste styles' in context menu pastes s
"versionNonce": 1349943049,
"width": 20,
"x": -10,
"y": 0,
"y": "0.00000",
}
`;
@@ -3431,7 +3431,7 @@ exports[`contextMenu element > selecting 'Paste styles' in context menu pastes s
"version": 3,
"width": 20,
"x": -10,
"y": 0,
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -3911,7 +3911,7 @@ exports[`contextMenu element > selecting 'Send backward' in context menu sends e
"versionNonce": 2019559783,
"width": 20,
"x": -10,
"y": 0,
"y": "0.00000",
}
`;
@@ -3964,7 +3964,7 @@ exports[`contextMenu element > selecting 'Send backward' in context menu sends e
"version": 3,
"width": 20,
"x": -10,
"y": 0,
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -4249,7 +4249,7 @@ exports[`contextMenu element > selecting 'Send to back' in context menu sends el
"versionNonce": 2019559783,
"width": 20,
"x": -10,
"y": 0,
"y": "0.00000",
}
`;
@@ -4302,7 +4302,7 @@ exports[`contextMenu element > selecting 'Send to back' in context menu sends el
"version": 3,
"width": 20,
"x": -10,
"y": 0,
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -4557,7 +4557,7 @@ exports[`contextMenu element > selecting 'Ungroup selection' in context menu ung
"versionNonce": 1006504105,
"width": 20,
"x": -10,
"y": 0,
"y": "0.00000",
}
`;
@@ -4643,7 +4643,7 @@ exports[`contextMenu element > selecting 'Ungroup selection' in context menu ung
"version": 3,
"width": 20,
"x": -10,
"y": 0,
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -5857,7 +5857,7 @@ exports[`contextMenu element > shows 'Group selection' in context menu for multi
"versionNonce": 1150084233,
"width": 10,
"x": -10,
"y": 0,
"y": "0.00000",
}
`;
@@ -5890,7 +5890,7 @@ exports[`contextMenu element > shows 'Group selection' in context menu for multi
"versionNonce": 23633383,
"width": 10,
"x": 12,
"y": 0,
"y": "0.00000",
}
`;
@@ -5943,7 +5943,7 @@ exports[`contextMenu element > shows 'Group selection' in context menu for multi
"version": 3,
"width": 10,
"x": -10,
"y": 0,
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -5998,7 +5998,7 @@ exports[`contextMenu element > shows 'Group selection' in context menu for multi
"version": 3,
"width": 10,
"x": 12,
"y": 0,
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -7093,7 +7093,7 @@ exports[`contextMenu element > shows 'Ungroup selection' in context menu for gro
"versionNonce": 1723083209,
"width": 10,
"x": -10,
"y": 0,
"y": "0.00000",
}
`;
@@ -7128,7 +7128,7 @@ exports[`contextMenu element > shows 'Ungroup selection' in context menu for gro
"versionNonce": 760410951,
"width": 10,
"x": 12,
"y": 0,
"y": "0.00000",
}
`;
@@ -7181,7 +7181,7 @@ exports[`contextMenu element > shows 'Ungroup selection' in context menu for gro
"version": 3,
"width": 10,
"x": -10,
"y": 0,
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -7236,7 +7236,7 @@ exports[`contextMenu element > shows 'Ungroup selection' in context menu for gro
"version": 3,
"width": 10,
"x": 12,
"y": 0,
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -1,7 +1,7 @@
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
exports[`export > export svg-embedded scene > svg-embdedded scene export output 1`] = `
"<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" width="36" height="36"><!-- svg-source:excalidraw --><metadata><!-- payload-type:application/vnd.excalidraw+json --><!-- payload-version:2 --><!-- payload-start -->eyJ2ZXJzaW9uIjoiMSIsImVuY29kaW5nIjoiYnN0cmluZyIsImNvbXByZXNzZWQiOnRydWUsImVuY29kZWQiOiJ4nHVTwY7TMFx1MDAxML3zXHUwMDE1UfaK2LRcYlx1MDAwZb3twq7Yw1wiRJE4IFx1MDAwZW48TUZ1bcuebFuqSnxcdTAwMDY3fpFPYOyEuE6XVorkN555b96Mjy+KoqSDhXJRlLCvhULpxK58XHUwMDE58CdwXHUwMDFljebQPJ696VxcXHUwMDFkb7ZEdnF9rVxmJ7TG0+J1VVV9XHUwMDEyKNiCJs/XvvG5KI7xy1x1MDAxMZQh9SZei8A/XoI9JXTPUDWeXHUwMDBl2WmHklpGZm9HqFx1MDAwNWxayjGhXHUwMDFiXHUwMDA1WaInZzbwzijjXHUwMDAy49VcZsI/ka5EvWmc6bRcdTAwMWPvkFx1MDAxM9pb4biZdG+NSi3pXHUwMDEwq7NcdTAwMWbsVjnh+DpInE/w/2UxadNq8MGw2YhcdTAwMWEraqTQ/KxKXVx1MDAwNIX2QUZvvydNTmzhIZirO6VGXHUwMDE4tYT9XHUwMDE0jC1cdTAwMGVsWcBcdTAwMDPITEFcdTAwMWH+XHUwMDA19tHoOrdcdTAwMTf9e547xVx1MDAxMmuhPCRjXHUwMDAz4V3aiYy0s1LQhLd2cIEp1JtpLu/e5lx1MDAxOb64S+zyn9+/fp6NzWha4o8gel6dXHLdw32KZOVDxr3YolxuM3iTlb9R2Fx1MDAwNF9KXHUwMDA167PVYHNcYvk9jGEyNkVrridQg7tcdTAwMWOUcdigXHUwMDE26suz0kVH5jP4XlwiuVx1MDAwZc5dgVx1MDAwZuP2v5onlUqsQH0yXHUwMDFlqZ9goIuxXHUwMDEzf+PilMLaJbHRXHUwMDFj7Vx1MDAxZigvXHUwMDE3yolHPUZgk1x1MDAwN1x1MDAxMXo0XHUwMDEy7rRYqelcdTAwMDDKJ4Td7eVbulrH39DVMLvHTlx1MDAxMS55b+ogMyzHMeg7RX380GCATn9cdTAwMDFWrz23In0=<!-- payload-end --></metadata><defs><style class="style-fonts">
"<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" width="36" height="36"><!-- svg-source:excalidraw --><metadata><!-- payload-type:application/vnd.excalidraw+json --><!-- payload-version:2 --><!-- payload-start -->eyJ2ZXJzaW9uIjoiMSIsImVuY29kaW5nIjoiYnN0cmluZyIsImNvbXByZXNzZWQiOnRydWUsImVuY29kZWQiOiJ4nHVTTY/TMFx1MDAxML3zK6LsXHUwMDE17aZFcOhtgV2xh0WIXCJxQFx1MDAxY9x4mozq2pY92bZUlfhcdTAwMTnc+Iv8XHUwMDA0xk6I87EkUqS88cx7fjNzfpFlOZ0s5Kssh2MpXHUwMDE0SidcdTAwMGX5y4A/gfNoNIeW8d+bxpXxZE1kVzc3ynBCbTytXlx1MDAxNUXRJoGCPWjyfOxcdTAwMWL/Z9k5fjmCMqTexmNcdTAwMTH4x0twpIRcdTAwMWVcdTAwMTkqrouiXHUwMDA3TlPggJJqXHUwMDA2XHUwMDE3b4ZoXHJY1TSDha5UYEmIJ2d28M4o41x1MDAwMvvVXHUwMDAywptcdTAwMDRsRLmrnGm07M+QXHUwMDEz2lvh+GLp3Fx1MDAxNpVa0ylWZ2/YuXzC8bVcdTAwMTO6nOD/y2LSqtbgg3mLXHUwMDFlNVaUSMGFxeBeQaF9kNHn70mTXHUwMDEze3hcYkbrRqlcdTAwMWVGLeE4XHUwMDA141x1MDAxNTu2UcBcdTAwMDPIkYI0XGIz7KPR5dhe9O95XHUwMDA2KJbYXG7lIVx1MDAxOVx1MDAxYlxi79J8jEhcdTAwMWIrXHUwMDA1TXhLXHUwMDA3M0yh3k1zeVx1MDAwZXfP8MW5Ypf//P71c9A2o2mNP4LoZTFouof7XHUwMDE0XHUwMDE5lVx1MDAwZlx1MDAxOfdijyr04PWo/K3CKviSK9hcdTAwMGVGg80h5N3ow2RsipZcXE+gXHUwMDA2N2+UcVihXHUwMDE26suz0kVD5jP4VlwiuVx1MDAwNoauwId+XHUwMDAxrpdJpVx1MDAxMlx1MDAxYlCfjEdqO1x1MDAxOOhi7MLfODi5sHZNbDRH22Xl4UI58ajFXGJs8iBCj0bCnVx1MDAxNlx1MDAxYjVtQP6EcHg736WrbXy6W3W9e2xcdTAwMTThmuemXGYyw3Ccg75L1MeLXHUwMDA2XHUwMDFkdPlcdTAwMGI5jz/vIn0=<!-- payload-end --></metadata><defs><style class="style-fonts">
</style></defs><rect x="0" y="0" width="36" height="36" fill="#ffffff"></rect><g transform="translate(10 10) rotate(0 8 8)" data-id="A"><text x="0" y="17.619999999999997" font-family="Excalifont, Xiaolai, sans-serif, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">😀</text></g></svg>"
`;
@@ -240,8 +240,8 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
"updated": 1,
"version": 22,
"width": "94.00000",
"x": 0,
"y": 0,
"x": "0.00000",
"y": "0.00000",
}
`;
@@ -456,8 +456,8 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
"startBinding": null,
"version": 22,
"width": "94.00000",
"x": 0,
"y": 0,
"x": "0.00000",
"y": "0.00000",
},
"inserted": {
"height": "105.58874",
@@ -635,8 +635,8 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
"type": "arrow",
"version": 4,
"width": 100,
"x": 0,
"y": 0,
"x": "0.00000",
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -885,7 +885,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
"version": 25,
"width": 100,
"x": 150,
"y": 0,
"y": "0.00000",
}
`;
@@ -1035,7 +1035,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
"version": 25,
"width": 100,
"x": 150,
"y": 0,
"y": "0.00000",
},
"inserted": {
"height": "0.01000",
@@ -1213,8 +1213,8 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
"type": "arrow",
"version": 4,
"width": 100,
"x": 0,
"y": 0,
"x": "0.00000",
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -6611,7 +6611,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
"version": 3,
"width": 10,
"x": 10,
"y": 0,
"y": "0.00000",
}
`;
@@ -6642,7 +6642,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
"version": 9,
"width": 10,
"x": 20,
"y": 0,
"y": "0.00000",
}
`;
@@ -6726,7 +6726,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
"version": 3,
"width": 10,
"x": 10,
"y": 0,
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -6782,7 +6782,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
"version": 8,
"width": 10,
"x": 20,
"y": 0,
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -7787,8 +7787,8 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
"updated": 1,
"version": 7,
"width": 10,
"x": 0,
"y": 0,
"x": "0.00000",
"y": "0.00000",
}
`;
@@ -7863,8 +7863,8 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
"type": "arrow",
"version": 7,
"width": 10,
"x": 0,
"y": 0,
"x": "0.00000",
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -8076,7 +8076,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
"version": 9,
"width": 10,
"x": 10,
"y": 0,
"y": "0.00000",
}
`;
@@ -8130,7 +8130,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
"version": 8,
"width": 10,
"x": 10,
"y": 0,
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -10060,7 +10060,7 @@ exports[`history > multiplayer undo/redo > should not override remote changes on
"version": 7,
"width": 10,
"x": 10,
"y": 0,
"y": "0.00000",
}
`;
@@ -10172,7 +10172,7 @@ exports[`history > multiplayer undo/redo > should not override remote changes on
"version": 3,
"width": 10,
"x": 10,
"y": 0,
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -10339,7 +10339,7 @@ exports[`history > multiplayer undo/redo > should not override remote changes on
"version": 7,
"width": 10,
"x": 10,
"y": 0,
"y": "0.00000",
}
`;
@@ -10392,7 +10392,7 @@ exports[`history > multiplayer undo/redo > should not override remote changes on
"version": 3,
"width": 10,
"x": 10,
"y": 0,
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -10924,8 +10924,8 @@ exports[`history > multiplayer undo/redo > should override remotely added points
"updated": 1,
"version": 10,
"width": 30,
"x": 0,
"y": 0,
"x": "0.00000",
"y": "0.00000",
}
`;
@@ -10999,8 +10999,8 @@ exports[`history > multiplayer undo/redo > should override remotely added points
"type": "arrow",
"version": 9,
"width": 10,
"x": 0,
"y": 0,
"x": "0.00000",
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -11224,7 +11224,7 @@ exports[`history > multiplayer undo/redo > should redistribute deltas when eleme
"version": 9,
"width": 10,
"x": 10,
"y": 0,
"y": "0.00000",
}
`;
@@ -11277,7 +11277,7 @@ exports[`history > multiplayer undo/redo > should redistribute deltas when eleme
"version": 8,
"width": 10,
"x": 10,
"y": 0,
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -12417,7 +12417,7 @@ exports[`history > multiplayer undo/redo > should update history entries after r
"version": 13,
"width": 10,
"x": 10,
"y": 0,
"y": "0.00000",
}
`;
@@ -12523,7 +12523,7 @@ exports[`history > multiplayer undo/redo > should update history entries after r
"version": 3,
"width": 10,
"x": 10,
"y": 0,
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -12718,8 +12718,8 @@ exports[`history > singleplayer undo/redo > remounting undo/redo buttons should
"updated": 1,
"version": 4,
"width": 10,
"x": 0,
"y": 0,
"x": "0.00000",
"y": "0.00000",
}
`;
@@ -12772,8 +12772,8 @@ exports[`history > singleplayer undo/redo > remounting undo/redo buttons should
"type": "rectangle",
"version": 3,
"width": 10,
"x": 0,
"y": 0,
"x": "0.00000",
"y": "0.00000",
},
},
},
@@ -12939,7 +12939,7 @@ exports[`history > singleplayer undo/redo > should clear the redo stack on eleme
"version": 4,
"width": 10,
"x": 10,
"y": 0,
"y": "0.00000",
}
`;
@@ -12970,7 +12970,7 @@ exports[`history > singleplayer undo/redo > should clear the redo stack on eleme
"version": 3,
"width": 10,
"x": 20,
"y": 0,
"y": "0.00000",
}
`;
@@ -13023,7 +13023,7 @@ exports[`history > singleplayer undo/redo > should clear the redo stack on eleme
"version": 3,
"width": 10,
"x": 20,
"y": 0,
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -13611,8 +13611,8 @@ exports[`history > singleplayer undo/redo > should create new history entry on e
"updated": 1,
"version": 4,
"width": 560,
"x": 0,
"y": 0,
"x": "0.00000",
"y": "0.00000",
}
`;
@@ -13664,8 +13664,8 @@ exports[`history > singleplayer undo/redo > should create new history entry on e
"type": "embeddable",
"version": 4,
"width": 560,
"x": 0,
"y": 0,
"x": "0.00000",
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -13831,8 +13831,8 @@ exports[`history > singleplayer undo/redo > should create new history entry on e
"updated": 1,
"version": 4,
"width": 560,
"x": 0,
"y": 0,
"x": "0.00000",
"y": "0.00000",
}
`;
@@ -13884,8 +13884,8 @@ exports[`history > singleplayer undo/redo > should create new history entry on e
"type": "embeddable",
"version": 4,
"width": 560,
"x": 0,
"y": 0,
"x": "0.00000",
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -14970,8 +14970,8 @@ exports[`history > singleplayer undo/redo > should disable undo/redo buttons whe
"updated": 1,
"version": 5,
"width": 10,
"x": 0,
"y": 0,
"x": "0.00000",
"y": "0.00000",
}
`;
@@ -15023,8 +15023,8 @@ exports[`history > singleplayer undo/redo > should disable undo/redo buttons whe
"type": "rectangle",
"version": 5,
"width": 10,
"x": 0,
"y": 0,
"x": "0.00000",
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -15221,8 +15221,8 @@ exports[`history > singleplayer undo/redo > should end up with no history entry
"updated": 1,
"version": 5,
"width": 10,
"x": 0,
"y": 0,
"x": "0.00000",
"y": "0.00000",
}
`;
@@ -15274,8 +15274,8 @@ exports[`history > singleplayer undo/redo > should end up with no history entry
"type": "rectangle",
"version": 5,
"width": 10,
"x": 0,
"y": 0,
"x": "0.00000",
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -15442,7 +15442,7 @@ exports[`history > singleplayer undo/redo > should iterate through the history w
"version": 4,
"width": 10,
"x": 10,
"y": 0,
"y": "0.00000",
}
`;
@@ -15536,7 +15536,7 @@ exports[`history > singleplayer undo/redo > should iterate through the history w
"version": 3,
"width": 10,
"x": 10,
"y": 0,
"y": "0.00000",
},
},
},
@@ -15702,7 +15702,7 @@ exports[`history > singleplayer undo/redo > should not clear the redo stack on s
"version": 3,
"width": 10,
"x": 10,
"y": 0,
"y": "0.00000",
}
`;
@@ -15733,7 +15733,7 @@ exports[`history > singleplayer undo/redo > should not clear the redo stack on s
"version": 5,
"width": 10,
"x": 20,
"y": 0,
"y": "0.00000",
}
`;
@@ -15786,7 +15786,7 @@ exports[`history > singleplayer undo/redo > should not clear the redo stack on s
"version": 3,
"width": 10,
"x": 10,
"y": 0,
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -15881,7 +15881,7 @@ exports[`history > singleplayer undo/redo > should not clear the redo stack on s
"version": 5,
"width": 10,
"x": 20,
"y": 0,
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -16974,7 +16974,7 @@ exports[`history > singleplayer undo/redo > should not override appstate changes
"version": 11,
"width": 10,
"x": 10,
"y": 0,
"y": "0.00000",
}
`;
@@ -17100,7 +17100,7 @@ exports[`history > singleplayer undo/redo > should not override appstate changes
"version": 3,
"width": 10,
"x": 10,
"y": 0,
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -21146,7 +21146,7 @@ exports[`history > singleplayer undo/redo > should support changes in elements'
"version": 7,
"width": 10,
"x": 10,
"y": 0,
"y": "0.00000",
}
`;
@@ -21230,7 +21230,7 @@ exports[`history > singleplayer undo/redo > should support changes in elements'
"version": 3,
"width": 10,
"x": 10,
"y": 0,
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -22141,7 +22141,7 @@ exports[`history > singleplayer undo/redo > should support element creation, del
"version": 5,
"width": 10,
"x": 10,
"y": 0,
"y": "0.00000",
}
`;
@@ -22256,7 +22256,7 @@ exports[`history > singleplayer undo/redo > should support element creation, del
"version": 5,
"width": 10,
"x": 10,
"y": 0,
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -22639,8 +22639,8 @@ exports[`history > singleplayer undo/redo > should support linear element creati
"updated": 1,
"version": 12,
"width": 20,
"x": 0,
"y": 0,
"x": "0.00000",
"y": "0.00000",
}
`;
@@ -22714,8 +22714,8 @@ exports[`history > singleplayer undo/redo > should support linear element creati
"type": "arrow",
"version": 10,
"width": 10,
"x": 0,
"y": 0,
"x": "0.00000",
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -132,8 +132,8 @@ exports[`move element > rectangles with binding arrow 5`] = `
"version": 4,
"versionNonce": 760410951,
"width": 100,
"x": 0,
"y": 0,
"x": "0.00000",
"y": "0.00000",
}
`;
@@ -183,8 +183,8 @@ exports[`given element A and group of elements B and given both are selected whe
"type": "rectangle",
"version": 3,
"width": 10,
"x": 0,
"y": 0,
"x": "0.00000",
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -238,7 +238,7 @@ exports[`given element A and group of elements B and given both are selected whe
"type": "rectangle",
"version": 3,
"width": 10,
"x": 0,
"x": "0.00000",
"y": 30,
},
"inserted": {
@@ -293,7 +293,7 @@ exports[`given element A and group of elements B and given both are selected whe
"type": "rectangle",
"version": 3,
"width": 10,
"x": 0,
"x": "0.00000",
"y": 60,
},
"inserted": {
@@ -625,8 +625,8 @@ exports[`given element A and group of elements B and given both are selected whe
"type": "rectangle",
"version": 3,
"width": 100,
"x": 0,
"y": 0,
"x": "0.00000",
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -1046,8 +1046,8 @@ exports[`regression tests > Cmd/Ctrl-click exclusively select element under poin
"type": "rectangle",
"version": 3,
"width": 10,
"x": 0,
"y": 0,
"x": "0.00000",
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -1102,7 +1102,7 @@ exports[`regression tests > Cmd/Ctrl-click exclusively select element under poin
"version": 3,
"width": 10,
"x": 30,
"y": 0,
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -1272,7 +1272,7 @@ exports[`regression tests > Cmd/Ctrl-click exclusively select element under poin
"version": 3,
"width": 10,
"x": 60,
"y": 0,
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -1626,8 +1626,8 @@ exports[`regression tests > Drags selected element when hitting only bounding bo
"type": "ellipse",
"version": 3,
"width": 10,
"x": 0,
"y": 0,
"x": "0.00000",
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -1658,8 +1658,8 @@ exports[`regression tests > Drags selected element when hitting only bounding bo
},
"inserted": {
"version": 3,
"x": 0,
"y": 0,
"x": "0.00000",
"y": "0.00000",
},
},
},
@@ -4403,7 +4403,7 @@ exports[`regression tests > deleting last but one element in editing group shoul
"version": 3,
"width": 10,
"x": 10,
"y": 0,
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -4458,7 +4458,7 @@ exports[`regression tests > deleting last but one element in editing group shoul
"version": 3,
"width": 10,
"x": 50,
"y": 0,
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -4879,8 +4879,8 @@ exports[`regression tests > deselects group of selected elements on pointer down
"type": "rectangle",
"version": 3,
"width": 10,
"x": 0,
"y": 0,
"x": "0.00000",
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -5147,8 +5147,8 @@ exports[`regression tests > deselects group of selected elements on pointer up w
"type": "rectangle",
"version": 3,
"width": 10,
"x": 0,
"y": 0,
"x": "0.00000",
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -5464,8 +5464,8 @@ exports[`regression tests > deselects selected element on pointer down when poin
"type": "rectangle",
"version": 3,
"width": 10,
"x": 0,
"y": 0,
"x": "0.00000",
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -5656,8 +5656,8 @@ exports[`regression tests > deselects selected element, on pointer up, when clic
"type": "ellipse",
"version": 3,
"width": 100,
"x": 0,
"y": 0,
"x": "0.00000",
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -6279,8 +6279,8 @@ exports[`regression tests > drags selected elements from point inside common bou
"type": "rectangle",
"version": 3,
"width": 10,
"x": 0,
"y": 0,
"x": "0.00000",
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -6386,8 +6386,8 @@ exports[`regression tests > drags selected elements from point inside common bou
},
"inserted": {
"version": 3,
"x": 0,
"y": 0,
"x": "0.00000",
"y": "0.00000",
},
},
"id3": {
@@ -7094,12 +7094,12 @@ exports[`regression tests > draw every type of shape > [end of test] undo stack
10,
],
[
80,
"80.00000",
20,
],
],
"version": 5,
"width": 80,
"width": "80.00000",
},
"inserted": {
"height": 10,
@@ -7399,8 +7399,8 @@ exports[`regression tests > given a group of selected elements with an element t
"type": "rectangle",
"version": 3,
"width": 10,
"x": 0,
"y": 0,
"x": "0.00000",
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -7747,8 +7747,8 @@ exports[`regression tests > given a selected element A and a not selected elemen
"type": "rectangle",
"version": 3,
"width": 1000,
"x": 0,
"y": 0,
"x": "0.00000",
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -12056,8 +12056,8 @@ exports[`regression tests > shift click on selected element should deselect it o
"type": "rectangle",
"version": 3,
"width": 10,
"x": 0,
"y": 0,
"x": "0.00000",
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -13054,7 +13054,7 @@ exports[`regression tests > single-clicking on a subgroup of a selected group sh
"version": 3,
"width": 10,
"x": 10,
"y": 0,
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -13109,7 +13109,7 @@ exports[`regression tests > single-clicking on a subgroup of a selected group sh
"version": 3,
"width": 10,
"x": 50,
"y": 0,
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -13837,8 +13837,8 @@ exports[`regression tests > supports nested groups > [end of test] undo stack 1`
"type": "rectangle",
"version": 3,
"width": 50,
"x": 0,
"y": 0,
"x": "0.00000",
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -14440,8 +14440,8 @@ exports[`regression tests > switches from group of selected elements to another
"version": 1,
"versionNonce": 0,
"width": 0,
"x": 0,
"y": 0,
"x": "0.00000",
"y": "0.00000",
},
"shouldCacheIgnoreZoom": false,
"showHyperlinkPopup": false,
@@ -14512,8 +14512,8 @@ exports[`regression tests > switches from group of selected elements to another
"type": "rectangle",
"version": 3,
"width": 10,
"x": 0,
"y": 0,
"x": "0.00000",
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -14793,8 +14793,8 @@ exports[`regression tests > switches selected element on pointer down > [end of
"version": 1,
"versionNonce": 0,
"width": 0,
"x": 0,
"y": 0,
"x": "0.00000",
"y": "0.00000",
},
"shouldCacheIgnoreZoom": false,
"showHyperlinkPopup": false,
@@ -14865,8 +14865,8 @@ exports[`regression tests > switches selected element on pointer down > [end of
"type": "rectangle",
"version": 3,
"width": 10,
"x": 0,
"y": 0,
"x": "0.00000",
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
@@ -15243,12 +15243,12 @@ exports[`regression tests > undo/redo drawing an element > [end of test] redo st
10,
],
[
100,
"100.00000",
20,
],
],
"version": 5,
"width": 100,
"width": "100.00000",
},
},
},
@@ -15433,7 +15433,7 @@ exports[`regression tests > undo/redo drawing an element > [end of test] undo st
"version": 5,
"width": 30,
"x": 40,
"y": 0,
"y": "0.00000",
},
"inserted": {
"isDeleted": true,
+4 -4
View File
@@ -109,8 +109,8 @@ describe("move element", () => {
expect(h.state.selectionElement).toBeNull();
expect(h.elements.length).toEqual(3);
expect(h.state.selectedElementIds[rectB.id]).toBeTruthy();
expect([rectA.x, rectA.y]).toEqual([0, 0]);
expect([rectB.x, rectB.y]).toEqual([200, 0]);
expect([[rectA.x, rectA.y]]).toCloselyEqualPoints([[0, 0]]);
expect([[rectB.x, rectB.y]]).toCloselyEqualPoints([[200, 0]]);
expect([[arrow.x, arrow.y]]).toCloselyEqualPoints(
[[106.00000000000001, 55.6867741935484]],
0,
@@ -131,8 +131,8 @@ describe("move element", () => {
expect(h.state.selectionElement).toBeNull();
expect(h.elements.length).toEqual(3);
expect(h.state.selectedElementIds[rectB.id]).toBeTruthy();
expect([rectA.x, rectA.y]).toEqual([0, 0]);
expect([rectB.x, rectB.y]).toEqual([201, 2]);
expect([[rectA.x, rectA.y]]).toCloselyEqualPoints([[0, 0]]);
expect([[rectB.x, rectB.y]]).toCloselyEqualPoints([[201, 2]]);
expect([[arrow.x, arrow.y]]).toCloselyEqualPoints(
[[106, 55.6867741935484]],
0,
@@ -240,7 +240,7 @@ exports[`exportToSvg > with elements that have a link 1`] = `
`;
exports[`exportToSvg > with exportEmbedScene 1`] = `
"<!-- svg-source:excalidraw --><metadata><!-- payload-type:application/vnd.excalidraw+json --><!-- payload-version:2 --><!-- payload-start -->eyJ2ZXJzaW9uIjoiMSIsImVuY29kaW5nIjoiYnN0cmluZyIsImNvbXByZXNzZWQiOnRydWUsImVuY29kZWQiOiJ4nO1WXW/TMFx1MDAxNH3fr4jC68SctF1L31xuYzBcdIFEkSaBeHDjm8SKY2e201x1MDAwZqr+d2xnjZNs4oVcdTAwMTdGm0qR7rmfPj5X6f5cIlxiQr2rIJxcdTAwMDchbFx1MDAxM8wokXhcdTAwMTNeWnxcclJRwY0rdrZcdTAwMTK1TFxcZK51Nb+6YsIk5ELp+VxiIdQkXHUwMDAxg1x1MDAxMrhWJuyHsYNg797GQ4lNXd/Lhy+LtKCcxFx1MDAwZkk5/XSz+PDdpbqgrYlcdTAwMTlH49be2e6jaWtvKNG5wVwihFosXHUwMDA3muV6XHUwMDAwYp4xO6tHlJaigHeCXHRpXHUwMDA3eYXc41uvcFJkUtSc+JhogvEq9TEpZWypd6xhXHUwMDAxJ3ktIVx1MDAxY3S4P444wNs8JVxmyz7LtMxyXHUwMDBlSvVyRIVcdTAwMTOqd4NT2fmqO+LY/emnkriEO0svr1x1MDAxOetcdTAwMTbm5LFwz2G4XHUwMDA3S3SIO8dXXHUwMDAwxHVcdTAwMWJH15PpXHUwMDFiNGs9Xlx1MDAwN1GMhuhnwZ0momg2Q2hcdTAwMWNPr31cdTAwMWJ1Y9SgXdlcdTAwMTQzXHUwMDA1nmo72XuvlN50dUVwk+TZSCQ8Yr1QRnnxXHUwMDA0XHUwMDEzSfFMy6PIXHTFpeAkdPjh8izRf12i0clJXHUwMDE0XHUwMDE4o5WClyHRXGLs77QlXHUwMDFhn5xENWx15z5cdTAwMDXXS/rLejpHW2FcdTAwMDW33tMrbzNucUmZvZqJL2/LmvJC0oxyzIJ+nyP87c9h1lowmlmuQ1x1MDAwNmnHZejW1Pxpad1aVN6bmKkw5SCfqsBwXHUwMDA0XHUwMDFm21xyeVx1MDAxZPuZca3FV1DNIVx1MDAxZFvnvX0hezs67+3f7K0/6/+0t+bttFx1MDAxNeKqWmrDu3E3W1x1MDAxY64pbN4+syepe+z32m293Vx1MDAxM7BcdTAwMTe7P1xcXHUwMDFjflx1MDAwM/d6bqcifQ==<!-- payload-end --></metadata><defs><style class="style-fonts">
"<!-- svg-source:excalidraw --><metadata><!-- payload-type:application/vnd.excalidraw+json --><!-- payload-version:2 --><!-- payload-start -->eyJ2ZXJzaW9uIjoiMSIsImVuY29kaW5nIjoiYnN0cmluZyIsImNvbXByZXNzZWQiOnRydWUsImVuY29kZWQiOiJ4nO1WXW/aMFx1MDAxNH3vr4iy16p1XHUwMDAyXHUwMDE0xlx1MDAxYlvXrdK0SWNSpU17MPFNYsWxU9vhY4j/PtspcVx1MDAwMtVe9sQgSJF87vfxucD2KlxiQr2pIJxcdTAwMDYhrFx1MDAxM8wokXhcdTAwMTVeW3xcdFJRwY0pdmclapk4z1xc62p6e8uEXHTIhdLTXHUwMDAxQqhcdFx1MDAwMlx1MDAwNiVwrYzbT3NcdTAwMGWCrXtcdTAwMWJcdTAwMGIlNnT5JJ+/ztKCclx1MDAxMj8n5fjz/ezjXHUwMDBmXHUwMDE36pzWxmdcdTAwMThccm9cdTAwMTBqoY1tYDDuQitKdG7gXGKhLpxcdTAwMDPNcn2MY54x27dHlJaigPeCXHRpm3qD3OPbWOCkyKSoOfE+0Vxi40XqfVLK2Fxcb1jDXGJO8lpCeFDhad/oXHUwMDAx3sYpYVx1MDAxOPdRpmSWc1CqXHUwMDE3IyqcUL1pXHUwMDA2a1HbX/VIXHUwMDFj0798V1x1MDAxMpfwaKnmNWPdxJy8JO5cdTAwMTnMPYAlPcSd8Vx1MDAxNVx1MDAwMHHVhtHdaPxcdTAwMTZNWovXRFx1MDAxNKND9IvgTlx1MDAxZlE0mSA0jMd3voy6N8rQLm2KmVx1MDAwMk+17eyDV02vu7pcIrhcdPJsJFx1MDAxMl6wniujvDjCRFK8UnIveEJxKThcdFx1MDAxZL67vsj1lORcdTAwMWGdnVxcgTFaKTg9uUZgP+ct1/js5KphrTv3Kbie09/W0lx1MDAxOW2BXHUwMDE1PHhLL72NeMAlZfZqRj69TWvSXHUwMDBiSTPKMVx1MDAwYvp19vD3v7vZ04zRzHJcdTAwMWQySDsmQ7em5o9Na9ai8tbEdIUpXHUwMDA3eaxcdTAwMDLDXHUwMDExfGqX5Cb2PeNai2+gmiFcdTAwMWRbl1x1MDAxZD7BXHUwMDFkXHUwMDFlXFx2+F922M/6P+2weTtthbiq5trwbszNRodLXG6rd6/sSepcdTAwMWX7O+6+XHUwMDAx7J6Avdjt7mr3XHUwMDA3oVx1MDAxYXeHIn0=<!-- payload-end --></metadata><defs><style class="style-fonts">
@font-face { font-family: Excalifont; src: url(data:font/woff2;base64,d09GMgABAAAAAAf0AA4AAAAADbQAAAegAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGhYbgjgcNAZgAHwRCAqPYItcCxoAATYCJAMwBCAFgxgHIBujClGUblKX7Edh3Pg8OJbt5MlDFPwWk6FmJ08terdayeDx9O8Fa5eunTJ1ykAUGuAvgOF5bPfuH0nXrvQrNkFoNlERBLIQDd/mj2kP7fdg8avL4M/sm4cbu4L2i1VQVjShz/+90/YE3IJFmOC+f0Z1Xhs3bVxiJZZGa1IgY5sHCJ2EM2iBndkLWsZvFxCAhRBGCknKEOQenHCpmE2fVQTl1atzWyjvzs3aQPnWd20PJQZeG3mQp1lnLimFBAhOKFIQSrGa+vOB69gLCRkjLr4NIjd5rXiz8hhu+LIe9DZCgkJjmZEy34MkhXNBJ8GhNMMnJUgmSYA0AowAwT2zRor05iZAeN/80c4UkYlgSTOaKgOQCUOSE5F+z6+DXqndDTk4CEHP2v3/aKw7lXQXgAUAQP5+kgIpTYMHT9MEjIyWxJ5V5jAzgnrNtNBKWx101tXee86rA5O1f1fiIzEtJsS4GBMjYlikIhEvwwXDjYgiApUFdjgCFAA1m2GorwgdA5a6fzxxX0ei+Eqw6MspHfbmte7eLSh2FSEREgnySedVN+VfsbKAVQygCrGALXgDQoSA0kZqfB2OiyyaZolc/i3tnXswySlmifL9eo1ReyWQcYadAK/DD9c80uaI4pamykJM2hp/MF2uj+teZm9LiRlrltgBlcVYlWVWf+WPTpVJj40Kz9Gvi5p21Zcov8bKEL+5Uirz+j2Hjzr+99zosad2XtbpfsbKgyIQ3RJHxrTH1ysQQAjTUaii13B+OTtxrFoLubjpMYtit2uul6DdSPvKaQl/9FkppthYCXEvjoEdStVVjti2fUQf34q9YjychmIsxCAjKkj0GW4mIhlX1snPOEVRVq4UMRQwkzJNhK143IsBOlghz9meJAGf4apbAmYRMj2hsj5X1OGDPuIKXoOyN8yIMYbeusXTa9f4a+1UvYG9FgQxzoQBUoSPD5/ezAuQIP8s8IyVrUGrwSxC95WPAdlx3EkkQq5yNjcaKAAZ4LEHheIMvgHV3fe6X41/6rzCiMBwSxrnvl9RcR0gK5fy4jDVigBySy99iwlppT9aTlWIMSMKBx9WkbupSbZXNC/CKUC6z53jA0mS7340zruutV7xYguW6p/01tYHOQZQ7ptAagFiLAzFWqyWUwN8/eNGSyn2elPguvF9At0XUNlNv4t202nq+EnkKvdW6aLVlJUxhpXYUqMsn5svp9eoTpvKKf6BY8QwAkaJWYSggEuximEYiCVE0TjN5ojkVoznAP0GytsVT1SesrOn/s8LsMpVpXtSc6To4sT6XIl1q0jH96rd5/g5vmi35+y6eeYPNqjBGHtX0nKFGywfPr19aO9Gh/Q1sWZGuqckOoOJmlK2pSPTSgm/46h389ap+VmOnxsPdspP82Xyy2l7u6i2908pVjRkDbEddOKOprOPJ/94eJ59fi6jDtB6VbzuwXb5puJcqcKnUeM72fFnIlssAv/Z6uMq2s1Jd8qpd7DZo538w5PG7cHm2TU2TD41PjYiaUSikYspa/kjJ84AdgqXsT226/L+fW6j99QmJZlWN99tfcdbUPO17tLu8+gVw73h3OfmurdS9BCa5twNfokJhx7/agK3fHC9rXVewbT0kZG9vXqRBOtS6xGOZ5dC3pwleZIyidL1le+xC3btOlwJkXqGESosoDUG2TqcuE/6OcolnOykkpKdD+5l7+JODWBpAycPke+STDMRWidsWCLvfQJbKM7JpnkLG1WV73qjg6eZ1EMVF1NgG5rTaZF2r7tJNs2VzabNrTQfhSOtgxRxRLP5mldJB6/b6R5LWk9ss9nNUGyTTx8iytdCS9xlAlvtN/1hTrYObLVe5T8zLWNk2oko/bq0dv1cvjXrGC5k+pfYm+L1MtXCFsSzKDTY/dhu66JJWqlfkIxw7T5ufjDBa4pCy7ObPC0cojzlZMlCh2VjKwfX8qy5cpyRt1hp6DeKs/UZjc6zfGxC0rJHl1IUtIm2p7Tg+6VKn8vbfWR9fHljiebwTXPXTQ13HmoSbMssDsa32NnSfmmoH92xuU/E7U2qS8vWYFD9D73VJodqvWU8l7tB+b9ZdPiXvC2qoboerfoamG78+oOX7uWn1/WJy87rJPSHcVmUO7sN0ypzcG5zdfzU8k/NSh5OCbHvUSJlOk2xGrkmubA+nV7YtUCdoJk2vZ/dNSvrAkFnE0toKlC7rHllSrrOzt4Yb91LaLga9TtY+etg/uCpE8rVr604yv7YaE2x450wAACIfUvVNvFrrWXyNylLvwSAR70CtQDwePGbPuLQ/32Y10wCAClKi8AXKzralCj+/e0Dwri9RW2ArkwEqBW+cYJzghDkKyuPEB0FElKG8DIXEQkASS4s/2PSN2DGs1Bi6eh9EhVoZDAH0NblyEbw9tsoChtttEDDbQxvDTZWKm+YcYcDOj01qtdWK8110F5XIQq+nMJuwnpSopmb7KJVWbUgQqhwkyQxlOd76aglFYEKoxAJ8OeFkYPjBPTuQejsbXStQgY5klp1cr1LoQHSUa8StKqVbKnrXAqNAgg8wm1EB6RBL7ejLWnSmSI9hGJQZdAW2trTXRJoBsJm6M5VNQlFM3yJ/7EAAAA=); }
@font-face { font-family: Excalifont; src: url(data:font/woff2;base64,d09GMgABAAAAAAHcAA0AAAAAA9gAAAGMAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGx4cNAZgAAQRCAoAKgsEAAE2AiQDBAQgBYMYByAbHQPIrgp4MjSeIQLqpl4jnPFQwveqm205gmrZevZ2/8kKGaJ6ictBuCwMMnsKo8hC4RwaLBrJ7dXaFrFk0Re1e/Dk3t9wCUVrYAiZkgiZ5rGDVFdY04wBF4APOCzXHr/ljrNIDqLAY/slkQf0SyjxLNBaAq8Z1AJqYW5j0GjbckRLQhoJCgwYoyfY3q33QS5DrSAwYB4hFruNve4WoN2On4P29GEFWsC+nVM/UvSlVwIcsWycI/5gbqfUhE/9Q2P7UppTOAVeIR4TYIocELVKIEACZJgXCJ5GXl0o+esbFP3g+763DcDPx6/60MrnBaBPAsGPUDRC/8+FGIqGUSBA+NIJOwTWe13HRCIrgEvfRhj1RjLiE42eG7I5DIpVNuqkNNhxwaItTI2srRz4dfHGjhZoO0O8nb2pilFYQKhenFaycLUxsYcoAQRyoRBEnPvcgfysPq+npClt8UxLyvHWjaudqbGJA+TCckNECBGBGFforuTs0M4CUMbCAvp+P4in4o864XECREBtFQAAAAA=); }
@font-face { font-family: Nunito; src: url(data:font/woff2;base64,d09GMgABAAAAAAIsAA4AAAAABLQAAAHYAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGx4cLgZgP1NUQVREAAQRCAoAKgsEAAE2AiQDBAQgBYQkByAb5wPIrgp4Mt6IIcJZFNCfWmZY6KzqazTt6AiVHCFawzJ7V0CQBKoSQQEpFKrCVxiSFbqqqsaTevKs/q7s6uBYmujMyA9wxb6a7XnEOcNnDLgG4nW8PoPzHzYpS2uqp51pL3eB/xZoxIllCQc80B9o4j/4xMbxQB+j+SC3hsm6JmI8RMaHj+aJApW6ZbkXlg4vXSE5FECg0og6LzxP9pOarug4tF1RLpbHeZqLX0pIt2mfy3pNG6eyGaRIjrnrr/gv2c//yGdjpJ/7DuJLin5eIZRLaObBMM/NpYpuXJ8z3SE088mEFANcCARESfwChCioAwESsVxBgeyxp6+vZ3Xzv8uz7Ae8tRk+p6RUTPOR7BmlEgh+STsAimNuKibilyluhBNe5/wCACSBKrcykVfgyb+RYcK/TGq9yMyCt3bOskSnR1FqTLMSVBsMGLQVltDKKw2IYA+wcGxHJCINY9mDOCaN4IZEo1ChY4xNg8DaB0RxDqnbMNjXJJRzF9iInqahtm67M8dOHFvXaYbn+wrGxKG3YZI+2V4CW58ovdfV1tFHXFJJiPH7T1FAJxEgYo5BKkA5iDIVQluOqZYWhQapGF6TAFhaFAAoTBIZsCFHi/0oV3gpVKwbAA==); }