1
0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-13 09:46:22 +00:00

fix up and down key rendering problems

This commit is contained in:
voidSatisfaction
2017-11-05 18:45:09 +09:00
parent 2d0e14c1cc
commit a504a45d99

View File

@@ -135,6 +135,7 @@ class NoteList extends React.Component {
} }
let { router } = this.context let { router } = this.context
let { location } = this.props let { location } = this.props
let { selectedNoteIds } = this.state
let targetIndex = this.getTargetIndex() let targetIndex = this.getTargetIndex()
@@ -142,7 +143,15 @@ class NoteList extends React.Component {
return return
} }
targetIndex-- targetIndex--
if (targetIndex < 0) targetIndex = 0
selectedNoteIds = []
const priorNote = Object.assign({}, this.notes[targetIndex])
const priorNoteKey = `${priorNote.storage}-${priorNote.key}`
selectedNoteIds.push(priorNoteKey)
this.setState({
selectedNoteIds
})
router.push({ router.push({
pathname: location.pathname, pathname: location.pathname,
@@ -158,6 +167,7 @@ class NoteList extends React.Component {
} }
let { router } = this.context let { router } = this.context
let { location } = this.props let { location } = this.props
let { selectedNoteIds } = this.state
let targetIndex = this.getTargetIndex() let targetIndex = this.getTargetIndex()
@@ -169,6 +179,15 @@ class NoteList extends React.Component {
else if (targetIndex > this.notes.length - 1) targetIndex === this.notes.length - 1 else if (targetIndex > this.notes.length - 1) targetIndex === this.notes.length - 1
} }
selectedNoteIds = []
const nextNote = Object.assign({}, this.notes[targetIndex])
const nextNoteKey = `${nextNote.storage}-${nextNote.key}`
selectedNoteIds.push(nextNoteKey)
this.setState({
selectedNoteIds
})
router.push({ router.push({
pathname: location.pathname, pathname: location.pathname,
query: { query: {
@@ -202,10 +221,6 @@ class NoteList extends React.Component {
} }
handleNoteListKeyDown (e) { handleNoteListKeyDown (e) {
if (e.shiftKey) {
this.setState({ shiftKeyDown: true })
}
if (e.metaKey || e.ctrlKey) return true if (e.metaKey || e.ctrlKey) return true
if (e.keyCode === 65 && !e.shiftKey) { if (e.keyCode === 65 && !e.shiftKey) {
@@ -232,6 +247,10 @@ class NoteList extends React.Component {
e.preventDefault() e.preventDefault()
this.selectNextNote() this.selectNextNote()
} }
if (e.shiftKey) {
this.setState({ shiftKeyDown: true })
}
} }
handleNoteListKeyUp (e) { handleNoteListKeyUp (e) {