Fire state-changed upon setState of window (#250)

Fixes #248
morganstanley · Jun 4, 2019 · b28ffa7 · b28ffa7
1 parent 755f131
commit b28ffa7
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/packages/desktopjs-electron/src/electron.ts b/packages/desktopjs-electron/src/electron.ts
@@ -203,11 +203,14 @@ export class ElectronContainerWindow extends ContainerWindow {
     }
 
     public setState(state: any): Promise<void> {
-        if (this.innerWindow && this.innerWindow.webContents) {
-            return this.innerWindow.webContents.executeJavaScript(`if (window.setState) { window.setState(JSON.parse(\`${JSON.stringify(state)}\`)); }`);
-        } else {
-            return Promise.resolve();
-        }
+        const promise = (this.innerWindow && this.innerWindow.webContents)
+            ? this.innerWindow.webContents.executeJavaScript(`if (window.setState) { window.setState(JSON.parse(\`${JSON.stringify(state)}\`)); }`)
+            : Promise.resolve();
+
+        return promise.then(() => {
+            this.emit("state-changed", { name: "state-changed", sender: this });
+            ContainerWindow.emit("state-changed", { name: "state-changed", windowId: this.id } );
+        });
     }
 
     protected attachListener(eventName: string, listener: (...args: any[]) => void): void {

diff --git a/packages/desktopjs-openfin/src/openfin.ts b/packages/desktopjs-openfin/src/openfin.ts
@@ -187,6 +187,9 @@ export class OpenFinContainerWindow extends ContainerWindow {
             }
 
             resolve();
+        }).then(() => {
+            this.emit("state-changed", { name: "state-changed", sender: this });
+            ContainerWindow.emit("state-changed", { name: "state-changed", windowId: this.id } );
         });
     }
 

diff --git a/packages/desktopjs/src/Default/default.ts b/packages/desktopjs/src/Default/default.ts
@@ -125,6 +125,9 @@ export namespace Default {
                 }
 
                 resolve();
+            }).then(() => {
+                this.emit("state-changed", { name: "state-changed", sender: this });
+                ContainerWindow.emit("state-changed", { name: "state-changed", windowId: this.id } );
             });
         }
 

diff --git a/packages/desktopjs/src/window.ts b/packages/desktopjs/src/window.ts
@@ -64,7 +64,8 @@ export type WindowEventType =
     "maximize" |
     "minimize" |
     "restore" |
-    "beforeunload";
+    "beforeunload" |
+    "state-changed";
 
 export class WindowEventArgs extends EventArgs {
     public readonly window?: ContainerWindow;