Skip to content

Revamp handling of multiple key press #545

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asmsuechan merged 4 commits into from
May 4, 2017
Merged

Revamp handling of multiple key press #545

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b34d72f
revamp handling of multi-key presses
LeoLamCY May 3, 2017
50ad5e3
minor improvement on multi-key detection
LeoLamCY May 3, 2017
aee6541
fix lint errors
LeoLamCY May 3, 2017
a1e71b3
fix lint error again
LeoLamCY May 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 15 additions & 13 deletions browser/components/MarkdownEditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,16 @@ class MarkdownEditor extends React.Component {
constructor (props) {
super(props)

this.escapeFromEditor = ['Control', 'w']
// char codes for ctrl + w
this.escapeFromEditor = [17, 87]

this.supportMdSelectionBold = ['Control', ':']
// ctrl + shift + ;
this.supportMdSelectionBold = [16, 17, 186]

this.state = {
status: 'PREVIEW',
renderValue: props.value,
keyPressed: {},
keyPressed: new Set(),
isLocked: false
}

Expand Down Expand Up @@ -87,7 +89,7 @@ class MarkdownEditor extends React.Component {

handleBlur (e) {
if (this.state.isLocked) return
this.setState({ keyPressed: [] })
this.setState({ keyPressed: new Set() })
let { config } = this.props
if (config.editor.switchPreview === 'BLUR') {
let cursorPosition = this.refs.code.editor.getCursor()
Expand Down Expand Up @@ -161,15 +163,16 @@ class MarkdownEditor extends React.Component {

handleKeyDown (e) {
if (this.state.status !== 'CODE') return false
const keyPressed = Object.assign(this.state.keyPressed, {
[e.key]: true
})
const keyPressed = this.state.keyPressed
keyPressed.add(e.keyCode)
this.setState({ keyPressed })
let isNoteHandlerKey = (el) => { return this.state.keyPressed[el] }
if (!this.state.isLocked && this.state.status === 'CODE' && this.escapeFromEditor.every(isNoteHandlerKey)) {
let isNoteHandlerKey = (el) => { return keyPressed.has(el) }
if (keyPressed.size === this.escapeFromEditor.length &&
!this.state.isLocked && this.state.status === 'CODE' &&
this.escapeFromEditor.every(isNoteHandlerKey)) {
document.activeElement.blur()
}
if (this.supportMdSelectionBold.every(isNoteHandlerKey)) {
if (keyPressed.size === this.supportMdSelectionBold.length && this.supportMdSelectionBold.every(isNoteHandlerKey)) {
this.addMdAroundWord('**')
}
}
Expand All @@ -190,9 +193,8 @@ class MarkdownEditor extends React.Component {
}

handleKeyUp (e) {
const keyPressed = Object.assign(this.state.keyPressed, {
[e.key]: false
})
const keyPressed = this.state.keyPressed
keyPressed.delete(e.keyCode)
this.setState({ keyPressed })
}

Expand Down