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

change selection/line/draw shortcut defaults (#1953)

Browse source
This commit is contained in:
David Luzar 2020-07-24 15:47:46 +02:00 • committed by GitHub
parent c5d37a07c8
commit dc1f6c4d4c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/components/Actions.tsx
View file

@ -104,9 +104,11 @@ export const ShapesSwitcher = ({
<>
{SHAPES.map(({ value, icon, key }, index) => {
const label = t(`toolBar.${value}`);
const shortcut = `${capitalizeString(key)} ${t("shortcutsDialog.or")} ${
index + 1
}`;
const letter = typeof key === "string" ? key : key[0];
const letterShortcut = /[a-z]/.test(letter) ? letter : `Shift+${letter}`;
const shortcut = `${capitalizeString(letterShortcut)} ${t(
"shortcutsDialog.or",
)} ${index + 1}`;
return (
<ToolButton
className="Shape"

7
src/components/App.tsx
View file

@ -85,7 +85,7 @@ import {
getRotateWithDiscreteAngleKey,
} from "../keys";
import { findShapeByKey, shapesShortcutKeys } from "../shapes";
import { findShapeByKey } from "../shapes";
import { createHistory, SceneHistory } from "../history";
import ContextMenu from "./ContextMenu";
@ -1379,8 +1379,6 @@ class App extends React.Component<ExcalidrawProps, AppState> {
this.setState({ isLibraryOpen: !this.state.isLibraryOpen });
}
const shape = findShapeByKey(event.key);
if (isArrowKey(event.key)) {
const step =
(this.state.gridSize &&
@ -1444,7 +1442,8 @@ class App extends React.Component<ExcalidrawProps, AppState> {
!event.metaKey &&
this.state.draggingElement === null
) {
if (shapesShortcutKeys.includes(event.key.toLowerCase())) {
const shape = findShapeByKey(event.key);
if (shape) {
this.selectShapeTool(shape);
} else if (event.key === "q") {
this.toggleLock();

9
src/components/ShortcutsDialog.tsx
View file

@ -178,13 +178,16 @@ export const ShortcutsDialog = ({ onClose }: { onClose?: () => void }) => {
<Columns>
<Column>
<ShortcutIsland caption={t("shortcutsDialog.shapes")}>
<Shortcut label={t("toolBar.selection")} shortcuts={["S", "1"]} />
<Shortcut label={t("toolBar.selection")} shortcuts={["V", "1"]} />
<Shortcut label={t("toolBar.rectangle")} shortcuts={["R", "2"]} />
<Shortcut label={t("toolBar.diamond")} shortcuts={["D", "3"]} />
<Shortcut label={t("toolBar.ellipse")} shortcuts={["E", "4"]} />
<Shortcut label={t("toolBar.arrow")} shortcuts={["A", "5"]} />
<Shortcut label={t("toolBar.line")} shortcuts={["L", "6"]} />
<Shortcut label={t("toolBar.draw")} shortcuts={["X", "7"]} />
<Shortcut label={t("toolBar.line")} shortcuts={["P", "6"]} />
<Shortcut
label={t("toolBar.draw")}
shortcuts={["Shift+P", "7"]}
/>
<Shortcut label={t("toolBar.text")} shortcuts={["T", "8"]} />
<Shortcut
label={t("shortcutsDialog.textNewLine")}