From a0d09c1f63ce7ec70edc665816b60b9450d3a9a3 Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Sun, 16 Apr 2017 21:52:34 +0300
Subject: [PATCH] delete a note callout deletes the associated isolated note
---
.../SimpleEditor/ContainerEditor.js | 4 +-
.../SimpleEditor/panes/Notes/NotesProvider.js | 38 ++++++++++++++++++-
2 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/app/components/SimpleEditor/ContainerEditor.js b/app/components/SimpleEditor/ContainerEditor.js
index db78b1f..938ba96 100644
--- a/app/components/SimpleEditor/ContainerEditor.js
+++ b/app/components/SimpleEditor/ContainerEditor.js
@@ -34,8 +34,8 @@ class ContainerEditor extends SubstanceContainerEditor {
didMount () {
super.didMount()
-
- if (this.isEmpty()) this.createText()
+ const containerId = this.getContainerId()
+ if (this.isEmpty() && containerId !== 'mini') this.createText()
// TODO -- why this and not this.focus ?
this.el.focus()
diff --git a/app/components/SimpleEditor/panes/Notes/NotesProvider.js b/app/components/SimpleEditor/panes/Notes/NotesProvider.js
index 5978a79..3e35b67 100644
--- a/app/components/SimpleEditor/panes/Notes/NotesProvider.js
+++ b/app/components/SimpleEditor/panes/Notes/NotesProvider.js
@@ -30,6 +30,9 @@ class NotesProvider extends TOCProvider {
mini: entriesMini
}
+ if (entriesMini && entriesMain.length < entriesMini.length) {
+ this.findDeletedNote(entries)
+ }
return entries
}
@@ -97,9 +100,9 @@ class NotesProvider extends TOCProvider {
createIsolatedNote (note) {
const notes = this.computeEntries()
+ const containerId = this.getMiniContainerId()
+ let surface = this.config.miniEditorContext.surfaceManager.getSurface(containerId)
if (notes.mini && notes.mini.length > 0) {
- const containerId = this.getMiniContainerId()
- let surface = this.config.miniEditorContext.surfaceManager.getSurface(containerId)
let container = surface.getContainer()
let findIndex = _.findIndex(notes.main, ['id', note.id])
@@ -112,6 +115,7 @@ class NotesProvider extends TOCProvider {
}
})
} else {
+ surface.createText()
this.config.miniEditorSession.transaction(function (tx) {
let nodeData = this.createNodeData(note)
tx.insertBlockNode(nodeData)
@@ -119,6 +123,36 @@ class NotesProvider extends TOCProvider {
}
}
+ findDeletedNote (entries) {
+ let position
+ let note
+ if (entries.main.length === 0) {
+ position = 0
+ note = entries.mini[0]
+ } else {
+ _.forEach(entries.main, function (mainNote) {
+ _.forEach(entries.mini, function (miniNote) {
+ if (miniNote.parentNoteId !== mainNote.id) {
+ position = _.findIndex(entries.mini, ['id', miniNote.id])
+ note = miniNote
+ }
+ })
+ })
+ }
+
+ return this.removeIsolatedNote(position, note)
+ }
+
+ removeIsolatedNote (position, note) {
+ const containerId = this.getMiniContainerId()
+ let surface = this.config.miniEditorContext.surfaceManager.getSurface(containerId)
+ let container = surface.getContainer()
+ this.config.miniEditorSession.transaction(function (tx) {
+ tx.update(container.getContentPath(), { type: 'delete', pos: position })
+ tx.delete(note.id)
+ })
+ }
+
getMiniContainerId () {
return this.config.miniEditorContext.editor.props.containerId
}
--
GitLab