FIX: Fixed that an open tab caused the plugin to crash

Author: KyleKlus

src/ui/obsidian-ui-components/item-views/sr-tab-view.tsx

@@ -27,19 +27,24 @@ export class SRTabView extends ItemView {
     private reviewQueueLoader: ReviewQueueLoader | null = null;
     private contentManager: ContentManager | null = null;
 
-    private plugin: SRPlugin;
+    private plugin: SRPlugin | null = null;
     private viewContainerEl: HTMLElement | null = null;
     private viewContentEl: HTMLElement | null = null;
-    private settings: SRSettings;
+    private settings: SRSettings | null = null;
 
     constructor(
         leaf: WorkspaceLeaf,
         plugin: SRPlugin,
         reviewQueueLoader: ReviewQueueLoader | null,
     ) {
         super(leaf);
-        if (plugin.dataManager === null || plugin.dataManager.data === null)
-            throw new Error("SR plugin or data not initialized!!!");
+
+        if (!plugin.isDataManagerLoaded()) {
+            this.leaf.detach();
+            return;
+        }
+
+        // throw new Error("SR plugin or data not initialized!!!");
         // Init properties
         this.plugin = plugin;
         this.navigation = false;
@@ -132,6 +137,11 @@ export class SRTabView extends ItemView {
             );
         }
 
+        if (this.settings === null || this.plugin === null) {
+            this.leaf.detach();
+            return;
+        }
+
         this.contentManager = new ContentManager(
             this.app,
             this.plugin,

src/ui/tab-view-manager.tsx

@@ -31,11 +31,9 @@ export default class TabViewManager {
         },
     ];
 
-    // Add any needed resourced
+    // Add any needed resource
     constructor(plugin: SRPlugin) {
         this.plugin = plugin;
-
-        this.registerAllTabViews();
     }
 
     /**

src/ui/ui-manager.tsx

@@ -61,9 +61,8 @@ export class UIManager {
     constructor(plugin: SRPlugin) {
         this.plugin = plugin;
         appIcon();
-
-        // Closes all still open tab views when the plugin is loaded, because it causes bugs / empty windows otherwise
         this.tabViewManager = new TabViewManager(this.plugin);
+        this.tabViewManager.registerAllTabViews();
 
         this.sidebarManager = new SidebarManager(this.plugin);
 
@@ -78,6 +77,7 @@ export class UIManager {
     }
 
     public async onLayoutReady() {
+        // Closes all still open tab views when the plugin is loaded, because it causes bugs / empty windows otherwise
         this.tabViewManager.closeAllTabViews();
         await this.sidebarManager.activateReviewQueueViewPanel();
         await this.plugin.dataManager.sync();
@@ -110,14 +110,17 @@ export class UIManager {
         );
 
         if (settings.showStatusBar) {
-            this.statusBarManager.setCount(
-                this.plugin.dataManager.osrCore.remainingDeckTree.getRepItemCount(
-                    RepItemState.AnyItem,
-                    true,
-                ),
-                settings.showStatusBar && settings.showCardStatusBarItem,
-                "card-review",
-            );
+            if (this.plugin.dataManager.osrCore.remainingDeckTree !== null) {
+                this.statusBarManager.setCount(
+                    this.plugin.dataManager.osrCore.remainingDeckTree.getRepItemCount(
+                        RepItemState.AnyItem,
+                        true,
+                    ),
+                    settings.showStatusBar && settings.showCardStatusBarItem,
+                    "card-review",
+                );
+            }
+
             this.statusBarManager.setCount(
                 this.plugin.dataManager.osrCore.noteReviewQueue.dueNotesCount,
                 settings.showStatusBar && settings.showNoteStatusBarItem,
@@ -169,8 +172,8 @@ export class UIManager {
             // Only set focus if it was already in focus, as that is the only case where the tab would be covered by the modal
             this.setSRViewInFocus(
                 (modal === null || modal === undefined) &&
-                this.plugin.app.workspace.getActiveViewOfType(SRTabView) !== null &&
-                this.plugin.app.workspace.getActiveViewOfType(SRTabView) !== undefined,
+                    this.plugin.app.workspace.getActiveViewOfType(SRTabView) !== null &&
+                    this.plugin.app.workspace.getActiveViewOfType(SRTabView) !== undefined,
             );
         }
     }
@@ -241,13 +244,7 @@ export class UIManager {
             };
             const currentWindow = remoteModule?.getCurrentWindow?.();
             if (currentWindow !== null && currentWindow !== undefined) {
-                return currentWindow as {
-                    isMinimized?: () => boolean;
-                    restore?: () => void;
-                    show?: () => void;
-                    focus?: () => void;
-                    moveTop?: () => void;
-                };
+                return currentWindow;
             }
         } catch {
             // ignore
@@ -259,13 +256,7 @@ export class UIManager {
             };
             const currentWindow = electronModule?.remote?.getCurrentWindow?.();
             if (currentWindow !== null && currentWindow !== undefined) {
-                return currentWindow as {
-                    isMinimized?: () => boolean;
-                    restore?: () => void;
-                    show?: () => void;
-                    focus?: () => void;
-                    moveTop?: () => void;
-                };
+                return currentWindow;
             }
         } catch {
             // ignore
@@ -310,9 +301,9 @@ export class UIManager {
 
         const windowObject = activeDocument.defaultView as
             | (Window & {
-                AudioContext?: typeof AudioContext;
-                webkitAudioContext?: typeof AudioContext;
-            })
+                  AudioContext?: typeof AudioContext;
+                  webkitAudioContext?: typeof AudioContext;
+              })
             | null;
         const AudioContextCtor =
             windowObject?.AudioContext ?? windowObject?.webkitAudioContext ?? null;
@@ -369,10 +360,10 @@ export class UIManager {
         type ElectronApp = { dock?: DockApi };
         const requireFn = (
             activeDocument.defaultView as
-            | (Window & {
-                require?: (moduleName: string) => unknown;
-            })
-            | null
+                | (Window & {
+                      require?: (moduleName: string) => unknown;
+                  })
+                | null
         )?.require;
         if (requireFn === undefined) {
             return;