760fd7b3a6
* feat: support arrow with text * render arrow -> clear rect-> render text * move bound text when linear elements move * fix centering cursor when linear element rotated * fix y coord when new line added and container has 3 points * update text position when 2nd point moved * support adding label on top of 2nd point when 3 points are present * change linear element editor shortcut to cmd+enter and fix tests * scale bound text points when resizing via bounding box * ohh yeah rotation works :) * fix coords when updating text properties * calculate new position after rotation always from original position * rotate the bound text by same angle as parent * don't rotate text and make sure dimensions and coords are always calculated from original point * hardcoding the text width for now * Move the linear element when bound text hit * Rotation working yaay * consider text element angle when editing * refactor * update x2 coords if needed when text updated * simplify * consider bound text to be part of bounding box when hit * show bounding box correctly when multiple element selected * fix typo * support rotating multiple elements * support multiple element resizing * shift bound text to mid point when odd points * Always render linear element handles inside editor after element rendered so point is visible for bound text * Delete bound text when point attached to it deleted * move bound to mid segement mid point when points are even * shift bound text when points nearby deleted and handle segment deletion * Resize working :) * more resize fixes * don't update cache-its breaking delete points, look for better soln * update mid point cache for bound elements when updated * introduce wrapping when resizing * wrap when resize for 2 pointer linear elements * support adding text for linear elements with more than 3 points * export to svg working :) * clip from nearest enclosing element with non transparent color if present when exporting and fill with correct color in canvas * fix snap * use visible elements * Make export to svg work with Mask :) * remove id * mask canvas linear element area where label is added * decide the position of bound text during render * fix coords when editing * fix multiple resize * update cache when bound text version changes * fix masking when rotated * render text in correct position in preview * remove unnecessary code * fix masking when rotating linear element * fix masking with zoom * fix mask in preview for export * fix offsets in export view * fix coords on svg export * fix mask when element rotated in svg * enable double-click to enter text * fix hint * Position cursor correctly and text dimensiosn when height of element is negative * don't allow 2 pointer linear element with bound text width to go beyond min width * code cleanup * fix freedraw * Add padding * don't show vertical align action for linear element containers * Add specs for getBoundTextElementPosition * more specs * move some utils to linearElementEditor.ts * remove only :p * check absoulte coods in test * Add test to hide vertical align for linear eleemnt with bound text * improve export preview * support labels only for arrows * spec * fix large texts * fix tests * fix zooming * enter line editor with cmd+double click * Allow points to move beyond min width/height for 2 pointer arrow with bound text * fix hint for line editing * attempt to fix arrow getting deselected * fix hint and shortcut * Add padding of 5px when creating bound text and add spec * Wrap bound text when arrow binding containers moved * Add spec * remove * set boundTextElementVersion to null if not present * dont use cache when version mismatch * Add a padding of 5px vertically when creating text * Add box sizing content box * Set bound elements when text element created to fix the padding * fix zooming in editor * fix zoom in export * remove globalCompositeOperation and use clearRect instead of fillRect
283 lines
7.1 KiB
TypeScript
283 lines
7.1 KiB
TypeScript
import {
|
|
ExcalidrawElement,
|
|
NonDeletedExcalidrawElement,
|
|
PointerType,
|
|
} from "./types";
|
|
|
|
import { getElementAbsoluteCoords } from "./bounds";
|
|
import { rotate } from "../math";
|
|
import { AppState, Zoom } from "../types";
|
|
import { isTextElement } from ".";
|
|
import { isLinearElement } from "./typeChecks";
|
|
import { DEFAULT_SPACING } from "../renderer/renderScene";
|
|
|
|
export type TransformHandleDirection =
|
|
| "n"
|
|
| "s"
|
|
| "w"
|
|
| "e"
|
|
| "nw"
|
|
| "ne"
|
|
| "sw"
|
|
| "se";
|
|
|
|
export type TransformHandleType = TransformHandleDirection | "rotation";
|
|
|
|
export type TransformHandle = [number, number, number, number];
|
|
export type TransformHandles = Partial<{
|
|
[T in TransformHandleType]: TransformHandle;
|
|
}>;
|
|
export type MaybeTransformHandleType = TransformHandleType | false;
|
|
|
|
const transformHandleSizes: { [k in PointerType]: number } = {
|
|
mouse: 8,
|
|
pen: 16,
|
|
touch: 28,
|
|
};
|
|
|
|
const ROTATION_RESIZE_HANDLE_GAP = 16;
|
|
|
|
export const OMIT_SIDES_FOR_MULTIPLE_ELEMENTS = {
|
|
e: true,
|
|
s: true,
|
|
n: true,
|
|
w: true,
|
|
};
|
|
|
|
const OMIT_SIDES_FOR_TEXT_ELEMENT = {
|
|
e: true,
|
|
s: true,
|
|
n: true,
|
|
w: true,
|
|
};
|
|
|
|
const OMIT_SIDES_FOR_LINE_SLASH = {
|
|
e: true,
|
|
s: true,
|
|
n: true,
|
|
w: true,
|
|
nw: true,
|
|
se: true,
|
|
};
|
|
|
|
const OMIT_SIDES_FOR_LINE_BACKSLASH = {
|
|
e: true,
|
|
s: true,
|
|
n: true,
|
|
w: true,
|
|
};
|
|
|
|
const generateTransformHandle = (
|
|
x: number,
|
|
y: number,
|
|
width: number,
|
|
height: number,
|
|
cx: number,
|
|
cy: number,
|
|
angle: number,
|
|
): TransformHandle => {
|
|
const [xx, yy] = rotate(x + width / 2, y + height / 2, cx, cy, angle);
|
|
return [xx - width / 2, yy - height / 2, width, height];
|
|
};
|
|
|
|
export const getTransformHandlesFromCoords = (
|
|
[x1, y1, x2, y2, cx, cy]: [number, number, number, number, number, number],
|
|
angle: number,
|
|
zoom: Zoom,
|
|
pointerType: PointerType,
|
|
omitSides: { [T in TransformHandleType]?: boolean } = {},
|
|
margin = 4,
|
|
): TransformHandles => {
|
|
const size = transformHandleSizes[pointerType];
|
|
const handleWidth = size / zoom.value;
|
|
const handleHeight = size / zoom.value;
|
|
|
|
const handleMarginX = size / zoom.value;
|
|
const handleMarginY = size / zoom.value;
|
|
|
|
const width = x2 - x1;
|
|
const height = y2 - y1;
|
|
const dashedLineMargin = margin / zoom.value;
|
|
const centeringOffset = (size - DEFAULT_SPACING * 2) / (2 * zoom.value);
|
|
|
|
const transformHandles: TransformHandles = {
|
|
nw: omitSides.nw
|
|
? undefined
|
|
: generateTransformHandle(
|
|
x1 - dashedLineMargin - handleMarginX + centeringOffset,
|
|
y1 - dashedLineMargin - handleMarginY + centeringOffset,
|
|
handleWidth,
|
|
handleHeight,
|
|
cx,
|
|
cy,
|
|
angle,
|
|
),
|
|
ne: omitSides.ne
|
|
? undefined
|
|
: generateTransformHandle(
|
|
x2 + dashedLineMargin - centeringOffset,
|
|
y1 - dashedLineMargin - handleMarginY + centeringOffset,
|
|
handleWidth,
|
|
handleHeight,
|
|
cx,
|
|
cy,
|
|
angle,
|
|
),
|
|
sw: omitSides.sw
|
|
? undefined
|
|
: generateTransformHandle(
|
|
x1 - dashedLineMargin - handleMarginX + centeringOffset,
|
|
y2 + dashedLineMargin - centeringOffset,
|
|
handleWidth,
|
|
handleHeight,
|
|
cx,
|
|
cy,
|
|
angle,
|
|
),
|
|
se: omitSides.se
|
|
? undefined
|
|
: generateTransformHandle(
|
|
x2 + dashedLineMargin - centeringOffset,
|
|
y2 + dashedLineMargin - centeringOffset,
|
|
handleWidth,
|
|
handleHeight,
|
|
cx,
|
|
cy,
|
|
angle,
|
|
),
|
|
rotation: omitSides.rotation
|
|
? undefined
|
|
: generateTransformHandle(
|
|
x1 + width / 2 - handleWidth / 2,
|
|
y1 -
|
|
dashedLineMargin -
|
|
handleMarginY +
|
|
centeringOffset -
|
|
ROTATION_RESIZE_HANDLE_GAP / zoom.value,
|
|
handleWidth,
|
|
handleHeight,
|
|
cx,
|
|
cy,
|
|
angle,
|
|
),
|
|
};
|
|
|
|
// We only want to show height handles (all cardinal directions) above a certain size
|
|
// Note: we render using "mouse" size so we should also use "mouse" size for this check
|
|
const minimumSizeForEightHandles =
|
|
(5 * transformHandleSizes.mouse) / zoom.value;
|
|
if (Math.abs(width) > minimumSizeForEightHandles) {
|
|
if (!omitSides.n) {
|
|
transformHandles.n = generateTransformHandle(
|
|
x1 + width / 2 - handleWidth / 2,
|
|
y1 - dashedLineMargin - handleMarginY + centeringOffset,
|
|
handleWidth,
|
|
handleHeight,
|
|
cx,
|
|
cy,
|
|
angle,
|
|
);
|
|
}
|
|
if (!omitSides.s) {
|
|
transformHandles.s = generateTransformHandle(
|
|
x1 + width / 2 - handleWidth / 2,
|
|
y2 + dashedLineMargin - centeringOffset,
|
|
handleWidth,
|
|
handleHeight,
|
|
cx,
|
|
cy,
|
|
angle,
|
|
);
|
|
}
|
|
}
|
|
if (Math.abs(height) > minimumSizeForEightHandles) {
|
|
if (!omitSides.w) {
|
|
transformHandles.w = generateTransformHandle(
|
|
x1 - dashedLineMargin - handleMarginX + centeringOffset,
|
|
y1 + height / 2 - handleHeight / 2,
|
|
handleWidth,
|
|
handleHeight,
|
|
cx,
|
|
cy,
|
|
angle,
|
|
);
|
|
}
|
|
if (!omitSides.e) {
|
|
transformHandles.e = generateTransformHandle(
|
|
x2 + dashedLineMargin - centeringOffset,
|
|
y1 + height / 2 - handleHeight / 2,
|
|
handleWidth,
|
|
handleHeight,
|
|
cx,
|
|
cy,
|
|
angle,
|
|
);
|
|
}
|
|
}
|
|
|
|
return transformHandles;
|
|
};
|
|
|
|
export const getTransformHandles = (
|
|
element: ExcalidrawElement,
|
|
zoom: Zoom,
|
|
pointerType: PointerType = "mouse",
|
|
): TransformHandles => {
|
|
// so that when locked element is selected (especially when you toggle lock
|
|
// via keyboard) the locked element is visually distinct, indicating
|
|
// you can't move/resize
|
|
if (element.locked) {
|
|
return {};
|
|
}
|
|
|
|
let omitSides: { [T in TransformHandleType]?: boolean } = {};
|
|
if (element.type === "freedraw" || isLinearElement(element)) {
|
|
if (element.points.length === 2) {
|
|
// only check the last point because starting point is always (0,0)
|
|
const [, p1] = element.points;
|
|
if (p1[0] === 0 || p1[1] === 0) {
|
|
omitSides = OMIT_SIDES_FOR_LINE_BACKSLASH;
|
|
} else if (p1[0] > 0 && p1[1] < 0) {
|
|
omitSides = OMIT_SIDES_FOR_LINE_SLASH;
|
|
} else if (p1[0] > 0 && p1[1] > 0) {
|
|
omitSides = OMIT_SIDES_FOR_LINE_BACKSLASH;
|
|
} else if (p1[0] < 0 && p1[1] > 0) {
|
|
omitSides = OMIT_SIDES_FOR_LINE_SLASH;
|
|
} else if (p1[0] < 0 && p1[1] < 0) {
|
|
omitSides = OMIT_SIDES_FOR_LINE_BACKSLASH;
|
|
}
|
|
}
|
|
} else if (isTextElement(element)) {
|
|
omitSides = OMIT_SIDES_FOR_TEXT_ELEMENT;
|
|
}
|
|
const dashedLineMargin = isLinearElement(element)
|
|
? DEFAULT_SPACING + 8
|
|
: DEFAULT_SPACING;
|
|
return getTransformHandlesFromCoords(
|
|
getElementAbsoluteCoords(element, true),
|
|
element.angle,
|
|
zoom,
|
|
pointerType,
|
|
omitSides,
|
|
dashedLineMargin,
|
|
);
|
|
};
|
|
|
|
export const shouldShowBoundingBox = (
|
|
elements: NonDeletedExcalidrawElement[],
|
|
appState: AppState,
|
|
) => {
|
|
if (appState.editingLinearElement) {
|
|
return false;
|
|
}
|
|
if (elements.length > 1) {
|
|
return true;
|
|
}
|
|
const element = elements[0];
|
|
if (!isLinearElement(element)) {
|
|
return true;
|
|
}
|
|
|
|
return element.points.length > 2;
|
|
};
|