dispose question/panel/page on calling delete() fix #6676 (#6677)

surveyjs · Aug 8, 2023 · 9c7c933 · 9c7c933
1 parent 8cdbc30
commit 9c7c933
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 4 deletions.
diff --git a/src/page.ts b/src/page.ts
@@ -79,12 +79,12 @@ export class PageModel extends PanelModelBase implements IPage {
   public set passed(val: boolean) {
     this.setPropertyValue("passed", val);
   }
-  public delete() {
+  protected removeFromParent(): void {
     if (!!this.survey) {
       this.removeSelfFromList(this.survey.pages);
     }
   }
-  public onFirstRendering() {
+  public onFirstRendering(): void {
     if (this.wasShown) return;
     super.onFirstRendering();
   }

diff --git a/src/panel.ts b/src/panel.ts
@@ -323,6 +323,11 @@ export class PanelModelBase extends SurveyElement<Question>
       (this.showTitle && this.isDesignMode && settings.designMode.showEmptyTitles)
     );
   }
+  public delete(): void {
+    this.removeFromParent();
+    this.dispose();
+  }
+  protected removeFromParent(): void {}
   protected canShowTitle(): boolean { return true; }
   @property({ defaultValue: true }) showDescription: boolean;
   get _showDescription(): boolean {
@@ -1548,7 +1553,7 @@ export class PanelModel extends PanelModelBase implements IElement {
   public set page(val: IPage) {
     this.setPage(this.parent, val);
   }
-  public delete() {
+  protected removeFromParent(): void {
     if (!!this.parent) {
       this.removeSelfFromList(this.parent.elements);
     }

diff --git a/src/question.ts b/src/question.ts
@@ -260,6 +260,10 @@ export class Question extends SurveyElement<Question>
     return null;
   }
   public delete(): void {
+    this.removeFromParent();
+    this.dispose();
+  }
+  protected removeFromParent(): void {
     if (!!this.parent) {
       this.removeSelfFromList(this.parent.elements);
     }
@@ -450,7 +454,7 @@ export class Question extends SurveyElement<Question>
   }
   public set parent(val: IPanel) {
     if (this.parent === val) return;
-    this.delete();
+    this.removeFromParent();
     this.setPropertyValue("parent", val);
     this.updateQuestionCss();
     this.onParentChanged();

diff --git a/tests/question_baseselecttests.ts b/tests/question_baseselecttests.ts
@@ -1001,6 +1001,21 @@ QUnit.test("Carry Forward and keepIncorrectValues, bug#6490", function (assert)
   survey.doComplete();
   assert.deepEqual(survey.data, { q1: "B", q2: "X" }, "keep value on compete");
 });
+QUnit.test("Check isUsingCarryForward on deleting question", function (assert) {
+  const survey = new SurveyModel();
+  survey.setDesignMode(true);
+  survey.fromJSON({ elements: [
+    { type: "dropdown", name: "q1", choices: ["B", "A", "D", "C"] },
+    { type: "dropdown", name: "q2", choicesFromQuestion: "q1" }
+  ] });
+  const q1 = <QuestionSelectBase>survey.getQuestionByName("q1");
+  const q2 = <QuestionSelectBase>survey.getQuestionByName("q2");
+  assert.equal(q2.choicesFromQuestion, "q1", "set correctly");
+  assert.equal(q2.isUsingCarryForward, true, "Carryforward flag is set");
+  q1.delete();
+  assert.notOk(q2.choicesFromQuestion, "it is empty");
+  assert.equal(q2.isUsingCarryForward, false, "Carryforward flag is unset");
+});
 QUnit.test("Do not notify survey on changing newItem.value", function (
   assert
 ) {