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

feat: No angle lock over bindable elements

Browse Source 
Signed-off-by: Mark Tolmacs <mark@lazycat.hu>
This commit is contained in:
Mark Tolmacs
2025-09-29 10:03:07 +02:00
parent 2a4f7e94b1
commit 0232917443
2 changed files with 49 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,6 +25,7 @@ import {
import {
deconstructLinearOrFreeDrawElement,
getHoveredElementForBinding,
isPathALoop,
moveArrowAboveBindable,
type Store,
@@ -301,11 +302,21 @@ export class LinearElementEditor {
const customLineAngle =
linearElementEditor.customLineAngle ??
determineCustomLinearAngle(pivotPoint, element.points[idx]);
const hoveredElement = getHoveredElementForBinding(
pointFrom<GlobalPoint>(scenePointerX, scenePointerY),
elements,
elementsMap,
);
// Determine if point movement should happen and how much
let deltaX = 0;
let deltaY = 0;
if (shouldRotateWithDiscreteAngle(event)) {
if (
shouldRotateWithDiscreteAngle(event) &&
!hoveredElement &&
!element.startBinding &&
!element.endBinding
) {
const [width, height] = LinearElementEditor._getShiftLockedDelta(
element,
elementsMap,
@@ -453,11 +464,22 @@ export class LinearElementEditor {
const endIsSelected = selectedPointsIndices.includes(
element.points.length - 1,
);
const hoveredElement = getHoveredElementForBinding(
pointFrom<GlobalPoint>(scenePointerX, scenePointerY),
elements,
elementsMap,
);
// Determine if point movement should happen and how much
let deltaX = 0;
let deltaY = 0;
if (shouldRotateWithDiscreteAngle(event) && singlePointDragged) {
if (
shouldRotateWithDiscreteAngle(event) &&
singlePointDragged &&
!hoveredElement &&
!element.startBinding &&
!element.endBinding
) {
const [width, height] = LinearElementEditor._getShiftLockedDelta(
element,
elementsMap,

37
packages/excalidraw/components/App.tsx
View File

@@ -1119,25 +1119,38 @@ class App extends React.Component<AppProps, AppState> {
: endDragged
? "endBinding"
: null;
const isAlreadyInsideBindingToSameElement = startDragged
? arrow.startBinding?.mode === "inside" &&
arrow.startBinding?.elementId === hoveredElement?.id
const otherBinding = startDragged
? "endBinding"
: endDragged
? arrow.endBinding?.mode === "inside" &&
arrow.endBinding?.elementId === hoveredElement?.id
: false;
? "startBinding"
: null;
const isAlreadyInsideBindingToSameElement =
(otherBinding &&
arrow[otherBinding]?.mode === "inside" &&
arrow[otherBinding]?.elementId === hoveredElement?.id) ||
(currentBinding && arrow[currentBinding]?.mode === "inside");
if (
currentBinding &&
otherBinding &&
arrow[currentBinding]?.mode === "inside" &&
hoveredElement?.id !== arrow[currentBinding]?.elementId
hoveredElement?.id !== arrow[currentBinding]?.elementId &&
arrow[otherBinding]?.elementId !== arrow[currentBinding]?.elementId
) {
// Update binding out of place to orbit mode
this.scene.mutateElement(arrow, {
[currentBinding]: {
...arrow[currentBinding],
mode: "orbit",
this.scene.mutateElement(
arrow,
{
[currentBinding]: {
...arrow[currentBinding],
mode: "orbit",
},
},
});
{
informMutation: false,
isDragging: true,
},
);
}
if (