26f67d27ec
* Refactor: simplify linear element type * Refactor: dedupe scrollbar handling * First step towards binding - establish relationship and basic test for dragged lines * Refactor: use zoom from appstate * Refactor: generalize getElementAtPosition * Only consider bindable elements in hit test * Refactor: pull out pieces of hit test for reuse later * Refactor: pull out diamond from hit test for reuse later * Refactor: pull out text from hit test for reuse later * Suggest binding when hovering * Give shapes in regression test real size * Give shapes in undo/redo test real size * Keep bound element highlighted * Show binding suggestion for multi-point elements * Move binding to its on module with functions so that I can use it from actions, add support for binding end of multi-point elements * Use Id instead of ID * Improve boundary offset for non-squarish elements * Fix localStorage for binding on linear elements * Simplify dragging code and fix elements bound twice to the same shape * Fix binding for rectangles * Bind both ends at the end of the linear element creation, needed for focus points * wip * Refactor: Renames and reshapes for next commit * Calculate and store focus points and gaps, but dont use them yet * Focus points for rectangles * Dont blow up when canceling linear element * Stop suggesting binding when a non-compatible tool is selected * Clean up collision code * Using Geometric Algebra for hit tests * Correct binding for all shapes * Constant gap around polygon corners * Fix rotation handling * Generalize update and fix hit test for rotated elements * Handle rotation realtime * Handle scaling * Remove vibration when moving bound and binding element together * Handle simultenous scaling * Allow binding and unbinding when editing linear elements * Dont delete binding when the end point wasnt touched * Bind on enter/escape when editing * Support multiple suggested bindable elements in preparation for supporting linear elements dragging * Update binding when moving linear elements * Update binding when resizing linear elements * Dont re-render UI on binding hints * Update both ends when one is moved * Use distance instead of focus point for binding * Complicated approach for posterity, ignore this commit * Revert the complicated approach * Better focus point strategy, working for all shapes * Update snapshots * Dont break binding gap when mirroring shape * Dont break binding gap when grid mode pushes it inside * Dont bind draw elements * Support alt duplication * Fix alt duplication to * Support cmd+D duplication * All copy mechanisms are supported * Allow binding shapes to arrows, having arrows created first * Prevent arrows from disappearing for ellipses * Better binding suggestion highlight for shapes * Dont suggest second binding for simple elements when editing or moving them * Dont steal already bound linear elements when moving shapes * Fix highlighting diamonds and more precisely highlight other shapes * Highlight linear element edges for binding * Highlight text binding too * Handle deletion * Dont suggest second binding for simple linear elements when creating them * Dont highlight bound element during creation * Fix binding for rotated linear elements * Fix collision check for ellipses * Dont show suggested bindings for selected pairs * Bind multi-point linear elements when the tool is switched - important for mobile * Handle unbinding one of two bound edges correctly * Rename boundElement in state to startBoundElement * Dont double account for zoom when rendering binding highlight * Fix rendering of edited linear element point handles * Suggest binding when adding new point to a linear element * Bind when adding a new point to a linear element and dont unbind when moving middle elements * Handle deleting points * Add cmd modifier key to disable binding * Use state for enabling binding, fix not binding for linear elements during creation * Drop support for binding lines, only arrows are bindable * Reset binding mode on blur * Fix not binding lines
137 lines
4.2 KiB
TypeScript
137 lines
4.2 KiB
TypeScript
import {
|
|
ExcalidrawElement,
|
|
FontFamily,
|
|
ExcalidrawSelectionElement,
|
|
} from "../element/types";
|
|
import { AppState } from "../types";
|
|
import { DataState } from "./types";
|
|
import { isInvisiblySmallElement, getNormalizedDimensions } from "../element";
|
|
import { randomId } from "../random";
|
|
import {
|
|
FONT_FAMILY,
|
|
DEFAULT_FONT_FAMILY,
|
|
DEFAULT_TEXT_ALIGN,
|
|
DEFAULT_VERTICAL_ALIGN,
|
|
} from "../constants";
|
|
|
|
const getFontFamilyByName = (fontFamilyName: string): FontFamily => {
|
|
for (const [id, fontFamilyString] of Object.entries(FONT_FAMILY)) {
|
|
if (fontFamilyString.includes(fontFamilyName)) {
|
|
return parseInt(id) as FontFamily;
|
|
}
|
|
}
|
|
return DEFAULT_FONT_FAMILY;
|
|
};
|
|
|
|
function migrateElementWithProperties<T extends ExcalidrawElement>(
|
|
element: Required<T>,
|
|
extra: Omit<Required<T>, keyof ExcalidrawElement>,
|
|
): T {
|
|
const base: Pick<T, keyof ExcalidrawElement> = {
|
|
type: element.type,
|
|
// all elements must have version > 0 so getDrawingVersion() will pick up
|
|
// newly added elements
|
|
version: element.version || 1,
|
|
versionNonce: element.versionNonce ?? 0,
|
|
isDeleted: false,
|
|
id: element.id || randomId(),
|
|
fillStyle: element.fillStyle || "hachure",
|
|
strokeWidth: element.strokeWidth || 1,
|
|
strokeStyle: element.strokeStyle ?? "solid",
|
|
roughness: element.roughness ?? 1,
|
|
opacity: element.opacity == null ? 100 : element.opacity,
|
|
angle: element.angle || 0,
|
|
x: element.x || 0,
|
|
y: element.y || 0,
|
|
strokeColor: element.strokeColor,
|
|
backgroundColor: element.backgroundColor,
|
|
width: element.width || 0,
|
|
height: element.height || 0,
|
|
seed: element.seed ?? 1,
|
|
groupIds: element.groupIds ?? [],
|
|
boundElementIds: element.boundElementIds ?? [],
|
|
};
|
|
|
|
return {
|
|
...base,
|
|
...getNormalizedDimensions(base),
|
|
...extra,
|
|
} as T;
|
|
}
|
|
|
|
const migrateElement = (
|
|
element: Exclude<ExcalidrawElement, ExcalidrawSelectionElement>,
|
|
): typeof element => {
|
|
switch (element.type) {
|
|
case "text":
|
|
let fontSize = element.fontSize;
|
|
let fontFamily = element.fontFamily;
|
|
if ("font" in element) {
|
|
const [fontPx, _fontFamily]: [
|
|
string,
|
|
string,
|
|
] = (element as any).font.split(" ");
|
|
fontSize = parseInt(fontPx, 10);
|
|
fontFamily = getFontFamilyByName(_fontFamily);
|
|
}
|
|
return migrateElementWithProperties(element, {
|
|
fontSize,
|
|
fontFamily,
|
|
text: element.text ?? "",
|
|
baseline: element.baseline,
|
|
textAlign: element.textAlign || DEFAULT_TEXT_ALIGN,
|
|
verticalAlign: element.verticalAlign || DEFAULT_VERTICAL_ALIGN,
|
|
});
|
|
case "draw":
|
|
case "line":
|
|
case "arrow": {
|
|
return migrateElementWithProperties(element, {
|
|
startBinding: element.startBinding,
|
|
endBinding: element.endBinding,
|
|
points:
|
|
// migrate old arrow model to new one
|
|
!Array.isArray(element.points) || element.points.length < 2
|
|
? [
|
|
[0, 0],
|
|
[element.width, element.height],
|
|
]
|
|
: element.points,
|
|
lastCommittedPoint: null,
|
|
});
|
|
}
|
|
// generic elements
|
|
case "ellipse":
|
|
return migrateElementWithProperties(element, {});
|
|
case "rectangle":
|
|
return migrateElementWithProperties(element, {});
|
|
case "diamond":
|
|
return migrateElementWithProperties(element, {});
|
|
|
|
// don't use default case so as to catch a missing an element type case
|
|
// (we also don't want to throw, but instead return void so we
|
|
// filter out these unsupported elements from the restored array)
|
|
}
|
|
};
|
|
|
|
export const restore = (
|
|
savedElements: readonly ExcalidrawElement[],
|
|
savedState: MarkOptional<AppState, "offsetTop" | "offsetLeft"> | null,
|
|
): DataState => {
|
|
const elements = savedElements.reduce((elements, element) => {
|
|
// filtering out selection, which is legacy, no longer kept in elements,
|
|
// and causing issues if retained
|
|
if (element.type !== "selection" && !isInvisiblySmallElement(element)) {
|
|
const migratedElement = migrateElement(element);
|
|
if (migratedElement) {
|
|
elements.push(migratedElement);
|
|
}
|
|
}
|
|
return elements;
|
|
}, [] as ExcalidrawElement[]);
|
|
|
|
return {
|
|
elements: elements,
|
|
appState: savedState,
|
|
};
|
|
};
|