Skip to content
Snippets Groups Projects
Commit 9537ccc9 authored by Alexandros Georgantas's avatar Alexandros Georgantas Committed by john
Browse files

Note command and scroll to functionality added

parent cce6a9cb
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
app/components/SimpleEditor/elements/note/NoteCommand.js
+ 48
− 1
View file @ 9537ccc9
import { InsertInlineNodeCommand } from 'substance'
import { InsertInlineNodeCommand, documentHelpers } from 'substance'
class NoteCommand extends InsertInlineNodeCommand {
createNodeData () {
// console.log('hello from create Node Data')
return {
type: 'note'
}
}
execute (params) {
// console.log('params in execute', params)
let editorSession = params.editorSession
let nodeData = this.createNodeData()
// let newNote = {}
editorSession.transaction((tx) => {
return tx.insertInlineNode(nodeData)
})
let selection = editorSession.getSelection()
let selectionBefore = selection._clone()
selectionBefore.start.offset -= 1
let note = this.getCreatedNote(selectionBefore, editorSession)
const notesProvider = this.getNotesProvider(params)
notesProvider.createIsolatedNote(note)
// console.log('before', selectionBefore.getNodeId())
// editorSession.setSelection(selectionBefore)
// console.log('newNote', newNote)
// console.log('selection', editorSession.getSelection())
// console.log('params in execute after', params)
}
getCreatedNote (selection, editorSession) {
// console.log('this', this)
// const session = this.context.editorSession
const note = documentHelpers.getPropertyAnnotationsForSelection(
editorSession.getDocument(),
selection,
{ type: 'note' }
)
return note[0]
// console.log('note', note)
}
getNotesProvider (params) {
console.log('params', params)
return params.surface.context.notesProvider
}
// getCommandState (params) {
// console.log('params in getCommandState', params)
// return commandState
// }
}
NoteCommand.type = 'note'
......
app/components/SimpleEditor/elements/note/NoteComponent.js
+ 4
− 9
View file @ 9537ccc9
......@@ -6,29 +6,24 @@ import { Component, documentHelpers } from 'substance'
class NoteComponent extends Component {
didMount () {
this.context.editorSession.onUpdate('', this.test, this)
this.context.editorSession.onUpdate('', this.showNote, this)
}
render ($$) {
const el = $$('note')
.attr('note-content', this.props.node['note-content'])
.addClass('sc-note').on('click', this.createShowNote)
.addClass('sc-note').on('click', this.showNote)
return el
}
test() {
const provider = this.getProvider()
provider.computeEntries()
this.rerender()
}
createShowNote () {
showNote () {
const selected = this.getSelection()
if (!selected.node) return
console.log('in note component', selected.node)
const provider = this.getProvider()
this.disableTools(selected)
provider.createShowNote(selected.node)
provider.showNote(selected.node)
}
disableTools () {
......
app/components/SimpleEditor/panes/Notes/NotesProvider.js
+ 11
− 106
View file @ 9537ccc9
import _ from 'lodash'
import { TOCProvider, Component } from 'substance'
import { TOCProvider } from 'substance'
class NotesProvider extends TOCProvider {
computeEntries () {
......@@ -81,37 +81,12 @@ class NotesProvider extends TOCProvider {
// return _.sortBy(notes, ['blockPosition', 'nodePosition'])
}
createShowNote (note) {
showNote (note) {
console.log('start')
const notes = this.computeEntries()
_.forEach(notes.mini, function (miniNote) {
if (miniNote.parentNoteId === note.id) {
console.log('if')
return false
}
}.bind(this))
if (note['note-content'] !== '') {
console.log('empty')
return
}
console.log('notes', notes)
if (notes.mini.length === 0) {
this.createIsolatedNote(note)
return
}
// _.forEach(notes.main, function (mainNote) {
// _.forEach(notes.mini, function (miniNote) {
// if (miniNote.parentNoteId === mainNote.id) {
// return false
// } else {
// this.createIsolatedNote(note)
// }
// }.bind(this))
// }.bind(this))
this.createIsolatedNote(note)
// console.log('something', this.config.miniEditorSession.getSelection())
const miniNote = _.find(notes.mini, ['parentNoteId', note.id])
console.log('miniNote', miniNote)
this.config.miniEditorContext.editor.emit('noteSelected', miniNote.id)
}
createNodeData (note) {
......@@ -123,42 +98,14 @@ class NotesProvider extends TOCProvider {
}
createIsolatedNote (note) {
console.log('create Isolated Note')
// console.log('note', note)
// console.log('config', this.config)
// let rootEl
let existingNodes = this.config.miniEditorContext.doc.getNodes()
let hasIsolatedNotes = false
// console.log('existingNodes', existingIsolatedNodes)
_.mapKeys(existingNodes, function (value, key) {
// console.log('key', key)
if (key.indexOf('isolated-note') !== -1) {
hasIsolatedNotes = true
}
})
if (hasIsolatedNotes) {
console.log('hello from true')
const docMini = this.config.miniEditorSession.document
let nodesMini = ''
if (docMini) nodesMini = docMini.getNodes()
const notesMini = _.pickBy(nodesMini, function (value, key) {
return value.type === 'isolated-note'
})
const entriesMini = this.sortNodesMini(notesMini)
// console.log('isolatedNotes', isolatedNotes)
let lastNote = _.last(this.sortNodesMini(entriesMini))
// console.log('lastNote', lastNote)
// this.config.miniEditorSession.setSelection({
// type: 'node',
// nodeId: lastNote.id,
// containerId: 'body',
// surfaceId: 'body'
// })
// let selection = this.config.miniEditorSession.getSelection()
const notes = this.computeEntries()
if (notes.mini && notes.mini.length > 0) {
let lastNote = _.last(notes.mini)
let surface = this.config.miniEditorContext.surfaceManager.getSurface('body')
let container = surface.getContainer()
let nodePos = container.getPosition(lastNote.id, 'strict')
// console.log('nodepos', nodePos)
let nodeData = this.createNodeData(note)
this.config.miniEditorSession.transaction(function (tx) {
if (!tx.get(nodeData.id)) {
......@@ -166,55 +113,13 @@ class NotesProvider extends TOCProvider {
tx.update(container.getContentPath(), { type: 'insert', pos: nodePos + 1, value: blockNode.id })
}
})
// console.log('after new note')
// console.log('selection before', selection)
// selection.start.offset += 1
// selection.end.offset += 1
// surface.editorSession.setSelection(selection)
// console.log('selection after', selection)
} else {
// console.log('hello from else')
this.config.miniEditorSession.transaction(function (tx) {
let nodeData = this.createNodeData(note)
tx.insertBlockNode(nodeData)
}.bind(this))
}
// this.config.miniEditorSession.transaction(function (tx) {
// let nodeData = this.createNodeData(tx, note)
// tx.insertBlockNode(nodeData)
// }.bind(this))
// console.log('config after', this.config)
// let selection = this.config.miniEditorSession.getSelection()
// console.log('selection', selection)
// this.config.miniEditorSession.setSelection({
// type: 'node',
// nodeId: selection.nodeId,
// containerId: selection.containerId,
// surfaceId: selection.surfaceId
// })
// let node = this.config.miniEditorContext.doc.get(selection.getNodeId())
// rootEl = this.config.miniEditorContext.domSelection.editor.el
// let comp = Component.unwrap(rootEl.find('*[data-id="'+selection.getNodeId()+'"]'))
// comp.el.focus()
// this.config.miniEditorContext.editor.rerender()
// console.log('node', node)
// console.log('comp', comp)
}
getSelection () {
const surface = this.getSurface()
return surface.domSelection.getSelection()
}
getSurface () {
const surface = this.config.miniEditorSession.getFocusedSurface()
console.log('f_surface', surface)
return surface
}
}
NotesProvider.tocTypes = ['note']
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment