sambruk/excalidraw
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix free draw to allow undo (#1594)

Browse Source
This commit is contained in:
fujimoto kyosuke 2020-05-14 21:32:10 +09:00 committed by GitHub
parent ad81033a78
commit c32640d174
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 275 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/App.tsx
View File

@ -2340,6 +2340,7 @@ class App extends React.Component<any, AppState> {
if (draggingElement?.type === "draw") { if (draggingElement?.type === "draw") {
this.actionManager.executeAction(actionFinalize); this.actionManager.executeAction(actionFinalize);
history.resumeRecording();
return; return;
} }
if (isLinearElement(draggingElement)) { if (isLinearElement(draggingElement)) {

276
src/tests/__snapshots__/regressionTests.test.tsx.snap
View File

@ -2279,6 +2279,174 @@ Object {
}, },
], ],
}, },
Object {
"appState": Object {
"currentItemBackgroundColor": "transparent",
"currentItemFillStyle": "hachure",
"currentItemFont": "20px Virgil",
"currentItemOpacity": 100,
"currentItemRoughness": 1,
"currentItemStrokeColor": "#000000",
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"exportBackground": true,
"name": "Untitled-201933152653",
"selectedElementIds": Object {
"id7": true,
},
"shouldAddWatermark": false,
"viewBackgroundColor": "#ffffff",
},
"elements": Array [
Object {
"angle": 0,
"backgroundColor": "transparent",
"fillStyle": "hachure",
"height": 10,
"id": "id0",
"isDeleted": false,
"opacity": 100,
"roughness": 1,
"seed": 337897,
"strokeColor": "#000000",
"strokeWidth": 1,
"type": "rectangle",
"version": 3,
"versionNonce": 1278240551,
"width": 10,
"x": 10,
"y": 10,
},
Object {
"angle": 0,
"backgroundColor": "transparent",
"fillStyle": "hachure",
"height": 10,
"id": "id1",
"isDeleted": false,
"opacity": 100,
"roughness": 1,
"seed": 453191,
"strokeColor": "#000000",
"strokeWidth": 1,
"type": "diamond",
"version": 3,
"versionNonce": 401146281,
"width": 10,
"x": 30,
"y": 10,
},
Object {
"angle": 0,
"backgroundColor": "transparent",
"fillStyle": "hachure",
"height": 10,
"id": "id2",
"isDeleted": false,
"opacity": 100,
"roughness": 1,
"seed": 1116226695,
"strokeColor": "#000000",
"strokeWidth": 1,
"type": "ellipse",
"version": 3,
"versionNonce": 1014066025,
"width": 10,
"x": 50,
"y": 10,
},
Object {
"angle": 0,
"backgroundColor": "transparent",
"fillStyle": "hachure",
"height": 10,
"id": "id3",
"isDeleted": false,
"lastCommittedPoint": null,
"opacity": 100,
"points": Array [
Array [
0,
0,
],
Array [
10,
10,
],
],
"roughness": 1,
"seed": 1505387817,
"strokeColor": "#000000",
"strokeWidth": 1,
"type": "arrow",
"version": 4,
"versionNonce": 493213705,
"width": 10,
"x": 70,
"y": 10,
},
Object {
"angle": 0,
"backgroundColor": "transparent",
"fillStyle": "hachure",
"height": 10,
"id": "id4",
"isDeleted": false,
"lastCommittedPoint": null,
"opacity": 100,
"points": Array [
Array [
0,
0,
],
Array [
10,
10,
],
],
"roughness": 1,
"seed": 760410951,
"strokeColor": "#000000",
"strokeWidth": 1,
"type": "line",
"version": 4,
"versionNonce": 289600103,
"width": 10,
"x": 90,
"y": 10,
},
Object {
"angle": 0,
"backgroundColor": "transparent",
"fillStyle": "hachure",
"height": 10,
"id": "id7",
"isDeleted": false,
"lastCommittedPoint": null,
"opacity": 100,
"points": Array [
Array [
0,
0,
],
Array [
10,
10,
],
],
"roughness": 1,
"seed": 1051383431,
"strokeColor": "#000000",
"strokeWidth": 1,
"type": "draw",
"version": 4,
"versionNonce": 1279028647,
"width": 10,
"x": 30,
"y": 10,
},
],
},
], ],
} }
`; `;
@ -3019,7 +3187,59 @@ exports[`regression tests hotkey 7 selects draw tool: [end of test] history 1`]
Object { Object {
"recording": false, "recording": false,
"redoStack": Array [], "redoStack": Array [],
"stateHistory": Array [], "stateHistory": Array [
Object {
"appState": Object {
"currentItemBackgroundColor": "transparent",
"currentItemFillStyle": "hachure",
"currentItemFont": "20px Virgil",
"currentItemOpacity": 100,
"currentItemRoughness": 1,
"currentItemStrokeColor": "#000000",
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"exportBackground": true,
"name": "Untitled-201933152653",
"selectedElementIds": Object {
"id0": true,
},
"shouldAddWatermark": false,
"viewBackgroundColor": "#ffffff",
},
"elements": Array [
Object {
"angle": 0,
"backgroundColor": "transparent",
"fillStyle": "hachure",
"height": 10,
"id": "id0",
"isDeleted": false,
"lastCommittedPoint": null,
"opacity": 100,
"points": Array [
Array [
0,
0,
],
Array [
10,
10,
],
],
"roughness": 1,
"seed": 337897,
"strokeColor": "#000000",
"strokeWidth": 1,
"type": "draw",
"version": 4,
"versionNonce": 449462985,
"width": 10,
"x": 10,
"y": 10,
},
],
},
],
} }
`; `;
@ -3759,7 +3979,59 @@ exports[`regression tests hotkey x selects draw tool: [end of test] history 1`]
Object { Object {
"recording": false, "recording": false,
"redoStack": Array [], "redoStack": Array [],
"stateHistory": Array [], "stateHistory": Array [
Object {
"appState": Object {
"currentItemBackgroundColor": "transparent",
"currentItemFillStyle": "hachure",
"currentItemFont": "20px Virgil",
"currentItemOpacity": 100,
"currentItemRoughness": 1,
"currentItemStrokeColor": "#000000",
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"exportBackground": true,
"name": "Untitled-201933152653",
"selectedElementIds": Object {
"id0": true,
},
"shouldAddWatermark": false,
"viewBackgroundColor": "#ffffff",
},
"elements": Array [
Object {
"angle": 0,
"backgroundColor": "transparent",
"fillStyle": "hachure",
"height": 10,
"id": "id0",
"isDeleted": false,
"lastCommittedPoint": null,
"opacity": 100,
"points": Array [
Array [
0,
0,
],
Array [
10,
10,
],
],
"roughness": 1,
"seed": 337897,
"strokeColor": "#000000",
"strokeWidth": 1,
"type": "draw",
"version": 4,
"versionNonce": 449462985,
"width": 10,
"x": 10,
"y": 10,
},
],
},
],
} }
`; `;