Work for #4484 - fixed leaks in Angular

surveyjs · Sep 4, 2023 · 85b9a84 · 85b9a84
1 parent 4eaceed
commit 85b9a84
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 2 deletions.
diff --git a/packages/survey-creator-angular/src/adorners/item-value.component.ts b/packages/survey-creator-angular/src/adorners/item-value.component.ts
@@ -37,6 +37,10 @@ export class ItemValueDesignerComponent extends CreatorModelComponent<ItemValueW
   protected getModel(): ItemValueWrapperViewModel {
     return this.adorner;
   }
+  override ngOnDestroy(): void {
+    super.ngOnDestroy();
+    this.adorner.dispose();
+  }
 }
 
 AngularComponentFactory.Instance.registerComponent("svc-item-value", ItemValueDesignerComponent);
diff --git a/packages/survey-creator-angular/src/adorners/matrix-cell.component.ts b/packages/survey-creator-angular/src/adorners/matrix-cell.component.ts
@@ -47,6 +47,10 @@ export class MatrixCellComponent extends CreatorModelComponent<MatrixCellWrapper
   protected getModel(): MatrixCellWrapperViewModel {
     return this.adorner;
   }
+  override ngOnDestroy(): void {
+    super.ngOnDestroy();
+    this.adorner.dispose();
+  }
 }
 
 AngularComponentFactory.Instance.registerComponent("svc-matrix-cell", MatrixCellComponent);
diff --git a/packages/survey-creator-angular/src/adorners/question-rating.component.ts b/packages/survey-creator-angular/src/adorners/question-rating.component.ts
@@ -37,6 +37,10 @@ export class QuestionRatingAdornerDesignerComponent extends CreatorModelComponen
   protected getModel(): QuestionRatingAdornerViewModel {
     return this.adorner;
   }
+  override ngOnDestroy(): void {
+    super.ngOnDestroy();
+    this.adorner.dispose();
+  }
 }
 
 AngularComponentFactory.Instance.registerComponent("svc-rating-question-content", QuestionRatingAdornerDesignerComponent);

diff --git a/packages/survey-creator-angular/src/page.component.ts b/packages/survey-creator-angular/src/page.component.ts
@@ -17,7 +17,6 @@ export class PageDesignerComponent extends CreatorModelComponent<PageAdorner> {
   public adorner!: PageAdorner;
   protected createModel(): void {
     if (this.model) {
-      this.previousModel?.dispose();
       this.adorner = new PageAdorner(this.creator, this.model);
     }
   }

diff --git a/packages/survey-creator-angular/src/question.component.ts b/packages/survey-creator-angular/src/question.component.ts
@@ -47,6 +47,10 @@ export class QuestionDesignerComponent extends CreatorModelComponent<QuestionAdo
     event.stopPropagation();
     this.adorner.addNewQuestion();
   }
+  override ngOnDestroy(): void {
+    super.ngOnDestroy();
+    this.adorner.dispose();
+  }
   adornerComponent = "";
 }
 

diff --git a/packages/survey-creator-angular/src/row.component.ts b/packages/survey-creator-angular/src/row.component.ts
@@ -28,6 +28,11 @@ export class CreatorRowComponent extends CreatorModelComponent<RowViewModel> {
   getPropertiesToTrack(): string[] {
     return ["creator", "row"];
   }
+  override ngOnDestroy(): void {
+    super.ngOnDestroy();
+    this.model.dispose();
+  }
+
 }
 
 AngularComponentFactory.Instance.registerComponent("svc-row", CreatorRowComponent);
diff --git a/packages/survey-creator-angular/src/string-editor.component.ts b/packages/survey-creator-angular/src/string-editor.component.ts
@@ -101,6 +101,9 @@ export class StringEditorComponent extends CreatorModelComponent<StringEditorVie
     }
   }
   override ngOnDestroy(): void {
+    this.baseModel.blurEditor = undefined as any;
+    this.baseModel.getEditorElement = undefined as any;
+    this.baseModel.dispose();
     this.locString?.onStringChanged.remove(this.onChangeHandler);
     super.ngOnDestroy();
   }

diff --git a/packages/survey-creator-angular/src/toolbox/toolbox-tool.component.ts b/packages/survey-creator-angular/src/toolbox/toolbox-tool.component.ts
@@ -25,4 +25,8 @@ export class ToolboxToolComponent extends CreatorModelComponent<Action> {
   protected override getPropertiesToUpdateSync(): string[] {
     return ["mode"];
   }
+  override ngOnDestroy(): void {
+    super.ngOnDestroy();
+    this.model.dispose();
+  }
 }
diff --git a/packages/survey-creator-core/src/components/question-image.ts b/packages/survey-creator-core/src/components/question-image.ts
@@ -21,7 +21,7 @@ export class QuestionImageAdornerViewModel extends QuestionAdornerViewModel {
     this.filePresentationModel.storeDataAsText = false;
     surveyModel.onUploadFiles.add((s, o) => {
       const fileToUpload = o.files[0];
-      if(!!fileToUpload) {
+      if (!!fileToUpload) {
         this.creator.uploadFiles(o.files, this.question, (status, link) => {
           this.question.imageLink = link;
         });
@@ -78,4 +78,9 @@ export class QuestionImageAdornerViewModel extends QuestionAdornerViewModel {
   public get chooseImageText(): string {
     return getLocString("ed.imageChooseImage");
   }
+
+  public dispose() {
+    super.dispose();
+    this.questionRoot = undefined;
+  }
 }