GitHub
/
excalidraw
mirror of https://github.com/excalidraw/excalidraw.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

fix: when dragging arrow endpoint, update binding only on the dragged side (#9367)

pull/9443/head
Narek Malkhasyan 8 months ago committed by GitHub
parent
a18b139a60
commit
2a0d15799c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 77 additions and 105 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      packages/element/src/binding.ts
  2. 164
      packages/excalidraw/tests/__snapshots__/history.test.tsx.snap

18
packages/element/src/binding.ts
Unescape View File

@ -276,15 +276,6 @@ const getBindingStrategyForDraggingArrowEndpoints = (
zoom, zoom,
) )
: null // If binding is disabled and start is dragged, break all binds : null // If binding is disabled and start is dragged, break all binds
: !isElbowArrow(selectedElement)
? // We have to update the focus and gap of the binding, so let's rebind
getElligibleElementForBindingElement(
selectedElement,
"start",
elementsMap,
elements,
zoom,
)
: "keep"; : "keep";
const end = endDragged const end = endDragged
? isBindingEnabled ? isBindingEnabled
@ -296,15 +287,6 @@ const getBindingStrategyForDraggingArrowEndpoints = (
zoom, zoom,
) )
: null // If binding is disabled and end is dragged, break all binds : null // If binding is disabled and end is dragged, break all binds
: !isElbowArrow(selectedElement)
? // We have to update the focus and gap of the binding, so let's rebind
getElligibleElementForBindingElement(
selectedElement,
"end",
elementsMap,
elements,
zoom,
)
: "keep"; : "keep";
return [start, end]; return [start, end];

164
packages/excalidraw/tests/__snapshots__/history.test.tsx.snap
Unescape View File

