Fix: Changes into new added question onQuestionAdded event generates addition undo transactions #972

Author: andrewtelnov

src/editor.ts

@@ -1879,7 +1879,9 @@ export class SurveyCreator implements ISurveyObjectEditorOptions {
       question.name = this.generateUniqueName(question, question.name);
       var page = this.getPageByElement(question);
       var options = { question: question, page: page };
+      this.addingObject = question;
       this.onQuestionAdded.fire(this, options);
+      this.addingObject = null;
     }
     if (parentPanel.elements.indexOf(question) !== -1) {
       this.surveyObjects.addElement(question, parentPanel);
@@ -1892,15 +1894,19 @@ export class SurveyCreator implements ISurveyObjectEditorOptions {
     if (!this.dragDropHelper.isMoving) {
       var page = this.getPageByElement(panel);
       var options = { panel: panel, page: page };
+      this.addingObject = panel;
       this.onPanelAdded.fire(this, options);
+      this.addingObject = null;
     }
     if (parentPanel.elements.indexOf(panel) !== -1) {
       this.surveyObjects.addElement(panel, parentPanel);
     }
   }
   private doOnPageAdded(page: Survey.Page) {
     var options = { page: page };
+    this.addingObject = page;
     this.onPageAdded.fire(this, options);
+    this.addingObject = null;
   }
   private getErrorOnPropertyChanging(
     obj: Survey.Base,
@@ -2216,13 +2222,15 @@ export class SurveyCreator implements ISurveyObjectEditorOptions {
       return;
     return this[name].apply(this, [].slice.call(arguments, 1));
   }
+  private addingObject: Survey.Base;
   private onSurveyPropertyValueChangedCallback(
     name: string,
     oldValue: any,
     newValue: any,
     sender: Survey.Base,
     arrayChanges: Survey.ArrayChanges
   ) {
+    if (this.addingObject == sender) return;
     this.undoRedoManager.startTransaction(name + " changed");
     this.undoRedoManager.onPropertyValueChanged(
       name,

tests/surveyCreatorTests.ts

@@ -1626,3 +1626,58 @@ QUnit.test("creator.onConditionQuestionsGetList, Bug#957", function (assert) {
   assert.ok(editorItem, "Editor item is created");
   assert.equal(editorItem.nameQuestion.choices.length, 1, "One text question");
 });
+
+QUnit.test("creator.onAddQuestion and undo-redo manager, Bug#972", function (
+  assert
+) {
+  var creator = new SurveyCreator();
+  creator.onQuestionAdded.add(function (sender, options) {
+    options.question.title = "new title";
+  });
+  creator.JSON = {};
+  creator.survey.currentPage.addNewQuestion("text", "q1");
+  creator.survey.currentPage.addNewQuestion("text", "q2");
+  creator.undo();
+  creator.undo();
+  assert.equal(
+    creator.survey.getAllQuestions().length,
+    0,
+    "We added two questions and then undo adding two questions"
+  );
+});
+QUnit.test("creator.onAddPage and undo-redo manager, Bug#972", function (
+  assert
+) {
+  var creator = new SurveyCreator();
+  creator.onPageAdded.add(function (sender, options) {
+    options.page.title = "new title";
+  });
+  creator.JSON = {};
+  creator.survey.addNewPage("p2");
+  creator.survey.addNewPage("p3");
+  creator.undo();
+  creator.undo();
+  assert.equal(
+    creator.survey.pages.length,
+    1,
+    "We added two pages and then undo adding two pages"
+  );
+});
+QUnit.test("creator.onAddPanel and undo-redo manager, Bug#972", function (
+  assert
+) {
+  var creator = new SurveyCreator();
+  creator.onPanelAdded.add(function (sender, options) {
+    options.panel.title = "new title";
+  });
+  creator.JSON = {};
+  creator.survey.currentPage.addNewPanel("panel1");
+  creator.survey.currentPage.addNewPanel("panel2");
+  creator.undo();
+  creator.undo();
+  assert.equal(
+    creator.survey.getAllPanels().length,
+    0,
+    "We added two panels and then undo adding two panels"
+  );
+});