marcel/excalidraw
1
0
Fork 0
mirror of https://github.com/excalidraw/excalidraw.git synced 2025-09-18 06:50:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: Disable drag drag when arrow is bound

Browse Source
This commit is contained in:
Mark Tolmacs
2025-09-02 16:14:20 +02:00
parent 8dae900bbb
commit 4f43399951
1 changed files with 48 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
packages/element/src/linearElementEditor.ts
View File

@@ -25,9 +25,7 @@ import {
import {
deconstructLinearOrFreeDrawElement,
distanceToElement,
isPathALoop,
isPointInElement,
moveArrowAboveBindable,
type Store,
} from "@excalidraw/element";
@@ -46,7 +44,6 @@ import type {
import {
calculateFixedPointForNonElbowArrowBinding,
getBindingStrategyForDraggingBindingElementEndpoints,
getFixedBindingDistance,
isBindingEnabled,
maybeSuggestBindingsForBindingElementAtCoords,
updateBoundPoint,
@@ -60,12 +57,7 @@ import {
import { headingIsHorizontal, vectorToHeading } from "./heading";
import { mutateElement } from "./mutateElement";
import { getBoundTextElement, handleBindTextResize } from "./textElement";
import {
isArrowElement,
isBindingElement,
isElbowArrow,
isSimpleArrow,
} from "./typeChecks";
import { isArrowElement, isBindingElement, isElbowArrow } from "./typeChecks";
import { ShapeCache, toggleLinePolygonState } from "./shape";
@@ -466,14 +458,15 @@ export class LinearElementEditor {
deltaX = target[0] - draggingPoint[0];
deltaY = target[1] - draggingPoint[1];
} else if (
shouldAllowDraggingPoint(
element,
scenePointerX,
scenePointerY,
selectedPointsIndices,
elementsMap,
app,
)
// shouldAllowDraggingPoint(
// element,
// scenePointerX,
// scenePointerY,
// selectedPointsIndices,
// elementsMap,
// app,
// )
true
) {
const newDraggingPointPosition = LinearElementEditor.createPointAt(
element,
@@ -2254,48 +2247,48 @@ const pointDraggingUpdates = (
};
};
const shouldAllowDraggingPoint = (
element: ExcalidrawLinearElement,
scenePointerX: number,
scenePointerY: number,
selectedPointsIndices: readonly number[],
elementsMap: Readonly<NonDeletedSceneElementsMap>,
app: AppClassProperties,
) => {
if (!isSimpleArrow(element)) {
return true;
}
// const shouldAllowDraggingPoint = (
// element: ExcalidrawLinearElement,
// scenePointerX: number,
// scenePointerY: number,
// selectedPointsIndices: readonly number[],
// elementsMap: Readonly<NonDeletedSceneElementsMap>,
// app: AppClassProperties,
// ) => {
// if (!isSimpleArrow(element)) {
// return true;
// }
const scenePointer = pointFrom<GlobalPoint>(scenePointerX, scenePointerY);
// const scenePointer = pointFrom<GlobalPoint>(scenePointerX, scenePointerY);
// Do not allow dragging the bound arrow closer to the shape than
// the dragging threshold
let allowDrag = true;
// // Do not allow dragging the bound arrow closer to the shape than
// // the dragging threshold
// let allowDrag = true;
if (selectedPointsIndices.includes(0) && element.startBinding) {
const boundElement = elementsMap.get(
element.startBinding.elementId,
)! as ExcalidrawBindableElement;
const dist = distanceToElement(boundElement, elementsMap, scenePointer);
const inside = isPointInElement(scenePointer, boundElement, elementsMap);
allowDrag =
allowDrag && (dist > getFixedBindingDistance(boundElement) || inside);
}
if (
selectedPointsIndices.includes(element.points.length - 1) &&
element.endBinding
) {
const boundElement = elementsMap.get(
element.endBinding.elementId,
)! as ExcalidrawBindableElement;
const dist = distanceToElement(boundElement, elementsMap, scenePointer);
const inside = isPointInElement(scenePointer, boundElement, elementsMap);
allowDrag =
allowDrag && (dist > getFixedBindingDistance(boundElement) || inside);
}
// if (selectedPointsIndices.includes(0) && element.startBinding) {
// const boundElement = elementsMap.get(
// element.startBinding.elementId,
// )! as ExcalidrawBindableElement;
// const dist = distanceToElement(boundElement, elementsMap, scenePointer);
// const inside = isPointInElement(scenePointer, boundElement, elementsMap);
// allowDrag =
// allowDrag && (dist > getFixedBindingDistance(boundElement) || inside);
// }
// if (
// selectedPointsIndices.includes(element.points.length - 1) &&
// element.endBinding
// ) {
// const boundElement = elementsMap.get(
// element.endBinding.elementId,
// )! as ExcalidrawBindableElement;
// const dist = distanceToElement(boundElement, elementsMap, scenePointer);
// const inside = isPointInElement(scenePointer, boundElement, elementsMap);
// allowDrag =
// allowDrag && (dist > getFixedBindingDistance(boundElement) || inside);
// }
return allowDrag;
};
// return allowDrag;
// };
const determineCustomLinearAngle = (
pivotPoint: LocalPoint,