fix(cutandpaste): Cursor not moved

Author: JSchenk8

spec/dispatcher.spec.js

@@ -383,7 +383,9 @@ describe('Dispatcher', function () {
       it(`replaces the last '&nbsp' with ' ' if text ends with a single '&nbsp'`, (done) => {
         on('paste', (block, blocks) => {
           expect(block.innerHTML).to
-            .equal('some text that ends with a single a non breaking space ')
+            .equal('some text that ends with a single a non breaking space ') // space has been removed
+          expect(blocks.length).to.equal(1)
+          expect(blocks[0]).to.equal('copied text') // copied text is still in the paste event
           done()
         })
         elem.innerHTML = 'some text that ends with a single a non breaking space '

src/dispatcher.js

@@ -136,12 +136,11 @@ export default class Dispatcher {
         const {blocks, cursor} = clipboard.paste(block, selection, clipboardContent)
         if (blocks.length) {
           if (endsWithSingleSpace(evt.target.innerText)) {
-            block.innerHTML = replaceLast(block.innerHTML, ' ', ' ')
-            this.notify('paste', block, blocks, this.editable.createCursorAtEnd(block))
-          } else {
-            this.notify('paste', block, blocks, cursor)
+            cursor.retainVisibleSelection(() => {
+              block.innerHTML = replaceLast(block.innerHTML, ' ', ' ')
+            })
           }
-
+          this.notify('paste', block, blocks, cursor)
           // The input event does not fire when we process the content manually
           // and insert it via script
           this.notify('change', block)

src/util/string.js

@@ -67,6 +67,7 @@ export function replaceLast (text, searchValue, replaceValue) {
   text = `${text}`
   if (!searchValue || replaceValue == null) return text
   const lastOccurrenceIndex = text.lastIndexOf(searchValue)
+  if (lastOccurrenceIndex === -1) return text
   return `${
     text.slice(0, lastOccurrenceIndex)
   }${