From c745fd4e5ed2bb18e728072f2af429a180cb06a7 Mon Sep 17 00:00:00 2001 From: Christopher Chedeau Date: Sat, 11 Jan 2020 19:42:34 -0800 Subject: [PATCH] Prevent cmd-r from selecting rectangle (#327) I keep adding empty rectangles because I reload with cmd-r which enables rectangle :p Let's only make the shortcut work if there's no modifier enabled --- src/index.tsx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/index.tsx b/src/index.tsx index c4ef84ffe6..b2e3169048 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -253,7 +253,13 @@ export class App extends React.Component<{}, AppState> { }); this.forceUpdate(); event.preventDefault(); - } else if (shapesShortcutKeys.includes(event.key.toLowerCase())) { + } else if ( + shapesShortcutKeys.includes(event.key.toLowerCase()) && + !event.ctrlKey && + !event.shiftKey && + !event.altKey && + !event.metaKey + ) { this.setState({ elementType: findShapeByKey(event.key) }); } else if (event[META_KEY] && event.code === "KeyZ") { if (event.shiftKey) {