smig/excalidraw
1
0
Fork 0
mirror of https://github.com/excalidraw/excalidraw.git synced 2025-05-03 10:00:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

New simple arrows stick to outline as well

Browse source
This commit is contained in:
Mark Tolmacs 2025-03-02 18:22:45 +01:00
parent 2f02d72741
commit 373b940e75
2 changed files with 57 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

68
packages/element/src/linearElementEditor.ts
View file

@ -239,6 +239,43 @@ export class LinearElementEditor {
});
}
static getOutlineAvoidingPoint(
element: NonDeleted<ExcalidrawLinearElement>,
coords: { x: number; y: number },
pointIndex: number,
app: AppClassProperties,
): GlobalPoint {
const elbowed = isElbowArrow(element);
const hoveredElement = getHoveredElementForBinding(
coords,
app.scene.getNonDeletedElements(),
app.scene.getNonDeletedElementsMap(),
app.state.zoom,
elbowed,
elbowed,
);
const p = pointFrom<GlobalPoint>(coords.x, coords.y);
if (hoveredElement) {
const newPoints = Array.from(element.points);
newPoints[pointIndex] = pointFrom<LocalPoint>(
p[0] - element.x,
p[1] - element.y,
);
return bindPointToSnapToElementOutline(
{
...element,
points: newPoints,
},
hoveredElement,
pointIndex === 0 ? "start" : "end",
);
}
return p;
}
/**
* @returns whether point was dragged
*/
@ -352,33 +389,16 @@ export class LinearElementEditor {
pointIndex === 0 ||
pointIndex === element.points.length - 1
) {
const hoveredElement = getHoveredElementForBinding(
{
x: scenePointerX,
y: scenePointerY,
},
app.scene.getNonDeletedElements(),
app.scene.getNonDeletedElementsMap(),
app.state.zoom,
elbowed,
elbowed,
);
if (hoveredElement) {
const newPoints = Array.from(element.points);
newPoints[pointIndex] = pointFrom(
element.points[pointIndex][0] + deltaX,
element.points[pointIndex][1] + deltaY,
);
globalNewPointPosition = bindPointToSnapToElementOutline(
globalNewPointPosition =
LinearElementEditor.getOutlineAvoidingPoint(
element,
{
...element,
points: newPoints,
x: element.x + element.points[pointIndex][0] + deltaX,
y: element.y + element.points[pointIndex][1] + deltaY,
},
hoveredElement,
pointIndex === 0 ? "start" : "end",
pointIndex,
app,
);
}
}
newPointPosition = LinearElementEditor.createPointAt(

14
packages/excalidraw/components/App.tsx
View file

@ -8683,10 +8683,22 @@ class App extends React.Component<AppProps, AppState> {
points.length === 2 ||
(points.length > 1 && isElbowArrow(newElement))
) {
const globalPoint = LinearElementEditor.getOutlineAvoidingPoint(
newElement,
{ x: newElement.x + dx, y: newElement.y + dy },
1,
this,
);
mutateElement(
newElement,
{
points: [...points.slice(0, -1), pointFrom<LocalPoint>(dx, dy)],
points: [
...points.slice(0, -1),
pointFrom<LocalPoint>(
globalPoint[0] - newElement.x,
globalPoint[1] - newElement.y,
),
],
},
false,
{ isDragging: true },