smig/excalidraw
1
0
Fork 0
mirror of https://github.com/excalidraw/excalidraw.git synced 2025-05-03 10:00:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: move elementLocked to activeTool.locked (#4983)

Browse source 
* refactor: move elementLocked to activeTool.locked

* fix

* fix snap

* update docs

* Update src/packages/excalidraw/CHANGELOG.md

* revert

* make lastActiveToolBeforeEraser required and nullable

* fix snap
This commit is contained in:
Aakansha Doshi 2022-03-29 17:10:19 +05:30 • committed by GitHub
parent 1331cffe93
commit 2fa69ddc32
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 199 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/actions/actionCanvas.tsx
View file

@ -62,7 +62,6 @@ export const actionClearCanvas = register({
...getDefaultAppState(),
files: {},
theme: appState.theme,
elementLocked: appState.elementLocked,
penMode: appState.penMode,
penDetected: appState.penDetected,
exportBackground: appState.exportBackground,
@ -72,7 +71,7 @@ export const actionClearCanvas = register({
pasteDialog: appState.pasteDialog,
activeTool:
appState.activeTool.type === "image"
? { type: "selection" }
? { ...appState.activeTool, type: "selection" }
: appState.activeTool,
},
commitToHistory: true,
@ -311,12 +310,13 @@ export const actionErase = register({
selectedElementIds: {},
selectedGroupIds: {},
activeTool: {
...appState.activeTool,
type: isEraserActive(appState)
? appState.activeTool.lastActiveToolBeforeEraser ?? "selection"
: "eraser",
lastActiveToolBeforeEraser:
appState.activeTool.type === "eraser" //node throws incorrect type error when using isEraserActive()
? undefined
? null
: appState.activeTool.type,
},
},