Fix UI loading bug on window reload

src/electron/lib/Blix.ts

@@ -24,6 +24,7 @@ export class Blix {
   private _pluginManager!: PluginManager;
   private _mainWindow!: MainWindow;
   private _aiManager!: AiManager;
+  private _isReady = false;
 
   // private startTime: Date;
 
@@ -61,7 +62,7 @@ export class Blix {
     this._projectManager = new ProjectManager(mainWindow);
 
     this.initSubscribers();
-    mainWindow.apis.utilClientApi.onBlixReady();
+    this._isReady = true;
 
     // testStuffies(this);
 
@@ -132,4 +133,8 @@ export class Blix {
   get mainWindow(): MainWindow | null {
     return this._mainWindow;
   }
+
+  get isReady() {
+    return this._isReady;
+  }
 }

src/frontend/lib/api/apiInitializer.ts

@@ -28,7 +28,7 @@ export async function initAPIs() {
  * Bind the main process APIs to the window.
  * If a new main process API is created then add it to this method.
  */
-async function bindMainApis() {
+export async function bindMainApis() {
   return {
     utilApi: await bindMainApi<UtilApi>("UtilApi"),
     projectApi: await bindMainApi<ProjectApi>("ProjectApi"),

src/frontend/lib/api/apis/UtilClientApi.ts

@@ -1,13 +1,20 @@
 import type { ElectronWindowApi } from "electron-affinity/window";
 import { toastStore, type ToastOptions } from "../../stores/ToastStore";
 import { blixStore, setInitialStores } from "../../../lib/stores/BlixStore";
+import { bindMainApis } from "../apiInitializer";
 
 export class UtilClientApi implements ElectronWindowApi<UtilClientApi> {
   showToast(options: Partial<ToastOptions>) {
     toastStore.trigger(options);
   }
 
+  /**
+   * Will be called when Blix first initializes and when window is reloaded.
+   */
   async onBlixReady() {
+    if (!window.apis) {
+      window.apis = await bindMainApis();
+    }
     await setInitialStores();
     blixStore.update((state) => ({ ...state, blixReady: true }));
   }

src/frontend/ui/base/App.svelte

@@ -41,10 +41,6 @@
 <Toasts />
 <ContextMenu />
 
-<!-- <div class="flex h-screen w-screen items-center justify-center bg-zinc-700">
-  <ContextMenu />
-</div> -->
-
 <style lang="postcss" global>
   @tailwind base;
   @tailwind components;

src/index.ts

@@ -39,7 +39,7 @@ protocol.registerSchemesAsPrivileged([
 
 let mainWindow: MainWindow | null = null;
 let notification: Notification | null = null;
-let blix: Blix;
+let blix: Blix | null = null;
 
 /**
  * Will run when Electron has finished initializing. 1. Blix is instantiated
@@ -62,8 +62,11 @@ app.on("ready", async () => {
   exposeMainApis(blix);
 
   createMainWindow().then(async () => {
-    if (mainWindow) {
+    if (mainWindow && blix) {
       await blix.init(mainWindow);
+      if (blix.isReady) {
+        mainWindow.apis.utilClientApi.onBlixReady();
+      }
     } else {
       app.quit();
     }
@@ -107,6 +110,12 @@ async function createMainWindow() {
   mainWindow.on("closed", () => {
     mainWindow = null;
   });
+
+  mainWindow.on("ready-to-show", () => {
+    if (blix?.isReady) {
+      mainWindow?.apis.utilClientApi.onBlixReady();
+    }
+  });
 }
 
 // those two events are completely optional to subscrbe to, but that's a common way to get the