diff --git a/app/components/SimpleEditor/ContainerEditor.js b/app/components/SimpleEditor/ContainerEditor.js index 4eb554e40809359b100cc6014b8e256d83e57d8c..fd3ddbaa9a182b1f1a9696af1b44021a5379fe91 100644 --- a/app/components/SimpleEditor/ContainerEditor.js +++ b/app/components/SimpleEditor/ContainerEditor.js @@ -3,6 +3,7 @@ import { ContainerEditor as SubstanceContainerEditor, // deleteCharacter, // deleteSelection, + keys as keyboardKeys, Surface, uuid } from 'substance' @@ -96,11 +97,11 @@ class ContainerEditor extends SubstanceContainerEditor { event.stopPropagation() // TODO -- needed? - const direction = (event.keyCode === keys.BACKSPACE) ? 'left' : 'right' + const direction = (event.keyCode === keyboardKeys.BACKSPACE) ? 'left' : 'right' const trackChangesProvider = this.context.trackChangesProvider const options = { - direction: direction, + move: direction, status: 'delete' } trackChangesProvider.handleTransaction(options) diff --git a/app/components/SimpleEditor/elements/track_change/TrackChangesProvider.js b/app/components/SimpleEditor/elements/track_change/TrackChangesProvider.js index 032bd81702a4b497e6b793be6e81154e211f2bab..26ed5890146ad4be4879cc0eece76a883f76f8e9 100644 --- a/app/components/SimpleEditor/elements/track_change/TrackChangesProvider.js +++ b/app/components/SimpleEditor/elements/track_change/TrackChangesProvider.js @@ -45,23 +45,30 @@ class TrackChangesProvider { } handleDelete (options) { - const { status } = options + const { move, status } = options if (status !== 'delete') return const mode = this.getMode() let selection + console.log('move', move) + const direction = { + cursorTo: (move === 'left') ? 'start' : 'end', + move: move + } + if (!mode) { - selection = this.setSelectionPlusOne('left') + // selection = this.setSelectionPlusOne('left') + selection = this.setSelectionPlusOne(direction.move) this.createDeleteAnnotation(selection) - this.moveCursorTo('start') + this.moveCursorTo(direction.cursorTo) return } if (mode === 'delete') { - selection = this.setSelectionPlusOne('left') + selection = this.setSelectionPlusOne(direction.move) const annotation = this.getAnnotationByStatus('delete') this.expandTrackAnnotation(selection, annotation) - this.moveCursorTo('start') + this.moveCursorTo(direction.cursorTo) } // const isSelectionCollapsed = this.isSelectionCollapsed() @@ -207,14 +214,14 @@ class TrackChangesProvider { */ - shouldAdd (status) { - if (status !== 'add') return false - - const mode = this.getMode() - if (mode) return false - - return true - } + // shouldAdd (status) { + // if (status !== 'add') return false + // + // const mode = this.getMode() + // if (mode) return false + // + // return true + // } shouldDelete (status) { if (status === 'delete') return true