Skip to content

Feature multiselect notes delete and move to another folder #1070

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
kazup01 merged 15 commits into from
Nov 28, 2017
+255 −89
Merged

Feature multiselect notes delete and move to another folder #1070

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
2d0e14c
feat: add shiftkey multiselect notes and delete
voidsatisfaction Nov 5, 2017
a504a45
fix up and down key rendering problems
voidsatisfaction Nov 5, 2017
a7e458b
feat change name and add deletion logic
voidsatisfaction Nov 5, 2017
70b69a3
refactor: inner codes
voidsatisfaction Nov 5, 2017
bcb1fb4
feat multi drag and drop for changing folder
voidsatisfaction Nov 5, 2017
9139495
feat: add multiple pin to top and rename activateNote to focusNote
voidsatisfaction Nov 6, 2017
9095fe9
add multi selection with arrow short cut
voidsatisfaction Nov 6, 2017
e57fef2
refactor: add utils
voidsatisfaction Nov 7, 2017
c876306
resolve conflict with master
voidsatisfaction Nov 7, 2017
f0f23ed
Merge branch 'master' into feature/add_multiselect_notes_delete
voidsatisfaction Nov 7, 2017
037ff2e
Merge branch 'master' into feature/add_multiselect_notes_delete
voidsatisfaction Nov 7, 2017
84f18ce
fix: pintotop error
voidsatisfaction Nov 7, 2017
a36e779
refactor: add new function and fix problems from feedbacks
voidsatisfaction Nov 15, 2017
eee212f
Merge with master resolve conflict
voidsatisfaction Nov 27, 2017
c33f9d8
fix: from let to const
voidsatisfaction Nov 27, 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
29 changes: 22 additions & 7 deletions browser/main/NoteList/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ class NoteList extends React.Component {
}
let { router } = this.context
let { location } = this.props
let { selectedNoteKeys } = this.state
let { selectedNoteKeys, shiftKeyDown } = this.state

let targetIndex = this.getTargetIndex()

Expand All @@ -162,10 +162,16 @@ class NoteList extends React.Component {
}
targetIndex--

selectedNoteKeys = []
if (!shiftKeyDown) {
selectedNoteKeys = []
}
const priorNote = Object.assign({}, this.notes[targetIndex])
const priorNoteKey = `${priorNote.storage}-${priorNote.key}`
Copy link
Contributor

@sota1235 sota1235 Nov 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can use getNoteKey for creating note key.

Copy link
Contributor Author

@voidsatisfaction voidsatisfaction Nov 15, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I used that. Thanks.

selectedNoteKeys.push(priorNoteKey)
if (selectedNoteKeys.includes(priorNoteKey)) {
Copy link
Contributor

@sota1235 sota1235 Nov 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can use findNoteByKey to check that note key exists in array or not.

Copy link
Contributor Author

@voidsatisfaction voidsatisfaction Nov 15, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sota1235
No, It findNoteByKeyis only for find note not keys.

Currently I have state that only save selectedNoteKeys not notes

selectedNoteKeys.pop()
} else {
selectedNoteKeys.push(priorNoteKey)
}

this.focusNote(selectedNoteKeys, priorNoteKey)
}
Expand All @@ -176,22 +182,30 @@ class NoteList extends React.Component {
}
let { router } = this.context
let { location } = this.props
let { selectedNoteKeys } = this.state
let { selectedNoteKeys, shiftKeyDown } = this.state

let targetIndex = this.getTargetIndex()

if (targetIndex === this.notes.length - 1) {
Copy link
Contributor Author

@voidsatisfaction voidsatisfaction Nov 7, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should add && shiftKeyDown

return
} else if (targetIndex === this.notes.length - 1) {
Copy link
Contributor

@sota1235 sota1235 Nov 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add some variables to keep value of targetIndex === this.notes.length - 1

Copy link
Contributor Author

@voidsatisfaction voidsatisfaction Nov 15, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added variable. Thank you!

targetIndex = 0
} else {
targetIndex++
if (targetIndex < 0) targetIndex = 0
else if (targetIndex > this.notes.length - 1) targetIndex === this.notes.length - 1
}

selectedNoteKeys = []
if (!shiftKeyDown) {
selectedNoteKeys = []
}
const nextNote = Object.assign({}, this.notes[targetIndex])
const nextNoteKey = `${nextNote.storage}-${nextNote.key}`
selectedNoteKeys.push(nextNoteKey)
if (selectedNoteKeys.includes(nextNoteKey)) {
Copy link
Contributor

@sota1235 sota1235 Nov 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as https://github.com/BoostIO/Boostnote/pull/1070/files#r150545856

Copy link
Contributor Author

@voidsatisfaction voidsatisfaction Nov 15, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just mentioned it above.

selectedNoteKeys.pop()
} else {
selectedNoteKeys.push(nextNoteKey)
}

this.focusNote(selectedNoteKeys, nextNoteKey)

Expand Down Expand Up @@ -222,6 +236,7 @@ class NoteList extends React.Component {
}

handleNoteListKeyDown (e) {
const { shiftKeyDown } = this.state
if (e.metaKey || e.ctrlKey) return true

if (e.keyCode === 65 && !e.shiftKey) {
Expand All @@ -231,7 +246,7 @@ class NoteList extends React.Component {

if (e.keyCode === 68) {
e.preventDefault()
ee.emit('detail:delete')
this.deleteNote()
}

if (e.keyCode === 69) {
Expand Down