修复在新建歌单输入框、歌单内歌曲搜索输入框会意外触发设置的全局快捷键的问题(#879)
This commit is contained in:
@@ -2,7 +2,7 @@ import { isMac } from '../../common/utils'
|
||||
|
||||
const downKeys = new Set()
|
||||
|
||||
const handleEvent = (type, event, keys) => {
|
||||
const handleEvent = (type, event, keys, isEditing) => {
|
||||
let eventKey = event.key
|
||||
if (isMac) {
|
||||
let index = keys.indexOf('meta')
|
||||
@@ -23,7 +23,7 @@ const handleEvent = (type, event, keys) => {
|
||||
downKeys.delete(key)
|
||||
break
|
||||
}
|
||||
handleSendEvent(key, eventKey, type, event, keys)
|
||||
handleSendEvent(key, eventKey, type, event, keys, isEditing)
|
||||
}
|
||||
|
||||
// 修饰键处理
|
||||
@@ -54,7 +54,7 @@ const assertStopCallback = element => {
|
||||
}
|
||||
|
||||
const handleKeyDown = event => {
|
||||
if (assertStopCallback(event.target)) return
|
||||
// if (assertStopCallback(event.target)) return
|
||||
// event.preventDefault()
|
||||
let keys = eventModifiers(event)
|
||||
switch (event.key) {
|
||||
@@ -70,11 +70,11 @@ const handleKeyDown = event => {
|
||||
keys.push((event.code.includes('Numpad') ? event.code.replace(/^Numpad(\w{1,3})\w*$/i, 'num$1') : event.key).toLowerCase())
|
||||
break
|
||||
}
|
||||
handleEvent('down', event, keys)
|
||||
handleEvent('down', event, keys, assertStopCallback(event.target))
|
||||
}
|
||||
|
||||
const handleKeyUp = event => {
|
||||
if (assertStopCallback(event.target)) return
|
||||
// if (assertStopCallback(event.target)) return
|
||||
event.preventDefault()
|
||||
let keys = eventModifiers(event)
|
||||
switch (event.key) {
|
||||
@@ -88,7 +88,7 @@ const handleKeyUp = event => {
|
||||
keys.push((event.code.includes('Numpad') ? event.code.replace(/^Numpad(\w{1,3})\w*$/i, 'num$1') : event.key).toLowerCase())
|
||||
break
|
||||
}
|
||||
handleEvent('up', event, keys)
|
||||
handleEvent('up', event, keys, assertStopCallback(event.target))
|
||||
}
|
||||
|
||||
let handleSendEvent
|
||||
|
||||
Reference in New Issue
Block a user