From 3e9accbe6d494cc1f7162fecbd2398525cd4fd6f Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Sun, 16 Apr 2017 03:53:04 +0300
Subject: [PATCH] fix: so mini editor does not recompute entries constantly
---
app/components/SimpleEditor/miniEditor/miniEditor.js | 5 -----
.../SimpleEditor/panes/Comments/CommentBoxList.js | 2 +-
app/components/SimpleEditor/panes/Notes/Notes.js | 4 ++++
app/components/SimpleEditor/panes/Notes/NotesProvider.js | 9 ++-------
4 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/app/components/SimpleEditor/miniEditor/miniEditor.js b/app/components/SimpleEditor/miniEditor/miniEditor.js
index 5a1e972..b4e91a6 100644
--- a/app/components/SimpleEditor/miniEditor/miniEditor.js
+++ b/app/components/SimpleEditor/miniEditor/miniEditor.js
@@ -11,15 +11,10 @@ class MiniEditor extends ProseEditor {
didMount () {
this.context.notesProvider.config.miniEditorContext = this.getChildContext()
- this.editorSession.onUpdate('document', this.reComputeEntries, this)
this.context.notesProvider.config.miniEditorSession = this.editorSession
this.on('noteSelected', this.scrollTo, this)
}
- reComputeEntries () {
- this.context.notesProvider.computeEntries()
- }
-
render ($$) {
const el = $$('div').addClass('sc-mini-editor')
let toolbar = this._renderMiniToolbar($$)
diff --git a/app/components/SimpleEditor/panes/Comments/CommentBoxList.js b/app/components/SimpleEditor/panes/Comments/CommentBoxList.js
index 1cc7199..90f1ca8 100644
--- a/app/components/SimpleEditor/panes/Comments/CommentBoxList.js
+++ b/app/components/SimpleEditor/panes/Comments/CommentBoxList.js
@@ -74,7 +74,7 @@ class CommentBoxList extends Component {
const entries = provider.computeEntries()
const activeEntry = provider.activeEntry
- console.log(entries)
+
this.calculateTops(entries, activeEntry)
}
// TODO move to helper section??
diff --git a/app/components/SimpleEditor/panes/Notes/Notes.js b/app/components/SimpleEditor/panes/Notes/Notes.js
index 40fc2c6..e1a9504 100644
--- a/app/components/SimpleEditor/panes/Notes/Notes.js
+++ b/app/components/SimpleEditor/panes/Notes/Notes.js
@@ -93,6 +93,9 @@ class Notes extends Component {
saveNotes (source) {
const provider = this.getProvider()
+ // For some reason the first character is not in the annotation so it is not getting saved
+ // so we rerender the Surface
+ provider.config.miniEditorContext.surfaceManager.getSurface('mini').rerender()
const notes = provider.computeEntries()
let self = this
@@ -136,6 +139,7 @@ class Notes extends Component {
onNotesUpdated (change) {
const notesProvider = this.getProvider()
+ notesProvider.config.miniEditorContext.surfaceManager.getSurface('mini').rerender()
notesProvider.handleDocumentChange(change)
// this.el.el.style.height = '95px'
}
diff --git a/app/components/SimpleEditor/panes/Notes/NotesProvider.js b/app/components/SimpleEditor/panes/Notes/NotesProvider.js
index 7bd4764..5978a79 100644
--- a/app/components/SimpleEditor/panes/Notes/NotesProvider.js
+++ b/app/components/SimpleEditor/panes/Notes/NotesProvider.js
@@ -63,24 +63,19 @@ class NotesProvider extends TOCProvider {
let notes = _.clone(nodes)
let rootEl = this.config.miniEditorContext.editor.el
- let i = 0
+
notes = _.map(notes, function (note) {
const element = Component.unwrap(rootEl.find('p[data-path="' + note.id + '.content"]'))
// removes a <br> insterted at the end by inline node
const text = element.innerHTML.slice(0, -4)
let noteContent = '<isolated-note data-id="' + note.id + '" parent-id="' + note.parentNoteId + '" data-type="isolated-note">' + text + '</isolated-note>'
- // TODO For some reason the first character is not in the annotation so it is not getting saved. For that
- // miniEditor has a reComputeEntries and in here we rerender Surface only the first time to get the character.
- if (i === 0) this.config.miniEditorContext.surfaceManager.getSurface('mini').rerender()
- i++
-
return {
id: note.id,
content: noteContent,
parentNoteId: note.parentNoteId
}
- }.bind(this))
+ })
return notes
}
--
GitLab