fixed undo stack bug

src/js/action.js

@@ -176,7 +176,6 @@ export default {
  this.off('mousedown');
  this.ui.icon.clearIconType();
  this.changeSelectableAll(true);
- this.cancelAddIcon();
  this.changeCursor('default');
  },
  registDefalutIcons: (type, path) => {
@@ -422,11 +421,14 @@ export default {
  fill: this.ui.text.textColor,
  fontSize: util.toInteger(this.ui.text.fontSize)
  }
+ }).then(() => {
+ this.changeCursor('default');
  });
  },
  addObjectAfter: obj => {
  if (['rect', 'circle', 'triangle'].indexOf(obj.type) > -1) {
  this.ui.shape.setMaxStrokeValue(Math.min(obj.width, obj.height));
+ this.ui.shape.changeStandbyMode();
  }
  },
  objectScaled: obj => {
@@ -445,6 +447,7 @@ export default {
  }
  },
  selectionCleared: () => {
+ this.activeObjectId = null;
  if (this.ui.submenu !== 'draw' && this.ui.submenu !== 'crop') {
  this.stopDrawingMode();
  }

src/js/ui/shape.js

@@ -60,8 +60,6 @@ export default class Shape extends Submenu {
  * @param {string} fillColor - fill color
  */
  setShapeStatus({strokeWidth, strokeColor, fillColor}) {
- this.changeStandbyMode();
-
  this._els.strokeRange.value = strokeWidth;
  this._els.strokeRange.trigger('change');
 

test/action.spec.js

@@ -458,7 +458,11 @@ describe('Ui', () => {
 
  describe('addText', () => {
  it('When addText occurs, the addText () method should be executed.', () => {
- spyOn(imageEditorMock, 'addText');
+ const promise = new Promise(resolve => {
+ resolve(300);
+ });
+
+ spyOn(imageEditorMock, 'addText').and.returnValue(promise);
  imageEditorMock.fire('addText', {
  x: 10,
  y: 10
@@ -470,13 +474,15 @@ describe('Ui', () => {
  describe('addObjectAfter', () => {
  it('When addObjectAfter occurs, the shape\'s maxStrokeValue should be changed to match the size of the added object.', () => {
  spyOn(imageEditorMock.ui.shape, 'setMaxStrokeValue');
+ spyOn(imageEditorMock.ui.shape, 'changeStandbyMode');
  imageEditorMock.fire('addObjectAfter', {
  type: 'circle',
  width: 100,
  height: 200
  });
 
  expect(imageEditorMock.ui.shape.setMaxStrokeValue.calls.mostRecent().args[0]).toBe(100);
+ expect(imageEditorMock.ui.shape.changeStandbyMode).toHaveBeenCalled();
  });
  });