Added get/setParent to ContainerWindow (#308)

packages/desktopjs-electron/src/electron.ts

@@ -126,6 +126,17 @@ export class ElectronContainerWindow extends ContainerWindow {
         return Promise.resolve();
     }
 
+    public getParent(): Promise<ContainerWindow> {
+        return Promise.resolve(this.innerWindow.getParentWindow());
+    }
+
+    public setParent(parent: ContainerWindow): Promise<void> {
+        return new Promise<void>((resolve, reject) => {
+            this.innerWindow.setParentWindow(parent.innerWindow);
+            resolve();
+        });
+    }
+
     public getBounds(): Promise<Rectangle> {
         return new Promise<Rectangle>(resolve => {
             const { x, y, width, height } = this.innerWindow.getBounds();

packages/desktopjs-electron/tests/electron.spec.ts

@@ -49,6 +49,7 @@ class MockWindow extends MockEventEmitter {
     }
 
     public getParentWindow(): any { return undefined; }
+    public setParentWindow(parent: any) { }
 
     public getAllWindows(): any { return [new MockWindow(), new MockWindow("target")]; }
 
@@ -283,6 +284,23 @@ describe("ElectronContainerWindow", () => {
             });
         });
 
+        it("getParent calls underlying getParentWindow", (done) => {
+            spyOn(win.innerWindow, "getParentWindow");
+            win.getParent().then(() => {
+                expect(win.innerWindow.getParentWindow).toHaveBeenCalled();
+                done();
+            });
+        });
+
+        it("setParent calls underlying setParentWindow", (done) => {
+            const mockParent = { innerWindow: new MockWindow() };
+            spyOn(win.innerWindow, "setParentWindow");
+            win.setParent(<any>mockParent).then(() => {
+                expect(win.innerWindow.setParentWindow).toHaveBeenCalledWith(mockParent.innerWindow);
+                done();
+            });
+        });
+
         it ("getOptions sends synchronous ipc message", (done) => {
             spyOn(container.internalIpc, "sendSync").and.returnValue({ foo: "bar"});
             spyOnProperty(win, "id", "get").and.returnValue(5);

packages/desktopjs-openfin/src/openfin.ts

@@ -122,6 +122,16 @@ export class OpenFinContainerWindow extends ContainerWindow {
         });
     }
 
+    public getParent(): Promise<ContainerWindow> {
+        return Promise.resolve(null);
+    }
+
+    public setParent(parent: ContainerWindow): Promise<void> {
+        return new Promise<void>((resolve, reject) => {
+            resolve();
+        });
+    }
+
     public setBounds(bounds: Rectangle): Promise<void> {
         return new Promise<void>((resolve, reject) => {
             this.innerWindow.setBounds(bounds.x, bounds.y, bounds.width, bounds.height, resolve, reject);

packages/desktopjs-openfin/tests/openfin.spec.ts

@@ -369,6 +369,14 @@ describe("OpenFinContainerWindow", () => {
             });
         });
 
+        it("getParent does not throw", (done) => {
+            expect(() => win.getParent().then(done)).not.toThrow();
+        });
+
+        it("setParent does not throw", (done) => {
+            expect(() => win.setParent(null).then(done)).not.toThrow();
+        });
+
         describe("getOptions", () => {
             it("getOptions invokes underlying getOptions and returns undefined customData", (done) => {
                 spyOn(win.innerWindow, "getOptions").and.callFake(callback => callback({ }));

packages/desktopjs/src/Default/default.ts

@@ -93,6 +93,15 @@ export namespace Default {
             return Promise.reject("Not supported");
         }
 
+        public getParent(): Promise<ContainerWindow> {
+            // on the web, there's no parent
+            return Promise.resolve(null);
+        }
+
+        public setParent(parent: ContainerWindow): Promise<void> {
+            return Promise.resolve();
+        }
+
         public getBounds(): Promise<Rectangle> {
             return new Promise<Rectangle>(resolve => {
                 resolve(new Rectangle(this.innerWindow.screenX, this.innerWindow.screenY, this.innerWindow.outerWidth, this.innerWindow.outerHeight));

packages/desktopjs/src/window.ts

@@ -128,6 +128,12 @@ export abstract class ContainerWindow extends EventEmitter {
 
     public abstract flash(enable: boolean, options?: any): Promise<void>;
 
+    /** Returns the parent window of this window. */
+    public abstract getParent(): Promise<ContainerWindow>;
+
+    /** Sets the parent window of this window. */
+    public abstract setParent(parent: ContainerWindow): Promise<void>;
+
     /** Set the current bounds of the window.
      * @param {Rectangle} bounds
      */

packages/desktopjs/tests/unit/Default/default.spec.ts

@@ -93,7 +93,7 @@ describe("DefaultContainerWindow", () => {
                 expect(state).toEqual(mockState);
             }).then(done);
         });
-    });        
+    });
 
     xdescribe("setState", () => {
         it("setState undefined", (done) => {
@@ -184,13 +184,21 @@ describe("DefaultContainerWindow", () => {
         });
     });
 
+    it("getParent throws no errors", (done) => {
+        expect(() => win.getParent().then(done)).not.toThrow();
+    });
+
+    it("setParent throws no errors", (done) => {
+        expect(() => win.setParent(null).then(done)).not.toThrow();
+    });
+
     it("getOptions", async (done) => {
         const win = await new Default.DefaultContainer(<any>new MockWindow()).createWindow("url", { a: "foo" });
         win.getOptions().then(options => {
             expect(options).toBeDefined();
             expect(options).toEqual({ a: "foo"});
         }).then(done);
-    });    
+    });
 
     describe("addListener", () => {
         it("addListener calls underlying window addEventListener with mapped event name", () => {