From f66bc8426e86e00b05abef216b62d1178f1864c3 Mon Sep 17 00:00:00 2001 From: chris <kokosias@yahoo.gr> Date: Sun, 16 Apr 2017 22:46:35 +0300 Subject: [PATCH] fix note callout selection --- .../SimpleEditor/elements/note/NoteComponent.js | 15 ++++++++++++--- .../SimpleEditor/panes/Notes/NotesProvider.js | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/app/components/SimpleEditor/elements/note/NoteComponent.js b/app/components/SimpleEditor/elements/note/NoteComponent.js index 6fd0b8e..5d549d0 100644 --- a/app/components/SimpleEditor/elements/note/NoteComponent.js +++ b/app/components/SimpleEditor/elements/note/NoteComponent.js @@ -41,16 +41,25 @@ class NoteComponent extends Component { const session = this.context.editorSession const sel = session.getSelection() + console.log('selsel', sel) - const note = documentHelpers.getPropertyAnnotationsForSelection( + const notes = documentHelpers.getPropertyAnnotationsForSelection( session.getDocument(), sel, { type: 'note' } ) + const note = notes[0] + let show = false + if (typeof note !== 'undefined') { + if ((sel.start.offset === note.start.offset && + sel.end.offset === note.end.offset)) { + show = true + } + } - if (typeof note[0] !== 'undefined') { + if (show) { return { - node: note[0] + node: note } } else { return { diff --git a/app/components/SimpleEditor/panes/Notes/NotesProvider.js b/app/components/SimpleEditor/panes/Notes/NotesProvider.js index 3e35b67..bfedf07 100644 --- a/app/components/SimpleEditor/panes/Notes/NotesProvider.js +++ b/app/components/SimpleEditor/panes/Notes/NotesProvider.js @@ -140,7 +140,7 @@ class NotesProvider extends TOCProvider { }) } - return this.removeIsolatedNote(position, note) + this.removeIsolatedNote(position, note) } removeIsolatedNote (position, note) { -- GitLab