Skip to content

Virtual whiteboard for sketching hand-drawn like diagrams

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

Valerii Gusev880e4feedeba
diff --git a/src/actions/actionFinalize.tsx b/src/actions/actionFinalize.tsx
index 9f081600e1..4a7772207a 100644
--- a/src/actions/actionFinalize.tsx
+++ b/src/actions/actionFinalize.tsx
@@ -39,6 +39,7 @@ export const actionFinalize = register({
: undefined,
appState: {
...appState,
+ cursorButton: "up",
editingLinearElement: null,
},
commitToHistory: true,
@@ -140,6 +141,7 @@ export const actionFinalize = register({
elements: newElements,
appState: {
...appState,
+ cursorButton: "up",
activeTool:
(appState.activeTool.locked ||
appState.activeTool.type === "freedraw") &&
diff --git a/src/data/restore.ts b/src/data/restore.ts
index 421223ef09..5195448769 100644
--- a/src/data/restore.ts
+++ b/src/data/restore.ts
@@ -252,6 +252,7 @@ export const restoreAppState = (
}
return {
...nextAppState,
+ cursorButton: localAppState?.cursorButton || "up",
// reset on fresh restore so as to hide the UI button if penMode not active
penDetected:
localAppState?.penDetected ??
diff --git a/src/tests/__snapshots__/regressionTests.test.tsx.snap b/src/tests/__snapshots__/regressionTests.test.tsx.snap
index e6ef53c1c3..9b22aab362 100644
--- a/src/tests/__snapshots__/regressionTests.test.tsx.snap
+++ b/src/tests/__snapshots__/regressionTests.test.tsx.snap
@@ -6729,7 +6729,7 @@ Object {
"currentItemStrokeStyle": "solid",
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
- "cursorButton": "down",
+ "cursorButton": "up",
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -11029,7 +11029,7 @@ Object {
"currentItemStrokeStyle": "solid",
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
- "cursorButton": "down",
+ "cursorButton": "up",
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -12181,7 +12181,7 @@ Object {
"currentItemStrokeStyle": "solid",
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
- "cursorButton": "down",
+ "cursorButton": "up",
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
diff --git a/src/tests/data/restore.test.ts b/src/tests/data/restore.test.ts
index 88647167ad..3ce03e58de 100644
--- a/src/tests/data/restore.test.ts
+++ b/src/tests/data/restore.test.ts
@@ -313,9 +313,7 @@ describe("restoreAppState", () => {
expect(restoredAppState.activeTool).toEqual(
stubImportedAppState.activeTool,
);
- expect(restoredAppState.cursorButton).toBe(
- stubImportedAppState.cursorButton,
- );
+ expect(restoredAppState.cursorButton).toBe("up");
expect(restoredAppState.name).toBe(stubImportedAppState.name);
});
@@ -347,9 +345,7 @@ describe("restoreAppState", () => {
stubImportedAppState,
null,
);
- expect(restoredAppState.cursorButton).toBe(
- stubImportedAppState.cursorButton,
- );
+ expect(restoredAppState.cursorButton).toBe("up");
expect(restoredAppState.name).toBe(stubImportedAppState.name);
});
@@ -502,9 +498,7 @@ describe("restore", () => {
importedDataState.appState = stubImportedAppState;
const restoredData = restore.restore(importedDataState, null, null);
- expect(restoredData.appState.cursorButton).toBe(
- stubImportedAppState.cursorButton,
- );
+ expect(restoredData.appState.cursorButton).toBe("up");
expect(restoredData.appState.name).toBe(stubImportedAppState.name);
});