gilles/excalidraw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: fail gracefully during restore (#10673)

Browse Source 
* fix: fail gracefully during restore

* tests
This commit is contained in:
David Luzar
2026-01-20 12:33:22 +01:00
committed by GitHub
parent 0988ecfef4
commit 60ab14c2f6
3 changed files with 284 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/excalidraw/data/restore.ts
+108 -99
View File
@@ -136,99 +136,103 @@ const repairBinding = <T extends ExcalidrawArrowElement>(
existingElementsMap: Readonly<ElementsMap> | null | undefined,
startOrEnd: "start" | "end",
): FixedPointBinding | null => {
if (!binding) {
return null;
}
// ---------------------------------------------------------------------------
// elbow arrows
// ---------------------------------------------------------------------------
if (isElbowArrow(element)) {
const fixedPointBinding:
| ExcalidrawElbowArrowElement["startBinding"]
| ExcalidrawElbowArrowElement["endBinding"] = {
...binding,
fixedPoint: normalizeFixedPoint(binding.fixedPoint ?? [0, 0]),
mode: binding.mode || "orbit",
};
return fixedPointBinding;
}
// ---------------------------------------------------------------------------
// simple arrows
// ---------------------------------------------------------------------------
// binding schema v2
// ---------------------------------------------------------------------------
if (binding.mode) {
// if latest binding schema, don't check if binding.elementId exists
// (it's done in a separate pass)
if (binding.elementId) {
return {
elementId: binding.elementId,
mode: binding.mode,
fixedPoint: normalizeFixedPoint(binding.fixedPoint || [0.5, 0.5]),
} as FixedPointBinding | null;
try {
if (!binding) {
return null;
}
return null;
// ---------------------------------------------------------------------------
// elbow arrows
// ---------------------------------------------------------------------------
if (isElbowArrow(element)) {
const fixedPointBinding:
| ExcalidrawElbowArrowElement["startBinding"]
| ExcalidrawElbowArrowElement["endBinding"] = {
...binding,
fixedPoint: normalizeFixedPoint(binding.fixedPoint ?? [0, 0]),
mode: binding.mode || "orbit",
};
return fixedPointBinding;
}
// ---------------------------------------------------------------------------
// simple arrows
// ---------------------------------------------------------------------------
// binding schema v2
// ---------------------------------------------------------------------------
if (binding.mode) {
// if latest binding schema, don't check if binding.elementId exists
// (it's done in a separate pass)
if (binding.elementId) {
return {
elementId: binding.elementId,
mode: binding.mode,
fixedPoint: normalizeFixedPoint(binding.fixedPoint || [0.5, 0.5]),
} as FixedPointBinding | null;
}
return null;
}
// binding schema v1 (legacy) -> attempt to migrate to v2
// ---------------------------------------------------------------------------
const targetBoundElement =
(targetElementsMap.get(binding.elementId) as ExcalidrawBindableElement) ||
undefined;
const boundElement =
targetBoundElement ||
(existingElementsMap?.get(
binding.elementId,
) as ExcalidrawBindableElement) ||
undefined;
const elementsMap = targetBoundElement
? targetElementsMap
: existingElementsMap;
// migrating legacy focus point bindings
if (boundElement && elementsMap) {
const p = LinearElementEditor.getPointAtIndexGlobalCoordinates(
element,
startOrEnd === "start" ? 0 : element.points.length - 1,
elementsMap,
);
const mode = isPointInElement(p, boundElement, elementsMap)
? "inside"
: "orbit";
const focusPoint =
mode === "inside"
? p
: projectFixedPointOntoDiagonal(
element,
p,
boundElement,
startOrEnd,
elementsMap,
) || p;
const { fixedPoint } = calculateFixedPointForNonElbowArrowBinding(
element,
boundElement,
startOrEnd,
elementsMap,
focusPoint,
);
return {
mode,
elementId: binding.elementId,
fixedPoint,
};
}
console.error(`could not repair binding for element`);
} catch (error) {
console.error("Error repairing binding:", error);
}
// binding schema v1 (legacy) -> attempt to migrate to v2
// ---------------------------------------------------------------------------
const targetBoundElement =
(targetElementsMap.get(binding.elementId) as ExcalidrawBindableElement) ||
undefined;
const boundElement =
targetBoundElement ||
(existingElementsMap?.get(
binding.elementId,
) as ExcalidrawBindableElement) ||
undefined;
const elementsMap = targetBoundElement
? targetElementsMap
: existingElementsMap;
// migrating legacy focus point bindings
if (boundElement && elementsMap) {
const p = LinearElementEditor.getPointAtIndexGlobalCoordinates(
element,
startOrEnd === "start" ? 0 : element.points.length - 1,
elementsMap,
);
const mode = isPointInElement(p, boundElement, elementsMap)
? "inside"
: "orbit";
const focusPoint =
mode === "inside"
? p
: projectFixedPointOntoDiagonal(
element,
p,
boundElement,
startOrEnd,
elementsMap,
) || p;
const { fixedPoint } = calculateFixedPointForNonElbowArrowBinding(
element,
boundElement,
startOrEnd,
elementsMap,
focusPoint,
);
return {
mode,
elementId: binding.elementId,
fixedPoint,
};
}
console.error(`could not repair binding for element`);
return null;
};
@@ -639,15 +643,20 @@ export const restoreElements = <T extends ExcalidrawElement>(
if (element.type === "selection") {
return elements;
}
let migratedElement: ExcalidrawElement | null = restoreElement(
element,
targetElementsMap,
existingElementsMap,
{
deleteInvisibleElements: opts?.deleteInvisibleElements,
},
);
let migratedElement: ExcalidrawElement | null;
try {
migratedElement = restoreElement(
element,
targetElementsMap,
existingElementsMap,
{
deleteInvisibleElements: opts?.deleteInvisibleElements,
},
);
} catch (error) {
console.error("Error restoring element:", error);
migratedElement = null;
}
if (migratedElement) {
const localElement = existingElementsMap?.get(element.id);