mirror of
https://github.com/excalidraw/excalidraw.git
synced 2025-09-18 23:10:16 +02:00

* fix: Bind keyboard events to excalidraw container
* fix cases around blurring
* fix modal rendering so keyboard shortcuts work on modal as well
* Revert "fix modal rendering so keyboard shortcuts work on modal as well"
This reverts commit 2c8ec6be8e
.
* Attach keyboard event in react way so we need not handle portals separately (modals)
* dnt propagate esc event when modal shown
* focus the container when help dialog closed with shift+?
* focus the help icon when help dialog on close triggered
* move focusNearestTabbableParent to util
* rename util to focusNearestParent and remove outline from excal and modal
* Add prop bindKeyGlobally to decide if keyboard events should be binded to document and allow it in excal app, revert tests
* fix
* focus container after installing library, reset library and closing error dialog
* fix tests and create util to focus container
* Add excalidraw-container class to focus on the container
* pass focus container to library to focus current instance of excal
* update docs
* remove util as it wont be used anywhere
* fix propagation not being stopped for React keyboard handling
* tweak reamde
Co-authored-by: David Luzar <luzar.david@gmail.com>
* tweak changelog
* rename prop to handleKeyboardGlobally
Co-authored-by: dwelle <luzar.david@gmail.com>
166 lines
4.8 KiB
TypeScript
166 lines
4.8 KiB
TypeScript
import React from "react";
|
|
import ReactDOM from "react-dom";
|
|
import {
|
|
render,
|
|
fireEvent,
|
|
mockBoundingClientRect,
|
|
restoreOriginalGetBoundingClientRect,
|
|
} from "./test-utils";
|
|
import ExcalidrawApp from "../excalidraw-app";
|
|
import * as Renderer from "../renderer/renderScene";
|
|
import { KEYS } from "../keys";
|
|
import { ExcalidrawLinearElement } from "../element/types";
|
|
import { reseed } from "../random";
|
|
|
|
// Unmount ReactDOM from root
|
|
ReactDOM.unmountComponentAtNode(document.getElementById("root")!);
|
|
|
|
const renderScene = jest.spyOn(Renderer, "renderScene");
|
|
beforeEach(() => {
|
|
localStorage.clear();
|
|
renderScene.mockClear();
|
|
reseed(7);
|
|
});
|
|
|
|
const { h } = window;
|
|
|
|
describe("remove shape in non linear elements", () => {
|
|
beforeAll(() => {
|
|
mockBoundingClientRect();
|
|
});
|
|
|
|
afterAll(() => {
|
|
restoreOriginalGetBoundingClientRect();
|
|
});
|
|
|
|
it("rectangle", async () => {
|
|
const { getByToolName, container } = await render(<ExcalidrawApp />);
|
|
// select tool
|
|
const tool = getByToolName("rectangle");
|
|
fireEvent.click(tool);
|
|
|
|
const canvas = container.querySelector("canvas")!;
|
|
fireEvent.pointerDown(canvas, { clientX: 30, clientY: 20 });
|
|
fireEvent.pointerUp(canvas, { clientX: 30, clientY: 30 });
|
|
|
|
expect(renderScene).toHaveBeenCalledTimes(6);
|
|
expect(h.elements.length).toEqual(0);
|
|
});
|
|
|
|
it("ellipse", async () => {
|
|
const { getByToolName, container } = await render(<ExcalidrawApp />);
|
|
// select tool
|
|
const tool = getByToolName("ellipse");
|
|
fireEvent.click(tool);
|
|
|
|
const canvas = container.querySelector("canvas")!;
|
|
fireEvent.pointerDown(canvas, { clientX: 30, clientY: 20 });
|
|
fireEvent.pointerUp(canvas, { clientX: 30, clientY: 30 });
|
|
|
|
expect(renderScene).toHaveBeenCalledTimes(6);
|
|
expect(h.elements.length).toEqual(0);
|
|
});
|
|
|
|
it("diamond", async () => {
|
|
const { getByToolName, container } = await render(<ExcalidrawApp />);
|
|
// select tool
|
|
const tool = getByToolName("diamond");
|
|
fireEvent.click(tool);
|
|
|
|
const canvas = container.querySelector("canvas")!;
|
|
fireEvent.pointerDown(canvas, { clientX: 30, clientY: 20 });
|
|
fireEvent.pointerUp(canvas, { clientX: 30, clientY: 30 });
|
|
|
|
expect(renderScene).toHaveBeenCalledTimes(6);
|
|
expect(h.elements.length).toEqual(0);
|
|
});
|
|
});
|
|
|
|
describe("multi point mode in linear elements", () => {
|
|
it("arrow", async () => {
|
|
const { getByToolName, container } = await render(<ExcalidrawApp />);
|
|
// select tool
|
|
const tool = getByToolName("arrow");
|
|
fireEvent.click(tool);
|
|
|
|
const canvas = container.querySelector("canvas")!;
|
|
// first point is added on pointer down
|
|
fireEvent.pointerDown(canvas, { clientX: 30, clientY: 30 });
|
|
|
|
// second point, enable multi point
|
|
fireEvent.pointerUp(canvas, { clientX: 30, clientY: 30 });
|
|
fireEvent.pointerMove(canvas, { clientX: 50, clientY: 60 });
|
|
|
|
// third point
|
|
fireEvent.pointerDown(canvas, { clientX: 50, clientY: 60 });
|
|
fireEvent.pointerUp(canvas);
|
|
fireEvent.pointerMove(canvas, { clientX: 100, clientY: 140 });
|
|
|
|
// done
|
|
fireEvent.pointerDown(canvas);
|
|
fireEvent.pointerUp(canvas);
|
|
fireEvent.keyDown(document, {
|
|
key: KEYS.ENTER,
|
|
});
|
|
|
|
expect(renderScene).toHaveBeenCalledTimes(14);
|
|
expect(h.elements.length).toEqual(1);
|
|
|
|
const element = h.elements[0] as ExcalidrawLinearElement;
|
|
|
|
expect(element.type).toEqual("arrow");
|
|
expect(element.x).toEqual(30);
|
|
expect(element.y).toEqual(30);
|
|
expect(element.points).toEqual([
|
|
[0, 0],
|
|
[20, 30],
|
|
[70, 110],
|
|
]);
|
|
|
|
h.elements.forEach((element) => expect(element).toMatchSnapshot());
|
|
});
|
|
|
|
it("line", async () => {
|
|
const { getByToolName, container } = await render(<ExcalidrawApp />);
|
|
// select tool
|
|
const tool = getByToolName("line");
|
|
fireEvent.click(tool);
|
|
|
|
const canvas = container.querySelector("canvas")!;
|
|
// first point is added on pointer down
|
|
fireEvent.pointerDown(canvas, { clientX: 30, clientY: 30 });
|
|
|
|
// second point, enable multi point
|
|
fireEvent.pointerUp(canvas, { clientX: 30, clientY: 30 });
|
|
fireEvent.pointerMove(canvas, { clientX: 50, clientY: 60 });
|
|
|
|
// third point
|
|
fireEvent.pointerDown(canvas, { clientX: 50, clientY: 60 });
|
|
fireEvent.pointerUp(canvas);
|
|
fireEvent.pointerMove(canvas, { clientX: 100, clientY: 140 });
|
|
|
|
// done
|
|
fireEvent.pointerDown(canvas);
|
|
fireEvent.pointerUp(canvas);
|
|
fireEvent.keyDown(document, {
|
|
key: KEYS.ENTER,
|
|
});
|
|
|
|
expect(renderScene).toHaveBeenCalledTimes(14);
|
|
expect(h.elements.length).toEqual(1);
|
|
|
|
const element = h.elements[0] as ExcalidrawLinearElement;
|
|
|
|
expect(element.type).toEqual("line");
|
|
expect(element.x).toEqual(30);
|
|
expect(element.y).toEqual(30);
|
|
expect(element.points).toEqual([
|
|
[0, 0],
|
|
[20, 30],
|
|
[70, 110],
|
|
]);
|
|
|
|
h.elements.forEach((element) => expect(element).toMatchSnapshot());
|
|
});
|
|
});
|