Merge pull request #8688 from surveyjs/bug/fix-auto-apply-theme

Fix auto apply theme
surveyjs · Aug 14, 2024 · d58ccbc · d58ccbc
2 parents a69d667 + 985ff51
commit d58ccbc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/packages/survey-core/src/survey.ts b/packages/survey-core/src/survey.ts
@@ -861,6 +861,7 @@ export class SurveyModel extends SurveyElementCore
 
   constructor(jsonObj: any = null, renderedElement: any = null) {
     super();
+    this.onBeforeRunConstructor();
     // if (DomDocumentHelper.isAvailable()) {
     //   SurveyModel.stylesManager = new StylesManager();
     // }
@@ -6322,6 +6323,7 @@ export class SurveyModel extends SurveyElementCore
     };
     return [navStart, navPrev, navNext, navPreview, navComplete];
   }
+  protected onBeforeRunConstructor() {}
   protected onBeforeCreating() { }
   protected onCreating() { }
   private getProcessedTextValue(textValue: TextPreProcessorValue): void {

diff --git a/src/stylesmanager.ts b/src/stylesmanager.ts
@@ -1,5 +1,6 @@
+import { SurveyModel } from "../packages/survey-core/src/survey";
 import { surveyCss } from "../packages/survey-core/src/defaultCss/defaultV2Css";
-import { DomDocumentHelper } from "../packages/survey-core/src/global_variables_utils";
+import { DomDocumentHelper, DomWindowHelper } from "../packages/survey-core/src/global_variables_utils";
 import { settings, ISurveyEnvironment } from "../packages/survey-core/src/settings";
 import { getElement, isShadowDOM, Logger } from "../packages/survey-core/src/utils/utils";
 
@@ -415,3 +416,9 @@ export class StylesManager {
     }
   }
 }
+SurveyModel.prototype["onBeforeRunConstructor"] = () => {
+  if(DomWindowHelper.isAvailable()) {
+    StylesManager.autoApplyTheme();
+  }
+};
+