Fix tab's models are disposed twice in knockout (#5238)

surveyjs · Feb 22, 2024 · 5e811c7 · 5e811c7
1 parent e2e5baa
commit 5e811c7
Show file tree

Hide file tree

Showing 16 changed files with 31 additions and 13 deletions.
diff --git a/packages/survey-creator-core/src/components/tabs/designer-plugin.ts b/packages/survey-creator-core/src/components/tabs/designer-plugin.ts
@@ -74,6 +74,9 @@ export class TabDesignerPlugin implements ICreatorPlugin {
     this.creator.focusElement(undefined, true);
   }
   public deactivate(): boolean {
+    if(this.model) {
+      this.model.dispose();
+    }
     this.model = undefined;
     this.propertyGridTab.visible = false;
     return true;

diff --git a/packages/survey-creator-core/src/components/tabs/json-editor-plugin.ts b/packages/survey-creator-core/src/components/tabs/json-editor-plugin.ts
@@ -228,6 +228,7 @@ export abstract class TabJsonEditorBasePlugin implements ICreatorPlugin {
         this.creator.selectedElement = this.creator.survey;
         this.creator.setModified({ type: "JSON_EDITOR" });
       }
+      this.model.dispose();
       this.model = undefined;
     }
     return true;

diff --git a/packages/survey-creator-knockout/src/tabs/designer.html b/packages/survey-creator-knockout/src/tabs/designer.html
@@ -1,3 +1,4 @@
+<!-- ko using: model -->
 <!-- ko if: isToolboxVisible -->
 <svc-adaptive-toolbox params="model: creator"></svc-adaptive-toolbox>
 <!-- /ko -->
@@ -65,4 +66,5 @@
     <!-- /ko -->
     <!-- /ko -->
   </div>
-</div>
+</div>
+<!-- /ko -->
diff --git a/packages/survey-creator-knockout/src/tabs/designer.ts b/packages/survey-creator-knockout/src/tabs/designer.ts
@@ -11,7 +11,7 @@ ko.components.register("svc-tab-designer", {
       const model = <TabDesignerViewModel>params.data.model;
       new ImplementorBase(model);
       new ImplementorBase(model.pagesController);
-      return model;
+      return { model };
     }
   },
   template: template

diff --git a/packages/survey-creator-knockout/src/tabs/json-editor-ace.html b/packages/survey-creator-knockout/src/tabs/json-editor-ace.html
@@ -1,3 +1,4 @@
+<!-- ko using: model -->
 <div class="svc-creator-tab__content">
     <div class="svc-json-editor-tab__content">
         <div class="svc-json-editor-tab__ace-editor"></div>
@@ -6,4 +7,5 @@
             <!-- /ko -->
         </div>
     </div>
-</div>
+</div>
+<!-- /ko -->
diff --git a/packages/survey-creator-knockout/src/tabs/json-editor-ace.ts b/packages/survey-creator-knockout/src/tabs/json-editor-ace.ts
@@ -20,7 +20,7 @@ ko.components.register("svc-tab-json-editor-ace", {
       const plugin: TabJsonEditorAcePlugin = params.data;
       new ImplementorBase(plugin.model);
       (<AceJsonEditorModel>plugin.model).init(aceEditor);
-      return plugin.model;
+      return { model: plugin.model };
     }
   },
   template: template

diff --git a/packages/survey-creator-knockout/src/tabs/json-editor-textarea.html b/packages/survey-creator-knockout/src/tabs/json-editor-textarea.html
@@ -1,3 +1,4 @@
+<!-- ko using: model -->
 <div class="svc-creator-tab__content">
   <div class="svc-json-editor-tab__content">
     <textarea class="svc-json-editor-tab__content-area"
@@ -8,4 +9,5 @@
       <!-- /ko -->
     </div>
   </div>
-</div>
+</div>
+<!-- /ko -->
diff --git a/packages/survey-creator-knockout/src/tabs/json-editor-textarea.ts b/packages/survey-creator-knockout/src/tabs/json-editor-textarea.ts
@@ -18,7 +18,7 @@ ko.components.register("svc-tab-json-editor-textarea", {
           model.textElement = els[0];
         }
       }
