mirror of
https://github.com/excalidraw/excalidraw.git
synced 2025-08-22 17:57:03 +02:00

* 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
185 lines
5.4 KiB
TypeScript
185 lines
5.4 KiB
TypeScript
import { Point } from "../types";
|
|
import { FONT_FAMILY, TEXT_ALIGN, THEME, VERTICAL_ALIGN } from "../constants";
|
|
|
|
export type ChartType = "bar" | "line";
|
|
export type FillStyle = "hachure" | "cross-hatch" | "solid";
|
|
export type FontFamilyKeys = keyof typeof FONT_FAMILY;
|
|
export type FontFamilyValues = typeof FONT_FAMILY[FontFamilyKeys];
|
|
export type Theme = typeof THEME[keyof typeof THEME];
|
|
export type FontString = string & { _brand: "fontString" };
|
|
export type GroupId = string;
|
|
export type PointerType = "mouse" | "pen" | "touch";
|
|
export type StrokeSharpness = "round" | "sharp";
|
|
export type StrokeStyle = "solid" | "dashed" | "dotted";
|
|
export type TextAlign = typeof TEXT_ALIGN[keyof typeof TEXT_ALIGN];
|
|
|
|
type VerticalAlignKeys = keyof typeof VERTICAL_ALIGN;
|
|
export type VerticalAlign = typeof VERTICAL_ALIGN[VerticalAlignKeys];
|
|
|
|
type _ExcalidrawElementBase = Readonly<{
|
|
id: string;
|
|
x: number;
|
|
y: number;
|
|
strokeColor: string;
|
|
backgroundColor: string;
|
|
fillStyle: FillStyle;
|
|
strokeWidth: number;
|
|
strokeStyle: StrokeStyle;
|
|
strokeSharpness: StrokeSharpness;
|
|
roughness: number;
|
|
opacity: number;
|
|
width: number;
|
|
height: number;
|
|
angle: number;
|
|
/** Random integer used to seed shape generation so that the roughjs shape
|
|
doesn't differ across renders. */
|
|
seed: number;
|
|
/** Integer that is sequentially incremented on each change. Used to reconcile
|
|
elements during collaboration or when saving to server. */
|
|
version: number;
|
|
/** Random integer that is regenerated on each change.
|
|
Used for deterministic reconciliation of updates during collaboration,
|
|
in case the versions (see above) are identical. */
|
|
versionNonce: number;
|
|
isDeleted: boolean;
|
|
/** List of groups the element belongs to.
|
|
Ordered from deepest to shallowest. */
|
|
groupIds: readonly GroupId[];
|
|
/** other elements that are bound to this element */
|
|
boundElements:
|
|
| readonly Readonly<{
|
|
id: ExcalidrawLinearElement["id"];
|
|
type: "arrow" | "text";
|
|
}>[]
|
|
| null;
|
|
/** epoch (ms) timestamp of last element update */
|
|
updated: number;
|
|
link: string | null;
|
|
locked: boolean;
|
|
customData?: Record<string, any>;
|
|
}>;
|
|
|
|
export type ExcalidrawSelectionElement = _ExcalidrawElementBase & {
|
|
type: "selection";
|
|
};
|
|
|
|
export type ExcalidrawRectangleElement = _ExcalidrawElementBase & {
|
|
type: "rectangle";
|
|
};
|
|
|
|
export type ExcalidrawDiamondElement = _ExcalidrawElementBase & {
|
|
type: "diamond";
|
|
};
|
|
|
|
export type ExcalidrawEllipseElement = _ExcalidrawElementBase & {
|
|
type: "ellipse";
|
|
};
|
|
|
|
export type ExcalidrawImageElement = _ExcalidrawElementBase &
|
|
Readonly<{
|
|
type: "image";
|
|
fileId: FileId | null;
|
|
/** whether respective file is persisted */
|
|
status: "pending" | "saved" | "error";
|
|
/** X and Y scale factors <-1, 1>, used for image axis flipping */
|
|
scale: [number, number];
|
|
}>;
|
|
|
|
export type InitializedExcalidrawImageElement = MarkNonNullable<
|
|
ExcalidrawImageElement,
|
|
"fileId"
|
|
>;
|
|
|
|
/**
|
|
* These are elements that don't have any additional properties.
|
|
*/
|
|
export type ExcalidrawGenericElement =
|
|
| ExcalidrawSelectionElement
|
|
| ExcalidrawRectangleElement
|
|
| ExcalidrawDiamondElement
|
|
| ExcalidrawEllipseElement;
|
|
|
|
/**
|
|
* ExcalidrawElement should be JSON serializable and (eventually) contain
|
|
* no computed data. The list of all ExcalidrawElements should be shareable
|
|
* between peers and contain no state local to the peer.
|
|
*/
|
|
export type ExcalidrawElement =
|
|
| ExcalidrawGenericElement
|
|
| ExcalidrawTextElement
|
|
| ExcalidrawLinearElement
|
|
| ExcalidrawFreeDrawElement
|
|
| ExcalidrawImageElement;
|
|
|
|
export type NonDeleted<TElement extends ExcalidrawElement> = TElement & {
|
|
isDeleted: boolean;
|
|
};
|
|
|
|
export type NonDeletedExcalidrawElement = NonDeleted<ExcalidrawElement>;
|
|
|
|
export type ExcalidrawTextElement = _ExcalidrawElementBase &
|
|
Readonly<{
|
|
type: "text";
|
|
fontSize: number;
|
|
fontFamily: FontFamilyValues;
|
|
text: string;
|
|
baseline: number;
|
|
textAlign: TextAlign;
|
|
verticalAlign: VerticalAlign;
|
|
containerId: ExcalidrawGenericElement["id"] | null;
|
|
originalText: string;
|
|
}>;
|
|
|
|
export type ExcalidrawBindableElement =
|
|
| ExcalidrawRectangleElement
|
|
| ExcalidrawDiamondElement
|
|
| ExcalidrawEllipseElement
|
|
| ExcalidrawTextElement
|
|
| ExcalidrawImageElement;
|
|
|
|
export type ExcalidrawTextContainer =
|
|
| ExcalidrawRectangleElement
|
|
| ExcalidrawDiamondElement
|
|
| ExcalidrawEllipseElement
|
|
| ExcalidrawImageElement
|
|
| ExcalidrawArrowEleement;
|
|
|
|
export type ExcalidrawTextElementWithContainer = {
|
|
containerId: ExcalidrawTextContainer["id"];
|
|
} & ExcalidrawTextElement;
|
|
|
|
export type PointBinding = {
|
|
elementId: ExcalidrawBindableElement["id"];
|
|
focus: number;
|
|
gap: number;
|
|
};
|
|
|
|
export type Arrowhead = "arrow" | "bar" | "dot" | "triangle";
|
|
|
|
export type ExcalidrawLinearElement = _ExcalidrawElementBase &
|
|
Readonly<{
|
|
type: "line" | "arrow";
|
|
points: readonly Point[];
|
|
lastCommittedPoint: Point | null;
|
|
startBinding: PointBinding | null;
|
|
endBinding: PointBinding | null;
|
|
startArrowhead: Arrowhead | null;
|
|
endArrowhead: Arrowhead | null;
|
|
}>;
|
|
|
|
export type ExcalidrawArrowEleement = ExcalidrawLinearElement &
|
|
Readonly<{
|
|
type: "arrow";
|
|
}>;
|
|
|
|
export type ExcalidrawFreeDrawElement = _ExcalidrawElementBase &
|
|
Readonly<{
|
|
type: "freedraw";
|
|
points: readonly Point[];
|
|
pressures: readonly number[];
|
|
simulatePressure: boolean;
|
|
lastCommittedPoint: Point | null;
|
|
}>;
|
|
|
|
export type FileId = string & { _brand: "FileId" };
|