fix: cleanup sidebar duplication (#342)

* fix: gracefully handle closing and unloading windows

* chore: bumped version

* chore: bump minimum version to 1.7.2

* refactor: use modern leaf API functions

* chore: typo in versions.json

Author: saberzero1

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "13.0.19"
-}
+  ".": "13.0.20"
+}

manifest.json

@@ -1,8 +1,8 @@
 {
     "id": "initiative-tracker",
     "name": "Initiative Tracker",
-    "version": "13.0.19",
-    "minAppVersion": "1.1.0",
+    "version": "13.0.20",
+    "minAppVersion": "1.7.2",
     "author": "Jeremy Valentine",
     "description": "TTRPG Initiative Tracker for Obsidian.md",
     "authorUrl": "https://github.com/valentine195/obsidian-initiative-tracker",

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@javalent/initiative-tracker",
-    "version": "13.0.19",
+    "version": "13.0.20",
     "description": "TTRPG Initiative Tracker for Obsidian.md",
     "types": "./dist/index.d.ts",
     "scripts": {
@@ -25,7 +25,7 @@
         "esbuild": "^0.19.3",
         "esbuild-svelte": "^0.8.0",
         "fast-copy": "^3.0.1",
-        "obsidian": "^1.4.11",
+        "obsidian": "^1.7.2",
         "obsidian-utilities": "^1.1.3",
         "svelte": "^4.2.12",
         "svelte-dnd-action": "^0.9.29",

package.json

@@ -25,14 +25,20 @@ export default class BuilderView extends ItemView {
     constructor(leaf: WorkspaceLeaf, public plugin: InitiativeTracker) {
         super(leaf);
     }
-    getState() {
-        return [...get(encounter).entries()];
+    getState(): Record<string, unknown> {
+        return { encounter: [...get(encounter).entries()] };
     }
     async setState(
-        state: [SRDMonster, number][],
+        state: Record<string, unknown>,
         result: ViewStateResult
     ): Promise<void> {
-        if (state && Array.isArray(state)) encounter.setMultiple(state);
+        // Support both legacy array format and new object format
+        const entries = (
+            Array.isArray(state)
+                ? state
+                : state?.encounter
+        ) as [SRDMonster, number][] | undefined;
+        if (entries && Array.isArray(entries)) encounter.setMultiple(entries);
         super.setState(state, result);
     }
     ui: Builder;

src/builder/view.ts

@@ -1,3 +1,4 @@
+declare const app: import("obsidian").App;
 declare type DndEventInfo = import("svelte-dnd-action").DndEventInfo;
 declare interface GenericDndEvent<T extends Record<string, any>> {
     items: T;

src/global.d.ts

@@ -567,7 +567,7 @@ export default class InitiativeTracker extends Plugin {
             )
         );
         this.registerEvent(
-            app.workspace.on(
+            this.app.workspace.on(
                 "initiative-tracker:save-state",
                 async (state: InitiativeViewState) => {
                     this.data.state = state;
@@ -618,19 +618,22 @@ export default class InitiativeTracker extends Plugin {
 
     async onunload() {
         await this.saveSettings();
+
+        this.app.workspace.detachLeavesOfType(INITIATIVE_TRACKER_VIEW);
+        this.app.workspace.detachLeavesOfType(PLAYER_VIEW_VIEW);
+        this.app.workspace.detachLeavesOfType(CREATURE_TRACKER_VIEW);
+        this.app.workspace.detachLeavesOfType(BUILDER_VIEW);
+
         this.app.workspace.trigger("initiative-tracker:unloaded");
         console.log("Initiative Tracker unloaded");
     }
 
     async addTrackerView() {
-        if (
-            this.app.workspace.getLeavesOfType(INITIATIVE_TRACKER_VIEW)?.length
-        ) {
-            return;
-        }
-        await this.app.workspace.getRightLeaf(false).setViewState({
-            type: INITIATIVE_TRACKER_VIEW
-        });
+        await this.app.workspace.ensureSideLeaf(
+            INITIATIVE_TRACKER_VIEW,
+            "right",
+            { active: false }
+        );
     }
     get builder() {
         const leaves = this.app.workspace.getLeavesOfType(BUILDER_VIEW);
@@ -721,12 +724,12 @@ export default class InitiativeTracker extends Plugin {
     }
     async openCombatant(creature: Creature) {
         if (!this.canUseStatBlocks) return;
-        const view = this.combatant;
-        if (!view) {
-            const leaf = this.app.workspace.getRightLeaf(true);
-            await leaf.setViewState({
-                type: CREATURE_TRACKER_VIEW
-            });
+        if (!this.combatant) {
+            await this.app.workspace.ensureSideLeaf(
+                CREATURE_TRACKER_VIEW,
+                "right",
+                { active: true }
+            );
         }
 
         await this.combatant.render(creature);

src/main.ts

@@ -25,4 +25,7 @@ export default class PlayerView extends ItemView {
             props: {}
         });
     }
+    async onClose() {
+        this._app?.$destroy();
+    }
 }

src/tracker/player-view.ts

@@ -39,6 +39,9 @@ export default class TrackerView extends ItemView {
         });
         this.ui.$on("player-view", () => this.openPlayerView());
     }
+    async onClose() {
+        this.ui?.$destroy();
+    }
     getViewType() {
         return INITIATIVE_TRACKER_VIEW;
     }
@@ -99,7 +102,7 @@ export class CreatureView extends ItemView {
             "a.internal-link",
             debounce(
                 (ev) =>
-                    app.workspace.trigger("hover-link", {
+                    this.app.workspace.trigger("hover-link", {
                         event: ev,
                         source: INITIATIVE_TRACKER_VIEW,
                         hoverParent: this,
@@ -112,7 +115,7 @@ export class CreatureView extends ItemView {
             )
         );
         this.containerEl.on("click", "a.internal-link", (ev) =>
-            app.workspace.openLinkText(
+            this.app.workspace.openLinkText(
                 (ev.target as HTMLAnchorElement).dataset.href,
                 "initiative-tracker"
             )
@@ -182,7 +185,7 @@ export class CreatureView extends ItemView {
         if (file) {
             const fileContent = await this.app.vault.cachedRead(file);
             if (subpath && fileContent) {
-                const cache = app.metadataCache.getFileCache(file);
+                const cache = this.app.metadataCache.getFileCache(file);
                 const subpathResult = resolveSubpath(cache, subpath);
                 if (subpathResult) {
                     content = fileContent.slice(

src/tracker/view.ts

@@ -7,5 +7,6 @@
     "3.2.0": "0.12.10",
     "4.0.1": "0.12.10",
     "7.7.0": "0.15.0",
-    "13.0.19": "1.1.0"
+    "13.0.19": "1.1.0",
+    "13.0.20": "1.7.2"
 }