marcel/excalidraw
1
0
Fork 0
mirror of https://github.com/excalidraw/excalidraw.git synced 2025-11-20 04:34:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: Restore arrow start point when self binding

Browse Source
This commit is contained in:
Mark Tolmacs
2025-11-08 15:45:43 +01:00
parent d93a6f09fe
commit 3ac0a3c3ef
3 changed files with 134 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
packages/element/src/binding.ts
View File

@@ -665,41 +665,46 @@ const getBindingStrategyForDraggingBindingElementEndpoints_simple = (
otherBinding.elementId,
) as NonDeleted<ExcalidrawBindableElement>)
: undefined;
const otherFocusPoint =
otherBinding &&
otherBindableElement &&
getGlobalFixedPointForBindableElement(
otherBinding.fixedPoint,
otherBindableElement,
elementsMap,
);
const otherPoint = LinearElementEditor.getPointAtIndexGlobalCoordinates(
arrow,
startDragged ? -1 : 0,
elementsMap,
);
const otherFocusPointIsInElement =
otherBindableElement &&
otherFocusPoint &&
isPointInElement(otherFocusPoint, otherBindableElement, elementsMap);
// const otherFocusPoint =
// otherBinding &&
// otherBindableElement &&
// getGlobalFixedPointForBindableElement(
// otherBinding.fixedPoint,
// otherBindableElement,
// elementsMap,
// );
// const otherPoint = LinearElementEditor.getPointAtIndexGlobalCoordinates(
// arrow,
// startDragged ? -1 : 0,
// elementsMap,
// );
// const otherFocusPointIsInElement =
// otherBindableElement &&
// otherFocusPoint &&
// isPointInElement(otherFocusPoint, otherBindableElement, elementsMap);
// Handle outside-outside binding with the same element
if (
otherBinding &&
otherBinding.elementId === hit?.id &&
!pointInElement &&
!otherFocusPointIsInElement
) {
// Handle outside-outside binding to the same element
if (otherBinding && otherBinding.elementId === hit?.id) {
const [startFixedPoint, endFixedPoint] = getGlobalFixedPoints(
arrow,
elementsMap,
);
invariant(
!opts?.newArrow || appState.selectedLinearElement?.initialState.origin,
"appState.selectedLinearElement.initialState.origin must be defined for new arrows",
);
return {
start: {
mode: "inside",
element: hit,
focusPoint: startDragged ? globalPoint : startFixedPoint,
focusPoint: startDragged
? globalPoint
: // NOTE: Can only affect the start point because new arrows always drag the end point
opts?.newArrow
? appState.selectedLinearElement!.initialState.origin!
: startFixedPoint,
},
end: {
mode: "inside",
@@ -709,8 +714,31 @@ const getBindingStrategyForDraggingBindingElementEndpoints_simple = (
};
}
// Handle special alt key case to inside bind no matter what
if (opts?.altKey) {
return {
start:
startDragged && hit
? {
mode: "inside",
element: hit,
focusPoint: globalPoint,
}
: start,
end:
endDragged && hit
? {
mode: "inside",
element: hit,
focusPoint: globalPoint,
}
: end,
};
}
// Handle normal cases
const current: BindingStrategy = hit
? pointInElement || opts?.altKey
? pointInElement
? {
mode: "inside",
element: hit,
@@ -731,27 +759,13 @@ const getBindingStrategyForDraggingBindingElementEndpoints_simple = (
: { mode: null };
const other: BindingStrategy =
!opts?.altKey && opts?.newArrow && otherBindableElement
? otherBindableElement.id === hit?.id
? {
mode: "inside",
element: otherBindableElement,
focusPoint: otherPoint,
}
: {
mode: "orbit",
element: otherBindableElement,
focusPoint:
otherFocusPointIsInElement && !opts?.initialBinding
? otherFocusPoint
: projectFixedPointOntoDiagonal(
arrow,
otherPoint,
otherBindableElement,
startDragged ? "end" : "start",
elementsMap,
) || otherPoint,
}
otherBindableElement &&
appState.selectedLinearElement?.initialState.altFocusPoint
? {
mode: "orbit",
element: otherBindableElement,
focusPoint: appState.selectedLinearElement.initialState.altFocusPoint,
}
: { mode: undefined };
return {
@@ -2128,7 +2142,7 @@ export class BindableElement {
}
export const getGlobalFixedPointForBindableElement = (
fixedPointRatio: [number, number],
fixedPointRatio: FixedPoint,
element: ExcalidrawBindableElement,
elementsMap: ElementsMap,
): GlobalPoint => {