Skip to content

Virtual whiteboard for sketching hand-drawn like diagrams

Fix ability to use arrow keys to navigate between shapes (#646)

Christopher Chedeau47f6328ae16b
diff --git a/src/index.tsx b/src/index.tsx
index 37b67dc3a0..2323477bba 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -42,7 +42,13 @@ import { renderScene } from "./renderer";
import { AppState } from "./types";
import { ExcalidrawElement } from "./element/types";
-import { isInputLike, debounce, capitalizeString, distance } from "./utils";
+import {
+ isInputLike,
+ isToolIcon,
+ debounce,
+ capitalizeString,
+ distance,
+} from "./utils";
import { KEYS, isArrowKey } from "./keys";
import { findShapeByKey, shapesShortcutKeys, SHAPES } from "./shapes";
@@ -209,7 +215,7 @@ export class App extends React.Component<any, AppState> {
};
private onCut = (e: ClipboardEvent) => {
- if (isInputLike(e.target)) return;
+ if (isInputLike(e.target) && !isToolIcon(e.target)) return;
e.clipboardData?.setData(
"text/plain",
JSON.stringify(
@@ -223,7 +229,7 @@ export class App extends React.Component<any, AppState> {
e.preventDefault();
};
private onCopy = (e: ClipboardEvent) => {
- if (isInputLike(e.target)) return;
+ if (isInputLike(e.target) && !isToolIcon(e.target)) return;
e.clipboardData?.setData(
"text/plain",
JSON.stringify(
@@ -235,7 +241,7 @@ export class App extends React.Component<any, AppState> {
e.preventDefault();
};
private onPaste = (e: ClipboardEvent) => {
- if (isInputLike(e.target)) return;
+ if (isInputLike(e.target) && !isToolIcon(e.target)) return;
const paste = e.clipboardData?.getData("text") || "";
this.addElementsFromPaste(paste);
e.preventDefault();
@@ -329,7 +335,6 @@ export class App extends React.Component<any, AppState> {
private onKeyDown = (event: KeyboardEvent) => {
if (event.key === KEYS.ESCAPE && !this.state.draggingElement) {
elements = clearSelection(elements);
- this.setState({});
this.setState({ elementType: "selection" });
if (window.document.activeElement instanceof HTMLElement) {
window.document.activeElement.blur();
diff --git a/src/utils.ts b/src/utils.ts
index ff7ea588ba..bcbbb6d4ba 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -30,11 +30,10 @@ export function isInputLike(
| HTMLSelectElement
| HTMLDivElement {
return (
- ((target instanceof HTMLElement && target.dataset.type === "wysiwyg") ||
- target instanceof HTMLInputElement ||
- target instanceof HTMLTextAreaElement ||
- target instanceof HTMLSelectElement) &&
- !isToolIcon(target)
+ (target instanceof HTMLElement && target.dataset.type === "wysiwyg") ||
+ target instanceof HTMLInputElement ||
+ target instanceof HTMLTextAreaElement ||
+ target instanceof HTMLSelectElement
);
}