Skip to content

Offline, privacy-first grammar checker. Fast, open-source, Rust-powered

fix(obsidian-plugin): postpone initialization until layout is ready (#2611)

Vinzenta74ffb91a3de
diff --git a/packages/obsidian-plugin/src/HarperSettingTab.ts b/packages/obsidian-plugin/src/HarperSettingTab.ts
index 1abb5bb8f..9cf0c747c 100644
--- a/packages/obsidian-plugin/src/HarperSettingTab.ts
+++ b/packages/obsidian-plugin/src/HarperSettingTab.ts
@@ -11,7 +11,6 @@ import { linesToString, stringToLines } from './textUtils';
const LintSettingId = 'HarperLintSettings';
export class HarperSettingTab extends PluginSettingTab {
- private state: State;
private settings: Settings;
private descriptionsHTML: Record<string, string>;
private defaultLintConfig: Record<string, boolean>;
@@ -19,20 +18,19 @@ export class HarperSettingTab extends PluginSettingTab {
private plugin: HarperPlugin;
private toggleAllButton?: ButtonComponent;
- constructor(app: App, plugin: HarperPlugin, state: State) {
+ private get state() {
+ return this.plugin.state;
+ }
+
+ constructor(app: App, plugin: HarperPlugin) {
super(app, plugin);
- this.state = state;
this.plugin = plugin;
+ }
- // Poll every so often
- const update = () => {
- this.updateDescriptions();
- this.updateSettings();
- this.updateDefaults();
- setTimeout(update, 1000);
- };
-
- update();
+ update() {
+ this.updateDescriptions();
+ this.updateSettings();
+ this.updateDefaults();
}
updateSettings() {
@@ -55,7 +53,12 @@ export class HarperSettingTab extends PluginSettingTab {
});
}
- display() {
+ display(update = true) {
+ if (update) {
+ this.update();
+ this.display(false);
+ }
+
const { containerEl } = this;
containerEl.empty();
@@ -247,7 +250,7 @@ export class HarperSettingTab extends PluginSettingTab {
if (
searchQuery !== '' &&
!(
- descriptionHTML.toLowerCase().contains(queryLower) ||
+ descriptionHTML?.toLowerCase().contains(queryLower) ||
setting.toLowerCase().contains(queryLower)
)
) {
diff --git a/packages/obsidian-plugin/src/index.ts b/packages/obsidian-plugin/src/index.ts
index df909ce3f..f0fcf9f12 100644
--- a/packages/obsidian-plugin/src/index.ts
+++ b/packages/obsidian-plugin/src/index.ts
@@ -6,17 +6,13 @@ import { HarperSettingTab } from './HarperSettingTab';
import State from './State';
export default class HarperPlugin extends Plugin {
- private state: State;
+ state: State;
private dialectSpan: HTMLSpanElement | null = null;
private logo: HTMLSpanElement | null = null;
+ private settings: HarperSettingTab | null = null;
constructor(app: App, manifest: PluginManifest) {
super(app, manifest);
- this.state = new State(
- (n) => this.saveData(n),
- () => this.app.workspace.updateOptions(),
- editorInfoField,
- );
}
async onload() {
@@ -26,15 +22,28 @@ export default class HarperPlugin extends Plugin {
}
const data = await this.loadData();
- await this.state.initializeFromSettings(data);
- this.registerEditorExtension(this.state.getCMEditorExtensions());
- this.setupCommands();
- this.setupStatusBar();
- if (!(data?.lintEnabled ?? true)) {
- this.state.disableEditorLinter();
- } else this.state.enableEditorLinter();
- this.addSettingTab(new HarperSettingTab(this.app, this, this.state));
+ this.app.workspace.onLayoutReady(async () => {
+ this.state = new State(
+ (n) => this.saveData(n),
+ () => this.app.workspace.updateOptions(),
+ editorInfoField,
+ );
+
+ await this.state.initializeFromSettings(data);
+ this.registerEditorExtension(this.state.getCMEditorExtensions());
+ if (!(data?.lintEnabled ?? true)) {
+ this.state.disableEditorLinter(false);
+ } else this.state.enableEditorLinter(false);
+ this.settings?.update();
+
+ this.setupStatusBar();
+ });
+
+ this.settings = new HarperSettingTab(this.app, this);
+ this.addSettingTab(this.settings);
+
+ this.setupCommands();
}
private getDialectStatus(dialectNum: Dialect): string {