smig/excalidraw
1
0
Fork 0
mirror of https://github.com/excalidraw/excalidraw.git synced 2025-04-14 16:40:58 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 627f1dd036 into dff69e9191

Browse source
This commit is contained in:
Kihoon Lee (Kilee) 2025-04-11 15:03:35 -04:00 • committed by GitHub
commit a10f7033b5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/excalidraw/components/App.tsx
View file

@ -483,7 +483,7 @@ import {
import { MagicIcon, copyIcon, fullscreenIcon } from "./icons";
import { Toast } from "./Toast";
import { findShapeByKey } from "./shapes";
import { findShapeByCode, findShapeByKey } from "./shapes";
import type {
RenderInteractiveSceneCallback,
@ -4508,7 +4508,7 @@ class App extends React.Component<AppProps, AppState> {
!this.state.selectionElement &&
!this.state.selectedElementsAreBeingDragged
) {
const shape = findShapeByKey(event.key);
const shape = findShapeByKey(event.key) || findShapeByCode(event.code);
if (shape) {
if (this.state.activeTool.type !== shape) {
trackEvent(

17
packages/excalidraw/components/shapes.tsx
View file

@ -18,6 +18,7 @@ export const SHAPES = [
icon: SelectionIcon,
value: "selection",
key: KEYS.V,
codes: ["KeyV", "Digit1"],
numericKey: KEYS["1"],
fillable: true,
},
@ -25,6 +26,7 @@ export const SHAPES = [
icon: RectangleIcon,
value: "rectangle",
key: KEYS.R,
codes: ["KeyR", "Digit2"],
numericKey: KEYS["2"],
fillable: true,
},
@ -32,6 +34,7 @@ export const SHAPES = [
icon: DiamondIcon,
value: "diamond",
key: KEYS.D,
codes: ["KeyD", "Digit3"],
numericKey: KEYS["3"],
fillable: true,
},
@ -39,6 +42,7 @@ export const SHAPES = [
icon: EllipseIcon,
value: "ellipse",
key: KEYS.O,
codes: ["KeyO", "Digit4"],
numericKey: KEYS["4"],
fillable: true,
},
@ -46,6 +50,7 @@ export const SHAPES = [
icon: ArrowIcon,
value: "arrow",
key: KEYS.A,
codes: ["KeyA", "Digit5"],
numericKey: KEYS["5"],
fillable: true,
},
@ -53,6 +58,7 @@ export const SHAPES = [
icon: LineIcon,
value: "line",
key: KEYS.L,
codes: ["KeyL", "Digit6"],
numericKey: KEYS["6"],
fillable: true,
},
@ -60,6 +66,7 @@ export const SHAPES = [
icon: FreedrawIcon,
value: "freedraw",
key: [KEYS.P, KEYS.X],
codes: ["KeyP", "KeyX", "Digit7"],
numericKey: KEYS["7"],
fillable: false,
},
@ -67,6 +74,7 @@ export const SHAPES = [
icon: TextIcon,
value: "text",
key: KEYS.T,
codes: ["KeyT", "Digit8"],
numericKey: KEYS["8"],
fillable: false,
},
@ -74,6 +82,7 @@ export const SHAPES = [
icon: ImageIcon,
value: "image",
key: null,
codes: ["Digit9"],
numericKey: KEYS["9"],
fillable: false,
},
@ -81,6 +90,7 @@ export const SHAPES = [
icon: EraserIcon,
value: "eraser",
key: KEYS.E,
codes: ["KeyE", "Digit0"],
numericKey: KEYS["0"],
fillable: false,
},
@ -98,3 +108,10 @@ export const findShapeByKey = (key: string) => {
});
return shape?.value || null;
};
export const findShapeByCode = (code: string) => {
const shape = SHAPES.find((shape) =>
(shape.codes as readonly string[]).includes(code),
);
return shape?.value || null;
};