Merge pull request #413 from voxmedia/transform-undo-manager

Transform the undo/redo stacks against non-user initiated changes

src/modules/undo-manager.coffee

@@ -7,6 +7,7 @@ class UndoManager
   @DEFAULTS:
     delay: 1000
     maxStack: 100
+    userOnly: false
 
   @hotkeys:
     UNDO: { key: 'Z', metaKey: true }
@@ -31,9 +32,12 @@ class UndoManager
         return false
       )
     )
-    @quill.on(@quill.constructor.events.TEXT_CHANGE, (delta, origin) =>
+    @quill.on(@quill.constructor.events.TEXT_CHANGE, (delta, source) =>
       return if @ignoreChange
-      this.record(delta, @oldDelta)
+      if !@options.userOnly or source == Quill.sources.USER
+        this.record(delta, @oldDelta)
+      else
+        this._transform(delta)
       @oldDelta = @quill.getContents()
     )
 
@@ -90,13 +94,22 @@ class UndoManager
       change = @stack[source].pop()
       @lastRecorded = 0
       @ignoreChange = true
-      @quill.updateContents(change[source], 'user')
+      @quill.updateContents(change[source], Quill.sources.USER)
       @ignoreChange = false
       index = this._getLastChangeIndex(change[source])
       @quill.setSelection(index, index)
       @oldDelta = @quill.getContents()
       @stack[dest].push(change)
 
+  _transform: (delta) ->
+    @oldDelta = delta.transform(@oldDelta, true)
+    for change in @stack.undo
+      change.undo = delta.transform(change.undo, true)
+      change.redo = delta.transform(change.redo, true)
+    for change in @stack.redo
+      change.undo = delta.transform(change.undo, true)
+      change.redo = delta.transform(change.redo, true)
+
 
 Quill.registerModule('undo-manager', UndoManager)
 module.exports = UndoManager

test/unit/modules/undo-manager.coffee

@@ -108,5 +108,18 @@ describe('UndoManager', ->
       dom(@quill.root).trigger('keydown', Quill.Module.UndoManager.hotkeys.REDO)
       expect(@quill.getContents()).toEqualDelta(changed)
     )
+
+    it('api change transform', ->
+      @quill.getModule('undo-manager').options.userOnly = true
+      @quill.updateContents(new Quill.Delta().retain(12).insert('es'), Quill.sources.USER)
+      @quill.updateContents(new Quill.Delta().retain(4).delete(5), Quill.sources.API)
+      @quill.updateContents(new Quill.Delta().retain(9).insert('!'), Quill.sources.USER)
+      expect(@undoManager.stack.undo.length).toEqual(1)
+      expect(@quill.getContents()).toEqual(new Quill.Delta().insert('The foxes!\n'))
+      @undoManager.undo()
+      expect(@quill.getContents()).toEqual(new Quill.Delta().insert('The fox\n'))
+      @undoManager.redo()
+      expect(@quill.getContents()).toEqual(new Quill.Delta().insert('The foxes!\n'))
+    )
   )
 )