Theme Editor: It's impossible to switch from advanced to basic header after changing some settings of advanced header (#6667)

Fixes #6664

Co-authored-by: tsv2013 <tsv2013@noreply.github.com>

Author: tsv2013

packages/survey-creator-core/src/creator-base.ts

@@ -1228,6 +1228,9 @@ export class SurveyCreatorModel extends Base
     if (this.activeTab !== "theme") {
       this.updatePlugin(this.activeTab);
     }
+    if (!!newTheme && newTheme.headerView) {
+      this.survey.headerView = newTheme.headerView;
+    }
   }
 
   private _doSaveThemeCore(onSaveComplete?: () => void) {

packages/survey-creator-core/tests/creator-base-2.tests.ts

@@ -445,4 +445,13 @@ test("activatePropertyGridCategory function", (): any => {
 
   creator.activatePropertyGridCategory("pages");
   expect(propertyGrid.survey.currentPage.name).toBe("pages");
+});
+
+test("creator set theme should update headerView survey property", (): any => {
+  const creator = new CreatorTester();
+  expect(creator.survey.headerView).toBe("advanced");
+  creator.theme = {};
+  expect(creator.survey.headerView).toBe("advanced");
+  creator.theme = { headerView: "basic" };
+  expect(creator.survey.headerView).toBe("basic");
 });

packages/survey-creator-core/tests/tabs/theme-tab-plugin.tests.ts

@@ -341,7 +341,7 @@ test("Theme onModified and saveThemeFunc", (): any => {
 
   themeModel.header["headerView"] = "basic";
   expect(modificationsLog).toBe("->THEME_MODIFIED->THEME_SELECTED->THEME_MODIFIED->THEME_MODIFIED->THEME_MODIFIED");
-  expect(saveCount).toBe(0);
+  expect(saveCount).toBe(1);
   expect(saveThemeCount).toBe(5);
   expect(creator.hasPendingThemeChanges).toBeFalsy();
   expect(themePlugin.isModified).toBeTruthy();