fix: fixed empty settings on startup

mbret · Jul 3, 2024 · 7a662fc · 7a662fc
1 parent 3fd7ce2
commit 7a662fc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/packages/core/src/settings/ReaderSettingsManager.ts b/packages/core/src/settings/ReaderSettingsManager.ts
@@ -42,8 +42,6 @@ export class ReaderSettingsManager extends SettingsManager<
     merge(recomputeSettingsOnContextChange$, updateContextOnSettingsChanges$)
       .pipe(takeUntil(context.destroy$))
       .subscribe()
-
-    this.settings$.subscribe()
   }
 
   private getComputedSettings(

diff --git a/packages/core/src/settings/SettingsManager.ts b/packages/core/src/settings/SettingsManager.ts
@@ -11,7 +11,7 @@ export abstract class SettingsManager<InputSettings, OutputSettings>
   protected outputSettings?: OutputSettings
   protected outputSettingsUpdateSubject: Subject<OutputSettings>
 
-  public settings$: Observable<OutputSettings>
+  public _settings$: Observable<OutputSettings>
 
   constructor(initialSettings: Partial<InputSettings>) {
     const settingsWithDefaults: InputSettings = {
@@ -22,11 +22,11 @@ export abstract class SettingsManager<InputSettings, OutputSettings>
     this.inputSettings = settingsWithDefaults
     this.outputSettingsUpdateSubject = new Subject()
 
-    this.settings$ = this.outputSettingsUpdateSubject
+    this._settings$ = this.outputSettingsUpdateSubject
       .asObservable()
       .pipe(shareReplay(1))
 
-    this.settings$.subscribe()
+    this._settings$.subscribe()
   }
 
   _prepareUpdate(settings: Partial<InputSettings>): {
@@ -76,6 +76,16 @@ export abstract class SettingsManager<InputSettings, OutputSettings>
     return this.outputSettings
   }
 
+  get settings$() {
+    if (!this.outputSettings) {
+      const { commit } = this._prepareUpdate(this.inputSettings)
+
+      commit()
+    }
+
+    return this._settings$
+  }
+
   public destroy() {
     this.outputSettingsUpdateSubject.complete()
   }