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

fix: cursor on keyboard tool toggle (#482)

Browse Source 
* update events for GH actions to include PRs

* fix: cursor on keyboard tool toggle

* fix: change cursor type to constant

* fix: swap condition

Co-authored-by: David Luzar <luzar.david@gmail.com>
This commit is contained in:
Bakhtiiar Muzakparov 2020-01-22 19:36:08 +06:00 committed by David Luzar
parent 5bd1c8b3cd
commit bef279417e
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/index.tsx
View File

@ -95,6 +95,10 @@ function resetCursor() {
const ELEMENT_SHIFT_TRANSLATE_AMOUNT = 5; const ELEMENT_SHIFT_TRANSLATE_AMOUNT = 5;
const ELEMENT_TRANSLATE_AMOUNT = 1; const ELEMENT_TRANSLATE_AMOUNT = 1;
const TEXT_TO_CENTER_SNAP_THRESHOLD = 30; const TEXT_TO_CENTER_SNAP_THRESHOLD = 30;
const CURSOR_TYPE = {
TEXT: "text",
CROSSHAIR: "crosshair"
};
let lastCanvasWidth = -1; let lastCanvasWidth = -1;
let lastCanvasHeight = -1; let lastCanvasHeight = -1;
@ -273,6 +277,8 @@ export class App extends React.Component<any, AppState> {
return; return;
} }
const shape = findShapeByKey(event.key);
if (isArrowKey(event.key)) { if (isArrowKey(event.key)) {
const step = event.shiftKey const step = event.shiftKey
? ELEMENT_SHIFT_TRANSLATE_AMOUNT ? ELEMENT_SHIFT_TRANSLATE_AMOUNT
@ -298,7 +304,12 @@ export class App extends React.Component<any, AppState> {
!event.metaKey && !event.metaKey &&
this.state.draggingElement === null this.state.draggingElement === null
) { ) {
this.setState({ elementType: findShapeByKey(event.key) }); if (shape === "text") {
document.documentElement.style.cursor = CURSOR_TYPE.TEXT;
} else {
document.documentElement.style.cursor = CURSOR_TYPE.CROSSHAIR;
}
this.setState({ elementType: shape });
} else if (event[KEYS.META] && event.code === "KeyZ") { } else if (event[KEYS.META] && event.code === "KeyZ") {
if (event.shiftKey) { if (event.shiftKey) {
// Redo action // Redo action
@ -483,7 +494,7 @@ export class App extends React.Component<any, AppState> {
this.setState({ elementType: value }); this.setState({ elementType: value });
elements = clearSelection(elements); elements = clearSelection(elements);
document.documentElement.style.cursor = document.documentElement.style.cursor =
value === "text" ? "text" : "crosshair"; value === "text" ? CURSOR_TYPE.TEXT : CURSOR_TYPE.CROSSHAIR;
this.forceUpdate(); this.forceUpdate();
}} }}
></ToolIcon> ></ToolIcon>