Virtual whiteboard for sketching hand-drawn like diagrams
fix: ensure `s` and `g` shortcuts work on no selection (#3800)
Jakub Koralewskiee64a7e26472
diff --git a/src/components/App.tsx b/src/components/App.tsxindex 4c053d1d41..07e14046ed 100644--- a/src/components/App.tsx+++ b/src/components/App.tsx@@ -156,6 +156,7 @@ import {getElementsWithinSelection,getNormalizedZoom,getSelectedElements,+ hasBackground,isOverScrollBars,isSomeElementSelected,} from "../scene";@@ -1582,17 +1583,22 @@ class App extends React.Component<AppProps, AppState> {}if (event.key === KEYS.G || event.key === KEYS.S) {- const selectedElements = getSelectedElements(- this.scene.getElements(),- this.state,- );- if (selectedElements.length) {- if (event.key === KEYS.G) {- this.setState({ openPopup: "backgroundColorPicker" });- }- if (event.key === KEYS.S) {- this.setState({ openPopup: "strokeColorPicker" });- }+ if (this.state.elementType === "selection") {+ return;+ }++ if (+ event.key === KEYS.G &&+ (hasBackground(this.state.elementType) ||+ getSelectedElements(+ this.scene.getElements(),+ this.state,+ ).some((element) => hasBackground(element.type)))+ ) {+ this.setState({ openPopup: "backgroundColorPicker" });+ }+ if (event.key === KEYS.S) {+ this.setState({ openPopup: "strokeColorPicker" });}}},diff --git a/src/shapes.tsx b/src/shapes.tsxindex ec70687256..a1fffc7f7f 100644--- a/src/shapes.tsx+++ b/src/shapes.tsx@@ -11,7 +11,7 @@ export const SHAPES = [</svg>),value: "selection",- key: [KEYS.V, KEYS.S],+ key: KEYS.V,},{icon: (