Show move and resize cursors on hover (#280)
* Change to move cursor on hover * Show resize handlers on hover
This commit is contained in:
committed by
Christopher Chedeau
parent
a16cd3a34f
commit
4a044d3ace
@ -1,11 +1,11 @@
|
||||
import { SceneState } from "../scene/types";
|
||||
import { ExcalidrawElement } from "./types";
|
||||
import { SceneScroll } from "../scene/types";
|
||||
|
||||
type Sides = "n" | "s" | "w" | "e" | "nw" | "ne" | "sw" | "se";
|
||||
|
||||
export function handlerRectangles(
|
||||
element: ExcalidrawElement,
|
||||
sceneState: SceneState
|
||||
{ scrollX, scrollY }: SceneScroll
|
||||
) {
|
||||
const elementX1 = element.x;
|
||||
const elementX2 = element.x + element.width;
|
||||
@ -21,15 +21,15 @@ export function handlerRectangles(
|
||||
|
||||
if (Math.abs(elementX2 - elementX1) > minimumSize) {
|
||||
handlers["n"] = [
|
||||
elementX1 + (elementX2 - elementX1) / 2 + sceneState.scrollX - 4,
|
||||
elementY1 - margin + sceneState.scrollY + marginY,
|
||||
elementX1 + (elementX2 - elementX1) / 2 + scrollX - 4,
|
||||
elementY1 - margin + scrollY + marginY,
|
||||
8,
|
||||
8
|
||||
];
|
||||
|
||||
handlers["s"] = [
|
||||
elementX1 + (elementX2 - elementX1) / 2 + sceneState.scrollX - 4,
|
||||
elementY2 - margin + sceneState.scrollY - marginY,
|
||||
elementX1 + (elementX2 - elementX1) / 2 + scrollX - 4,
|
||||
elementY2 - margin + scrollY - marginY,
|
||||
8,
|
||||
8
|
||||
];
|
||||
@ -37,41 +37,41 @@ export function handlerRectangles(
|
||||
|
||||
if (Math.abs(elementY2 - elementY1) > minimumSize) {
|
||||
handlers["w"] = [
|
||||
elementX1 - margin + sceneState.scrollX + marginX,
|
||||
elementY1 + (elementY2 - elementY1) / 2 + sceneState.scrollY - 4,
|
||||
elementX1 - margin + scrollX + marginX,
|
||||
elementY1 + (elementY2 - elementY1) / 2 + scrollY - 4,
|
||||
8,
|
||||
8
|
||||
];
|
||||
|
||||
handlers["e"] = [
|
||||
elementX2 - margin + sceneState.scrollX - marginX,
|
||||
elementY1 + (elementY2 - elementY1) / 2 + sceneState.scrollY - 4,
|
||||
elementX2 - margin + scrollX - marginX,
|
||||
elementY1 + (elementY2 - elementY1) / 2 + scrollY - 4,
|
||||
8,
|
||||
8
|
||||
];
|
||||
}
|
||||
|
||||
handlers["nw"] = [
|
||||
elementX1 - margin + sceneState.scrollX + marginX,
|
||||
elementY1 - margin + sceneState.scrollY + marginY,
|
||||
elementX1 - margin + scrollX + marginX,
|
||||
elementY1 - margin + scrollY + marginY,
|
||||
8,
|
||||
8
|
||||
]; // nw
|
||||
handlers["ne"] = [
|
||||
elementX2 - margin + sceneState.scrollX - marginX,
|
||||
elementY1 - margin + sceneState.scrollY + marginY,
|
||||
elementX2 - margin + scrollX - marginX,
|
||||
elementY1 - margin + scrollY + marginY,
|
||||
8,
|
||||
8
|
||||
]; // ne
|
||||
handlers["sw"] = [
|
||||
elementX1 - margin + sceneState.scrollX + marginX,
|
||||
elementY2 - margin + sceneState.scrollY - marginY,
|
||||
elementX1 - margin + scrollX + marginX,
|
||||
elementY2 - margin + scrollY - marginY,
|
||||
8,
|
||||
8
|
||||
]; // sw
|
||||
handlers["se"] = [
|
||||
elementX2 - margin + sceneState.scrollX - marginX,
|
||||
elementY2 - margin + sceneState.scrollY - marginY,
|
||||
elementX2 - margin + scrollX - marginX,
|
||||
elementY2 - margin + scrollY - marginY,
|
||||
8,
|
||||
8
|
||||
]; // se
|
||||
|
@ -1,7 +1,7 @@
|
||||
import { ExcalidrawElement } from "./types";
|
||||
import { SceneState } from "../scene/types";
|
||||
|
||||
import { handlerRectangles } from "./handlerRectangles";
|
||||
import { SceneScroll } from "../scene/types";
|
||||
|
||||
type HandlerRectanglesRet = keyof ReturnType<typeof handlerRectangles>;
|
||||
|
||||
@ -9,20 +9,20 @@ export function resizeTest(
|
||||
element: ExcalidrawElement,
|
||||
x: number,
|
||||
y: number,
|
||||
sceneState: SceneState
|
||||
{ scrollX, scrollY }: SceneScroll
|
||||
): HandlerRectanglesRet | false {
|
||||
if (!element.isSelected || element.type === "text") return false;
|
||||
|
||||
const handlers = handlerRectangles(element, sceneState);
|
||||
const handlers = handlerRectangles(element, { scrollX, scrollY });
|
||||
|
||||
const filter = Object.keys(handlers).filter(key => {
|
||||
const handler = handlers[key as HandlerRectanglesRet]!;
|
||||
|
||||
return (
|
||||
x + sceneState.scrollX >= handler[0] &&
|
||||
x + sceneState.scrollX <= handler[0] + handler[2] &&
|
||||
y + sceneState.scrollY >= handler[1] &&
|
||||
y + sceneState.scrollY <= handler[1] + handler[3]
|
||||
x + scrollX >= handler[0] &&
|
||||
x + scrollX <= handler[0] + handler[2] &&
|
||||
y + scrollY >= handler[1] &&
|
||||
y + scrollY <= handler[1] + handler[3]
|
||||
);
|
||||
});
|
||||
|
||||
@ -32,3 +32,20 @@ export function resizeTest(
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
export function getElementWithResizeHandler(
|
||||
elements: ExcalidrawElement[],
|
||||
{ x, y }: { x: number; y: number },
|
||||
{ scrollX, scrollY }: SceneScroll
|
||||
) {
|
||||
return elements.reduce((result, element) => {
|
||||
if (result) {
|
||||
return result;
|
||||
}
|
||||
const resizeHandle = resizeTest(element, x, y, {
|
||||
scrollX,
|
||||
scrollY
|
||||
});
|
||||
return resizeHandle ? { element, resizeHandle } : null;
|
||||
}, null as { element: ExcalidrawElement; resizeHandle: ReturnType<typeof resizeTest> } | null);
|
||||
}
|
||||
|
Reference in New Issue
Block a user