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

fix: update cursorButton once freedraw is released (#4996)

Browse Source 
Co-authored-by: dwelle <luzar.david@gmail.com>
This commit is contained in:
Valerii Gusev 2022-04-01 17:25:21 +01:00 committed by GitHub
parent 9ba7ca3845
commit 880e4feede
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/actions/actionFinalize.tsx
View File

@ -39,6 +39,7 @@ export const actionFinalize = register({
: undefined, : undefined,
appState: { appState: {
...appState, ...appState,
cursorButton: "up",
editingLinearElement: null, editingLinearElement: null,
}, },
commitToHistory: true, commitToHistory: true,
@ -140,6 +141,7 @@ export const actionFinalize = register({
elements: newElements, elements: newElements,
appState: { appState: {
...appState, ...appState,
cursorButton: "up",
activeTool: activeTool:
(appState.activeTool.locked || (appState.activeTool.locked ||
appState.activeTool.type === "freedraw") && appState.activeTool.type === "freedraw") &&

1
src/data/restore.ts
View File

@ -252,6 +252,7 @@ export const restoreAppState = (
} }
return { return {
...nextAppState, ...nextAppState,
cursorButton: localAppState?.cursorButton || "up",
// reset on fresh restore so as to hide the UI button if penMode not active // reset on fresh restore so as to hide the UI button if penMode not active
penDetected: penDetected:
localAppState?.penDetected ?? localAppState?.penDetected ??

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

@ -6729,7 +6729,7 @@ Object {
"currentItemStrokeStyle": "solid", "currentItemStrokeStyle": "solid",
"currentItemStrokeWidth": 1, "currentItemStrokeWidth": 1,
"currentItemTextAlign": "left", "currentItemTextAlign": "left",
"cursorButton": "down", "cursorButton": "up",
"draggingElement": null, "draggingElement": null,
"editingElement": null, "editingElement": null,
"editingGroupId": null, "editingGroupId": null,
@ -11029,7 +11029,7 @@ Object {
"currentItemStrokeStyle": "solid", "currentItemStrokeStyle": "solid",
"currentItemStrokeWidth": 1, "currentItemStrokeWidth": 1,
"currentItemTextAlign": "left", "currentItemTextAlign": "left",
"cursorButton": "down", "cursorButton": "up",
"draggingElement": null, "draggingElement": null,
"editingElement": null, "editingElement": null,
"editingGroupId": null, "editingGroupId": null,
@ -12181,7 +12181,7 @@ Object {
"currentItemStrokeStyle": "solid", "currentItemStrokeStyle": "solid",
"currentItemStrokeWidth": 1, "currentItemStrokeWidth": 1,
"currentItemTextAlign": "left", "currentItemTextAlign": "left",
"cursorButton": "down", "cursorButton": "up",
"draggingElement": null, "draggingElement": null,
"editingElement": null, "editingElement": null,
"editingGroupId": null, "editingGroupId": null,

12
src/tests/data/restore.test.ts
View File

@ -313,9 +313,7 @@ describe("restoreAppState", () => {
expect(restoredAppState.activeTool).toEqual( expect(restoredAppState.activeTool).toEqual(
stubImportedAppState.activeTool, stubImportedAppState.activeTool,
); );
expect(restoredAppState.cursorButton).toBe( expect(restoredAppState.cursorButton).toBe("up");
stubImportedAppState.cursorButton,
);
expect(restoredAppState.name).toBe(stubImportedAppState.name); expect(restoredAppState.name).toBe(stubImportedAppState.name);
}); });
@ -347,9 +345,7 @@ describe("restoreAppState", () => {
stubImportedAppState, stubImportedAppState,
null, null,
); );
expect(restoredAppState.cursorButton).toBe( expect(restoredAppState.cursorButton).toBe("up");
stubImportedAppState.cursorButton,
);
expect(restoredAppState.name).toBe(stubImportedAppState.name); expect(restoredAppState.name).toBe(stubImportedAppState.name);
}); });
@ -502,9 +498,7 @@ describe("restore", () => {
importedDataState.appState = stubImportedAppState; importedDataState.appState = stubImportedAppState;
const restoredData = restore.restore(importedDataState, null, null); const restoredData = restore.restore(importedDataState, null, null);
expect(restoredData.appState.cursorButton).toBe( expect(restoredData.appState.cursorButton).toBe("up");
stubImportedAppState.cursorButton,
);
expect(restoredData.appState.name).toBe(stubImportedAppState.name); expect(restoredData.appState.name).toBe(stubImportedAppState.name);
}); });