fix(command): return latest changed elements

Related to bpmn-io/bpmn-js#1207
bpmn-io · Oct 11, 2019 · fd24592 · fd24592
1 parent 73c7a43
commit fd24592
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/lib/command/CommandStack.js b/lib/command/CommandStack.js
@@ -452,7 +452,7 @@ CommandStack.prototype._popAction = function() {
   actions.pop();
 
   if (!actions.length) {
-    this._eventBus.fire('elements.changed', { elements: uniqueBy('id', dirty) });
+    this._eventBus.fire('elements.changed', { elements: uniqueBy('id', dirty.reverse()) });
 
     dirty.length = 0;
 

diff --git a/test/spec/command/CommandStackSpec.js b/test/spec/command/CommandStackSpec.js
@@ -660,7 +660,7 @@ describe('command/CommandStack', function() {
     };
 
 
-    it('should update dirty shapes after change', inject(function(commandStack, eventBus) {
+    it('should update dirty elements after change', inject(function(commandStack, eventBus) {
 
       // given
       commandStack.registerHandler('outer-command', OuterHandler);
@@ -683,6 +683,31 @@ describe('command/CommandStack', function() {
       expect(events).to.eql([ [ s1, s2 ] ]);
     }));
 
+
+    it('should return latest dirty elements after change', inject(function(commandStack, eventBus) {
+
+      // given
+      commandStack.registerHandler('outer-command', OuterHandler);
+      commandStack.registerHandler('inner-command', InnerHandler);
+
+      var s1 = { id: 1 }, s2 = { id: 1 }, context = { s1: s1, s2: s2 };
+
+      var events = [];
+
+      function logEvent(e) {
+        events.push(e.elements);
+      }
+
+      eventBus.on('elements.changed', logEvent);
+
+      // when
+      commandStack.execute('outer-command', context);
+
+      // then
+      expect(events[0]).to.have.length(1);
+      expect(events[0][0]).to.equal(s2);
+    }));
+
   });