marcel/excalidraw
1
0
Fork 0
mirror of https://github.com/excalidraw/excalidraw.git synced 2025-09-15 05:20:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: add snapping on top of angle locking when both enabled

Browse Source
This commit is contained in:
Ryan Di
2025-06-24 18:37:07 +10:00
parent 07640dd756
commit c1a54455bb
3 changed files with 424 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
packages/element/src/snapping.ts
View File

@@ -2,6 +2,7 @@ import {
isCloseTo,
pointFrom,
pointRotateRads,
pointsEqual,
rangeInclusive,
rangeIntersection,
rangesOverlap,
@@ -196,7 +197,7 @@ export const areRoughlyEqual = (a: number, b: number, precision = 0.01) => {
};
export const getLinearElementPoints = (
element: ExcalidrawElement,
element: ExcalidrawLinearElement,
elementsMap: ElementsMap,
options: {
dragOffset?: Vector2D;
@@ -205,13 +206,11 @@ export const getLinearElementPoints = (
): GlobalPoint[] => {
const { dragOffset, excludePointIndex } = options;
// Only process linear elements
if (element.type !== "line" && element.type !== "arrow") {
if (isElbowArrow(element)) {
return [];
}
const linearElement = element as ExcalidrawLinearElement;
if (!linearElement.points || linearElement.points.length === 0) {
if (!element.points || element.points.length === 0) {
return [];
}
@@ -225,13 +224,13 @@ export const getLinearElementPoints = (
const globalPoints: GlobalPoint[] = [];
for (let i = 0; i < linearElement.points.length; i++) {
for (let i = 0; i < element.points.length; i++) {
// Skip the point being edited if specified
if (excludePointIndex !== undefined && i === excludePointIndex) {
continue;
}
const localPoint = linearElement.points[i];
const localPoint = element.points[i];
const globalX = elementX + localPoint[0];
const globalY = elementY + localPoint[1];
@@ -747,6 +746,21 @@ export const getReferenceSnapPointsForLinearElementPoint = (
const elementPoints = getLinearElementPoints(editingElement, elementsMap, {
excludePointIndex: editingPointIndex >= 0 ? editingPointIndex : undefined,
});
const shouldSkipFirstOrLast =
editingElement.points.length > 2 &&
pointsEqual(
editingElement.points[0],
editingElement.points[editingElement.points.length - 1],
);
if (shouldSkipFirstOrLast) {
if (editingPointIndex === 0) {
elementPoints.pop();
}
if (editingPointIndex === editingElement.points.length - 1) {
elementPoints.shift();
}
}
allSnapPoints.push(...elementPoints);
}