-      return model;
+      return { model };
     }
   },
   template: template

diff --git a/packages/survey-creator-knockout/src/tabs/logic.html b/packages/survey-creator-knockout/src/tabs/logic.html
@@ -1,3 +1,4 @@
+<!-- ko using: model -->
 <div class="svc-creator-tab__content">
   <div class="svc-plugin-tab__content svc-logic-tab__content" data-bind="css: { 'svc-logic-tab__empty': !hasItems }">
     <!-- ko template: { name: 'survey-content', data: itemsSurvey  } -->
@@ -15,4 +16,5 @@
     </div>
     <!-- /ko -->
   </div>
-</div>
+</div>
+<!-- /ko -->
diff --git a/packages/survey-creator-knockout/src/tabs/logic.ts b/packages/survey-creator-knockout/src/tabs/logic.ts
@@ -10,7 +10,7 @@ ko.components.register("svc-tab-logic", {
       const plugin: TabLogicPlugin = params.data;
       new ImplementorBase(plugin.model);
       new ImplementorBase(plugin.model.addNewButton);
-      return plugin.model;
+      return { model: plugin.model };
     }
   },
   template: templateHtml

diff --git a/packages/survey-creator-knockout/src/tabs/test.html b/packages/survey-creator-knockout/src/tabs/test.html
@@ -1,3 +1,4 @@
+<!-- ko using: model -->
 <div class="svc-creator-tab__content svc-test-tab__content"
   data-bind="css: { 'svc-creator-tab__content--with-toolbar' : isPageToolbarVisible }">
   <div class="svc-plugin-tab__content">
@@ -12,4 +13,5 @@
     <!-- /ko -->
   </div>
   <!-- /ko -->
-</div>
+</div>
+<!-- /ko -->
diff --git a/packages/survey-creator-knockout/src/tabs/test.ts b/packages/survey-creator-knockout/src/tabs/test.ts
@@ -11,7 +11,7 @@ ko.components.register("svc-tab-test", {
       const plugin: TabTestPlugin = params.data;
       new ImplementorBase(plugin.model.simulator);
       new ImplementorBase(plugin.model);
-      return plugin.model;
+      return { model: plugin.model };
     },
   },
   template: template

diff --git a/packages/survey-creator-knockout/src/tabs/theme.html b/packages/survey-creator-knockout/src/tabs/theme.html
@@ -1,3 +1,4 @@
+<!-- ko using: model -->
 <div class="svc-creator-tab__content svc-test-tab__content"
   data-bind="css: { 'svc-creator-tab__content--with-toolbar' : isPageToolbarVisible }">
   <div class="svc-plugin-tab__content">
@@ -12,4 +13,5 @@
     <!-- /ko -->
   </div>
   <!-- /ko -->
-</div>
+</div>
+<!-- /ko -->
diff --git a/packages/survey-creator-knockout/src/tabs/theme.ts b/packages/survey-creator-knockout/src/tabs/theme.ts
@@ -11,7 +11,7 @@ ko.components.register("svc-tab-theme", {
       new ImplementorBase(plugin.model.simulator);
       new ImplementorBase(plugin.model.testAgainAction);
       new ImplementorBase(plugin.model);
-      return plugin.model;
+      return { model: plugin.model };
     },
   },
   template: template

diff --git a/packages/survey-creator-knockout/src/tabs/translation.html b/packages/survey-creator-knockout/src/tabs/translation.html
@@ -1,3 +1,4 @@
+<!-- ko using: model -->
 <div class="svc-creator-tab__content svc-translation-tab">
   <div class="st-content">
     <!-- ko if: $data.isEmpty -->
@@ -17,3 +18,4 @@
     <!-- /ko -->
   </div>
 </div>
+<!-- /ko -->
diff --git a/packages/survey-creator-knockout/src/tabs/translation.ts b/packages/survey-creator-knockout/src/tabs/translation.ts
@@ -12,7 +12,7 @@ ko.components.register("svc-tab-translation", {
       plugin.model.makeObservable((obj: Base) => {
         new ImplementorBase(obj);
       });
-      return plugin.model;
+      return { model: plugin.model };
     }
   },
   template: templateHtml