Fixed surveyjs/survey-library#7670 - The headerView property should b…

…e saved in theme JSON
surveyjs · Jan 16, 2024 · 4b0d2e5 · 4b0d2e5
1 parent 56bdadd
commit 4b0d2e5
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -5,8 +5,7 @@
     },
     "[typescript]": {
         "editor.codeActionsOnSave": {
-            "source.fixAll": true,
-            //"source.organizeImports": true, // be vare of https://github.com/microsoft/vscode-typescript-tslint-plugin/issues/51
+            "source.fixAll": "explicit"
         },
         "editor.defaultFormatter": "vscode.typescript-language-features"
     },

diff --git a/packages/survey-creator-core/.vscode/settings.json b/packages/survey-creator-core/.vscode/settings.json
@@ -5,8 +5,7 @@
     },
     "[typescript]": {
         "editor.codeActionsOnSave": {
-            "source.fixAll": true,
-            //"source.organizeImports": true, // be vare of https://github.com/microsoft/vscode-typescript-tslint-plugin/issues/51
+            "source.fixAll": "explicit"
         }
     },
     // "typescript.format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": false,

diff --git a/packages/survey-creator-core/src/components/tabs/theme-builder.ts b/packages/survey-creator-core/src/components/tabs/theme-builder.ts
@@ -577,6 +577,7 @@ export class ThemeBuilder extends Base {
       fontsettingsToCssVariable(options.question.panels[0].getElementByName("headerTitle"), this.themeCssVariablesChanges);
       fontsettingsToCssVariable(options.question.panels[0].getElementByName("headerDescription"), this.themeCssVariablesChanges);
     }
+    this.currentTheme.headerView = headerSettings["headerView"];
     this.themeModified(options);
   }
   private shadowInnerPropertiesChanged(options: ValueChangedEvent) {

diff --git a/packages/survey-creator-core/tests/tabs/theme-builder.tests.ts b/packages/survey-creator-core/tests/tabs/theme-builder.tests.ts
@@ -1173,6 +1173,13 @@ test("Theme onModified and saveThemeFunc", (): any => {
   expect(saveThemeCount).toBe(4);
   expect(creator.hasPendingThemeChanges).toBeFalsy();
   expect(themePlugin.isModified).toBeTruthy();
+
+  themeEditor.getQuestionByName("headerViewContainer").value = [{ headerView: "advanced" }];
+  expect(modificationsLog).toBe("->THEME_MODIFIED->THEME_SELECTED->THEME_MODIFIED->THEME_MODIFIED->THEME_MODIFIED");
+  expect(saveCount).toBe(1);
+  expect(saveThemeCount).toBe(5);
+  expect(creator.hasPendingThemeChanges).toBeFalsy();
+  expect(themePlugin.isModified).toBeTruthy();
 });
 
 test("Theme undo redo changes", (): any => {

diff --git a/packages/survey-creator-knockout/.vscode/settings.json b/packages/survey-creator-knockout/.vscode/settings.json
@@ -5,8 +5,7 @@
     },
     "[typescript]": {
         "editor.codeActionsOnSave": {
-            "source.fixAll": true,
-            //"source.organizeImports": true, // be vare of https://github.com/microsoft/vscode-typescript-tslint-plugin/issues/51
+            "source.fixAll": "explicit"
         }
     },
     // "typescript.format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": false,

diff --git a/packages/survey-creator-react/.vscode/settings.json b/packages/survey-creator-react/.vscode/settings.json
@@ -5,8 +5,7 @@
     },
     "[typescript]": {
         "editor.codeActionsOnSave": {
-            "source.fixAll": true,
-            //"source.organizeImports": true, // be vare of https://github.com/microsoft/vscode-typescript-tslint-plugin/issues/51
+            "source.fixAll": "explicit"
         }
     },
     // "typescript.format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": false,