a70417f23f
* feat: Force exact center focus point When the projected point is close to center snap it to the exact center. Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Tests Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Snap to center around side mid point. Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * Trigger CI * fix: Midpoint outline focus point Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Tests Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Dragging existing arrow reset focus point on outline Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Tests Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * feat: Midpoint indicator Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Rotated mid points Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: No hole Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * feat: Cache hits and scene lookups Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * chore: Remove debug Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Consider hit threshold and inside override too Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Increase outline midpoint sticky distance Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Don't show midpoint indicator when no snapping is possible Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * feat: Indicate lock-in Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * chore: Remove Map caching Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: incorrect threshold Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: threshold setting Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Hit caching Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Simple arrow mid point selection inconsistency Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: cache override Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Precise know dragging with midpoint refactor Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fear: Frame support Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Crossing arrow won't trigger mid point Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Arrow creation point highlight Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Restore types & tests Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * chore: Restore restore.ts Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: restore.ts Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Elbow arrows reliably highlight center point Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Highlight point ordering Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * feat: Bind with focus point across shape Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Lint * fix: Midpoint and binding alignment Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * chore: Indicator color Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * chore: More knob tuning Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Radius Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Tests Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * simplify point indicators --------- Signed-off-by: Mark Tolmacs <mark@lazycat.hu> Co-authored-by: dwelle <5153846+dwelle@users.noreply.github.com>
192 lines
6.7 KiB
TypeScript
192 lines
6.7 KiB
TypeScript
import React from "react";
|
|
import { vi } from "vitest";
|
|
import { KEYS, reseed } from "@excalidraw/common";
|
|
import { bindBindingElement } from "@excalidraw/element";
|
|
import "@excalidraw/utils/test-utils";
|
|
|
|
import type {
|
|
ExcalidrawArrowElement,
|
|
NonDeleted,
|
|
} from "@excalidraw/element/types";
|
|
|
|
import { Excalidraw } from "../index";
|
|
import * as InteractiveCanvas from "../renderer/interactiveScene";
|
|
import * as StaticScene from "../renderer/staticScene";
|
|
|
|
import { UI, Pointer, Keyboard } from "./helpers/ui";
|
|
import { render, fireEvent, act, unmountComponent } from "./test-utils";
|
|
|
|
unmountComponent();
|
|
|
|
const renderInteractiveScene = vi.spyOn(
|
|
InteractiveCanvas,
|
|
"renderInteractiveScene",
|
|
);
|
|
const renderStaticScene = vi.spyOn(StaticScene, "renderStaticScene");
|
|
|
|
beforeEach(() => {
|
|
localStorage.clear();
|
|
renderInteractiveScene.mockClear();
|
|
renderStaticScene.mockClear();
|
|
reseed(7);
|
|
});
|
|
|
|
const { h } = window;
|
|
|
|
describe("move element", () => {
|
|
it("rectangle", async () => {
|
|
const { getByToolName, container } = await render(<Excalidraw />);
|
|
const canvas = container.querySelector("canvas.interactive")!;
|
|
|
|
{
|
|
// create element
|
|
const tool = getByToolName("rectangle");
|
|
fireEvent.click(tool);
|
|
fireEvent.pointerDown(canvas, { clientX: 30, clientY: 20 });
|
|
fireEvent.pointerMove(canvas, { clientX: 60, clientY: 70 });
|
|
fireEvent.pointerUp(canvas);
|
|
|
|
expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(
|
|
`5`,
|
|
);
|
|
expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`5`);
|
|
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]);
|
|
|
|
renderInteractiveScene.mockClear();
|
|
renderStaticScene.mockClear();
|
|
}
|
|
|
|
fireEvent.pointerDown(canvas, { clientX: 50, clientY: 20 });
|
|
fireEvent.pointerMove(canvas, { clientX: 20, clientY: 40 });
|
|
fireEvent.pointerUp(canvas);
|
|
|
|
expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(`3`);
|
|
expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`2`);
|
|
expect(h.state.selectionElement).toBeNull();
|
|
expect(h.elements.length).toEqual(1);
|
|
expect([h.elements[0].x, h.elements[0].y]).toEqual([0, 40]);
|
|
|
|
h.elements.forEach((element) => expect(element).toMatchSnapshot());
|
|
});
|
|
|
|
it("rectangles with binding arrow", async () => {
|
|
await render(<Excalidraw handleKeyboardGlobally={true} />);
|
|
|
|
// create elements
|
|
const rectA = UI.createElement("rectangle", { size: 100 });
|
|
const rectB = UI.createElement("rectangle", { x: 200, y: 0, size: 300 });
|
|
const arrow = UI.createElement("arrow", { x: 105, y: 50, size: 88 });
|
|
|
|
act(() => {
|
|
// bind line to two rectangles
|
|
bindBindingElement(
|
|
arrow.get() as NonDeleted<ExcalidrawArrowElement>,
|
|
rectA.get(),
|
|
"orbit",
|
|
"start",
|
|
h.app.scene,
|
|
);
|
|
bindBindingElement(
|
|
arrow.get() as NonDeleted<ExcalidrawArrowElement>,
|
|
rectB.get(),
|
|
"orbit",
|
|
"end",
|
|
h.app.scene,
|
|
);
|
|
});
|
|
|
|
// select the second rectangle
|
|
new Pointer("mouse").clickOn(rectB);
|
|
|
|
expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(
|
|
`16`,
|
|
);
|
|
expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`15`);
|
|
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([[arrow.x, arrow.y]]).toCloselyEqualPoints(
|
|
[[106.00000000000001, 55.6867741935484]],
|
|
0,
|
|
);
|
|
expect([[arrow.width, arrow.height]]).toCloselyEqualPoints([[88, 88]], 0);
|
|
|
|
renderInteractiveScene.mockClear();
|
|
renderStaticScene.mockClear();
|
|
|
|
// Move selected rectangle
|
|
Keyboard.keyDown(KEYS.ARROW_RIGHT);
|
|
Keyboard.keyDown(KEYS.ARROW_DOWN);
|
|
Keyboard.keyDown(KEYS.ARROW_DOWN);
|
|
|
|
// Check that the arrow size has been changed according to moving the rectangle
|
|
expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(`3`);
|
|
expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`3`);
|
|
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([[arrow.x, arrow.y]]).toCloselyEqualPoints(
|
|
[[106, 55.6867741935484]],
|
|
0,
|
|
);
|
|
expect([[arrow.width, arrow.height]]).toCloselyEqualPoints([[89, 90]], 0);
|
|
|
|
h.elements.forEach((element) => expect(element).toMatchSnapshot());
|
|
});
|
|
});
|
|
|
|
describe("duplicate element on move when ALT is clicked", () => {
|
|
it("rectangle", async () => {
|
|
const { getByToolName, container } = await render(<Excalidraw />);
|
|
const canvas = container.querySelector("canvas.interactive")!;
|
|
|
|
{
|
|
// create element
|
|
const tool = getByToolName("rectangle");
|
|
fireEvent.click(tool);
|
|
fireEvent.pointerDown(canvas, { clientX: 30, clientY: 20 });
|
|
fireEvent.pointerMove(canvas, { clientX: 60, clientY: 70 });
|
|
fireEvent.pointerUp(canvas);
|
|
|
|
expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(
|
|
`5`,
|
|
);
|
|
expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`5`);
|
|
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]);
|
|
|
|
renderInteractiveScene.mockClear();
|
|
renderStaticScene.mockClear();
|
|
}
|
|
|
|
fireEvent.pointerDown(canvas, { clientX: 50, clientY: 20 });
|
|
fireEvent.pointerMove(canvas, { clientX: 20, clientY: 40, altKey: true });
|
|
|
|
// firing another pointerMove event with alt key pressed should NOT trigger
|
|
// another duplication
|
|
fireEvent.pointerMove(canvas, { clientX: 20, clientY: 40, altKey: true });
|
|
fireEvent.pointerMove(canvas, { clientX: 10, clientY: 60 });
|
|
fireEvent.pointerUp(canvas);
|
|
|
|
expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(`4`);
|
|
expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`3`);
|
|
expect(h.state.selectionElement).toBeNull();
|
|
expect(h.elements.length).toEqual(2);
|
|
|
|
// previous element should stay intact
|
|
expect([h.elements[0].x, h.elements[0].y]).toEqual([30, 20]);
|
|
expect([h.elements[1].x, h.elements[1].y]).toEqual([-10, 60]);
|
|
|
|
h.elements.forEach((element) => expect(element).toMatchSnapshot());
|
|
});
|
|
});
|