feat: desktop compatibility, beta 1

standardnotes · Feb 3, 2022 · 0f01d29 · 0f01d29
1 parent 333d4c4
commit 0f01d29
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 6 deletions.
diff --git a/app/assets/javascripts/app.tsx b/app/assets/javascripts/app.tsx
@@ -59,12 +59,22 @@ const startApplication: StartApplication = async function startApplication(
     });
   }
 
-  window.addEventListener('DOMContentLoaded', () => {
+  const renderApp = () => {
     render(
       <ApplicationGroupView mainApplicationGroup={mainApplicationGroup} />,
       document.body.appendChild(document.createElement('div'))
     );
-  });
+  };
+
+  const domReady =
+    document.readyState === 'complete' || document.readyState === 'interactive';
+  if (domReady) {
+    renderApp();
+  } else {
+    window.addEventListener('DOMContentLoaded', () => {
+      renderApp();
+    });
+  }
 };
 
 if (IsWebPlatform) {

diff --git a/app/assets/javascripts/services/desktopManager.ts b/app/assets/javascripts/services/desktopManager.ts
@@ -15,12 +15,25 @@ import { WebAppEvent, WebApplication } from '@/ui_models/application';
 import { isDesktopApplication } from '@/utils';
 import { Bridge } from './bridge';
 
+export interface ElectronDesktopCallbacks {
+  desktop_updateAvailable(): void;
+  desktop_windowGainedFocus(): void;
+  desktop_windowLostFocus(): void;
+  desktop_onComponentInstallationComplete(
+    componentData: any,
+    error: any
+  ): Promise<void>;
+  desktop_requestBackupFile(): Promise<string | undefined>;
+  desktop_didBeginBackup(): void;
+  desktop_didFinishBackup(success: boolean): void;
+}
+
 /**
  * An interface used by the Desktop application to interact with SN
  */
 export class DesktopManager
   extends ApplicationService
-  implements DesktopManagerInterface
+  implements DesktopManagerInterface, ElectronDesktopCallbacks
 {
   updateObservers: {
     callback: (component: SNComponent) => void;
@@ -115,6 +128,10 @@ export class DesktopManager
     }
   }
 
+  desktop_updateAvailable(): void {
+    this.webApplication.notifyWebEvent(WebAppEvent.NewUpdateAvailable);
+  }
+
   desktop_windowGainedFocus(): void {
     this.webApplication.notifyWebEvent(WebAppEvent.DesktopWindowGainedFocus);
   }
@@ -152,7 +169,7 @@ export class DesktopManager
     }
   }
 
-  async desktop_requestBackupFile() {
+  async desktop_requestBackupFile(): Promise<string | undefined> {
     const data = await this.application.createBackupFile(
       this.application.hasProtectionSources()
         ? EncryptionIntent.FileEncrypted

diff --git a/app/assets/javascripts/ui_models/application_group.ts b/app/assets/javascripts/ui_models/application_group.ts
@@ -26,7 +26,7 @@ export class ApplicationGroup extends SNApplicationGroup {
     super(new WebDeviceInterface(bridge));
   }
 
-  async initialize(callback?: any): Promise<void> {
+  async initialize(): Promise<void> {
     await super.initialize({
       applicationCreator: this.createApplication,
     });

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "standard-notes-web",
-  "version": "3.9.20",
+  "version": "3.9.30-beta.1",
   "license": "AGPL-3.0-or-later",
   "repository": {
     "type": "git",