PrivateCoffee/tldraw
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Clean up metakey in code editor events

Browse source
This commit is contained in:
Steve Ruiz 2021-07-10 17:28:44 +01:00
parent 6fb1822467
commit 893c3d214a
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
components/code-panel/code-editor.tsx
View file

@ -6,6 +6,7 @@ import React, { useCallback, useEffect, useRef } from 'react'
import styled from 'styles'
import * as monaco from 'monaco-editor/esm/vs/editor/editor.api'
import { getFormattedCode } from 'utils/code'
import { metaKey } from 'utils'
export type IMonaco = typeof monaco
@ -136,11 +137,14 @@ export default function CodeEditor({
const handleKeydown = useCallback(
(e: React.KeyboardEvent<HTMLDivElement>) => {
e.stopPropagation()
!modifierKeys.includes(e.key) && onKey?.()
const metaKey = navigator.platform.match('Mac') ? e.metaKey : e.ctrlKey
if (e.key === 's' && metaKey) {
if ((e.key === 's' || e.key === 'Enter') && metaKey(e)) {
const editor = rEditor.current
if (!editor) return
editor
.getAction('editor.action.formatDocument')
.run()
@ -150,10 +154,11 @@ export default function CodeEditor({
e.preventDefault()
}
if (e.key === 'p' && metaKey) {
if (e.key === 'p' && metaKey(e)) {
e.preventDefault()
}
if (e.key === 'd' && metaKey) {
if (e.key === 'd' && metaKey(e)) {
e.preventDefault()
}
},