@ -171,7 +171,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
"strokeWidth": 2, "strokeWidth": 2,
"type": "rectangle", "type": "rectangle",
"updated": 1, "updated": 1,
"version": 19, "version": 9,
"width": 100, "width": 100,
"x": 100, "x": 100,
"y": -50, "y": -50,
@ -198,7 +198,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
"fillStyle": "solid", "fillStyle": "solid",
"frameId": null, "frameId": null,
"groupIds": [], "groupIds": [],
"height": "102.35417", "height": "102.45605",
"id": "id172", "id": "id172",
"index": "a2", "index": "a2",
"isDeleted": false, "isDeleted": false,
@ -212,8 +212,8 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
0, 0,
], ],
[ [
"101.77517", "102.80179",
"102.35417", "102.45605",
], ],
], ],
"roughness": 1, "roughness": 1,
@ -227,9 +227,9 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
"strokeWidth": 2, "strokeWidth": 2,
"type": "arrow", "type": "arrow",
"updated": 1, "updated": 1,
"version": 40, "version": 37,
"width": "101.77517", "width": "102.80179",
"x": "0.70711", "x": "-0.42182",
"y": 0, "y": 0,
} }
`; `;
@ -264,7 +264,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
"strokeWidth": 2, "strokeWidth": 2,
"type": "rectangle", "type": "rectangle",
"updated": 1, "updated": 1,
"version": 6, "version": 14,
"width": 50, "width": 50,
"x": 100, "x": 100,
"y": 100, "y": 100,
@ -291,22 +291,39 @@ History {
"added": Map {}, "added": Map {},
"removed": Map {}, "removed": Map {},
"updated": Map { "updated": Map {
"id171" => Delta {
"deleted": {
"boundElements": [],
},
"inserted": {
"boundElements": [
{
"id": "id172",
"type": "arrow",
},
],
},
},
"id172" => Delta { "id172" => Delta {
"deleted": { "deleted": {
"endBinding": { "endBinding": {
"elementId": "id171", "elementId": "id175",
"focus": "0.00990", "fixedPoint": [
"0.50000",
1,
],
"focus": 0,
"gap": 1, "gap": 1,
}, },
"height": "0.98586", "height": "70.45017",
"points": [ "points": [
[ [
0, 0,
0, 0,
], ],
[ [
"98.58579", "100.70774",
"-0.98586", "70.45017",
], ],
], ],
"startBinding": { "startBinding": {
@ -321,7 +338,7 @@ History {
"focus": "-0.02000", "focus": "-0.02000",
"gap": 1, "gap": 1,
}, },
"height": "0.00000", "height": "0.09250",
"points": [ "points": [
[ [
0, 0,
@ -329,7 +346,7 @@ History {
], ],
[ [
"98.58579", "98.58579",
"0.00000", "0.09250",
], ],
], ],
"startBinding": { "startBinding": {
@ -339,6 +356,19 @@ History {
}, },
}, },
}, },
"id175" => Delta {
"deleted": {
"boundElements": [
{
"id": "id172",
"type": "arrow",
},
],
},
"inserted": {
"boundElements": [],
},
},
}, },
}, },
}, },
@ -366,59 +396,32 @@ History {
], ],
}, },
}, },
"id171" => Delta {
"deleted": {
"boundElements": [],
},
"inserted": {
"boundElements": [
{
"id": "id172",
"type": "arrow",
},
],
},
},
"id172" => Delta { "id172" => Delta {
"deleted": { "deleted": {
"endBinding": { "height": "102.45584",
"elementId": "id175",
"fixedPoint": [
"0.50000",
1,
],
"focus": 0,
"gap": 1,
},
"height": "102.35417",
"points": [ "points": [
[ [
0, 0,
0, 0,
], ],
[ [
"101.77517", "102.79971",
"102.35417", "102.45584",
], ],
], ],
"startBinding": null, "startBinding": null,
"y": 0, "y": 0,
}, },
"inserted": { "inserted": {
"endBinding": { "height": "70.33521",
"elementId": "id171",
"focus": "0.00990",
"gap": 1,
},
"height": "0.98586",
"points": [ "points": [
[ [
0, 0,
0, 0,
], ],
[ [
"98.58579", "100.78887",
"-0.98586", "70.33521",
], ],
], ],
"startBinding": { "startBinding": {
@ -426,20 +429,7 @@ History {
"focus": "0.02970", "focus": "0.02970",
"gap": 1, "gap": 1,
}, },
"y": "0.99364", "y": "35.20327",
},
},
"id175" => Delta {
"deleted": {
"boundElements": [
{
"id": "id172",
"type": "arrow",
},
],
},
"inserted": {
"boundElements": [],
}, },
}, },
}, },
@ -739,7 +729,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
"strokeWidth": 2, "strokeWidth": 2,
"type": "rectangle", "type": "rectangle",
"updated": 1, "updated": 1,
"version": 9, "version": 19,
"width": 100, "width": 100,
"x": 150, "x": 150,
"y": -50, "y": -50,
@ -819,8 +809,8 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
"strokeWidth": 2, "strokeWidth": 2,
"type": "arrow", "type": "arrow",
"updated": 1, "updated": 1,
"version": 30, "version": 33,
"width": 0, "width": 100,
"x": "149.29289", "x": "149.29289",
"y": 0, "y": 0,
} }
@ -846,27 +836,46 @@ History {
"added": Map {}, "added": Map {},
"removed": Map {}, "removed": Map {},
"updated": Map { "updated": Map {
"id166" => Delta {
"deleted": {
"boundElements": [],
},
"inserted": {
"boundElements": [
{
"id": "id167",
"type": "arrow",
},
],
},
},
"id167" => Delta { "id167" => Delta {
"deleted": { "deleted": {
"endBinding": null,
"points": [ "points": [
[ [
0, 0,
0, 0,
], ],
[ [
0, 100,
0, 0,
], ],
], ],
}, },
"inserted": { "inserted": {
"endBinding": {
"elementId": "id166",
"focus": -0,
"gap": 1,
},
"points": [ "points": [
[ [
0, 0,
0, 0,
], ],
[ [
100, 0,
0, 0,
], ],
], ],
@ -899,22 +908,8 @@ History {
], ],
}, },
}, },
"id166" => Delta {
"deleted": {
"boundElements": [],
},
"inserted": {
"boundElements": [
{
"id": "id167",
"type": "arrow",
},
],
},
},
"id167" => Delta { "id167" => Delta {
"deleted": { "deleted": {
"endBinding": null,
"points": [ "points": [
[ [
0, 0,
@ -928,18 +923,13 @@ History {
"startBinding": null, "startBinding": null,
}, },
"inserted": { "inserted": {
"endBinding": {
"elementId": "id166",
"focus": -0,
"gap": 1,
},
"points": [ "points": [
[ [
0, 0,
0, 0,
], ],
[ [
0, 100,
0, 0,
], ],
], ],

Write Preview
Loading…
Cancel
Save