@interopio/workspaces-api 4.0.1 → 4.1.0-beta.0

package/dist/workspaces.umd.js

@@ -1601,6 +1601,7 @@
 	    maximizeItem: { name: "maximizeItem", argsDecoder: simpleItemConfigDecoder, resultDecoder: voidResultDecoder },
 	    focusItem: { name: "focusItem", argsDecoder: simpleItemConfigDecoder, resultDecoder: voidResultDecoder },
 	    closeItem: { name: "closeItem", argsDecoder: closeItemConfigDecoder, resultDecoder: voidResultDecoder },
+	    closeWorkspace: { name: "closeWorkspace", argsDecoder: closeItemConfigDecoder, resultDecoder: voidResultDecoder },
 	    resizeItem: { name: "resizeItem", argsDecoder: resizeItemConfigDecoder, resultDecoder: voidResultDecoder },
 	    setMaximizationBoundary: { name: "setMaximizationBoundary", argsDecoder: setMaximizationBoundaryConfigDecoder, resultDecoder: voidResultDecoder },
 	    changeFrameState: { name: "changeFrameState", argsDecoder: frameStateConfigDecoder, resultDecoder: voidResultDecoder },
@@ -2781,15 +2782,7 @@
 	    }
 	    async close() {
 	        const controller = getData$3(this).controller;
-	        const workspaces = await getData$3(this).frame.workspaces();
-	        const platformFrameId = (await controller.getPlatformFrameId()).id;
-	        const shouldCloseFrame = workspaces.length === 1 &&
-	            workspaces.every((wsp) => wsp.id === this.id) &&
-	            platformFrameId !== this.frame.id;
-	        if (shouldCloseFrame) {
-	            return this.frame.close();
-	        }
-	        await controller.closeItem(this.id);
+	        await controller.closeWorkspace(this.id, this.frameId);
 	    }
 	    snapshot() {
 	        return getData$3(this).controller.getSnapshot(this.id, "workspace");
@@ -3346,7 +3339,8 @@
 	            throw new Error("Cannot eject this window, because it is not loaded yet");
 	        }
 	        const itemId = getData$2(this).id;
-	        const newWindowId = await getData$2(this).controller.ejectWindow(itemId);
+	        const windowId = getData$2(this).config.windowId;
+	        const newWindowId = await getData$2(this).controller.ejectWindow(itemId, windowId);
 	        getData$2(this).config.windowId = newWindowId;
 	        await this.workspace.refreshReference();
 	        return this.getGdWindow();
@@ -4289,6 +4283,9 @@
 	    async focusItem(itemId) {
 	        await this.bridge.send(OPERATIONS.focusItem.name, { itemId });
 	    }
+	    async closeWorkspace(workspaceId) {
+	        await this.bridge.send(OPERATIONS.closeWorkspace.name, { itemId: workspaceId });
+	    }
 	    async closeItem(itemId) {
 	        await this.bridge.send(OPERATIONS.closeItem.name, { itemId });
 	    }
@@ -4320,8 +4317,8 @@
 	        const controlResult = await this.bridge.send(OPERATIONS.forceLoadWindow.name, { itemId });
 	        return controlResult.windowId;
 	    }
-	    async ejectWindow(itemId) {
-	        return await this.bridge.send(OPERATIONS.ejectWindow.name, { itemId });
+	    async ejectWindow(itemId, windowId) {
+	        return await this.bridge.send(OPERATIONS.ejectWindow.name, { itemId, windowId });
 	    }
 	    async moveWindowTo(itemId, newParentId) {
 	        await this.bridge.send(OPERATIONS.moveWindowTo.name, { itemId, containerId: newParentId });
@@ -4603,6 +4600,11 @@
 	        }));
 	        return workspacesForFrame;
 	    }
+	    async isLastWorkspaceInFrame(workspaceId, frameId) {
+	        const workspaceSummaries = await this.getAllWorkspaceSummaries();
+	        const summariesForFrame = workspaceSummaries.filter((s) => s.frameId === frameId);
+	        return summariesForFrame.length === 1 && summariesForFrame[0].id === workspaceId;
+	    }
 	    async getAllWorkspaceSummaries() {
 	        const allSummariesResult = await this.bridge.send(OPERATIONS.getAllWorkspacesSummaries.name, {});
 	        return this.base.getAllWorkspaceSummaries(allSummariesResult);
@@ -4704,6 +4706,23 @@
 	        const frameResult = await this.bridge.send(OPERATIONS.getFrameState.name, { itemId: frameId });
 	        return frameResult.state;
 	    }
+	    async closeWorkspace(workspaceId, frameId) {
+	        if (isDesktop()) {
+	            return await this.closeItem(workspaceId);
+	        }
+	        let closeWorkspaceCommandExists = false;
+	        try {
+	            const { isSupported } = await this.base.isOperationSupported(OPERATIONS.closeWorkspace.name);
+	            closeWorkspaceCommandExists = isSupported;
+	        }
+	        catch (error) {
+	            closeWorkspaceCommandExists = false;
+	        }
+	        if (closeWorkspaceCommandExists) {
+	            return await this.base.closeWorkspace(workspaceId);
+	        }
+	        return await this.legacyCloseWorkspace(workspaceId, frameId);
+	    }
 	    async closeItem(itemId) {
 	        return await this.base.closeItem(itemId);
 	    }
@@ -4736,10 +4755,10 @@
 	        await this.base.notifyWindowAdded(windowId);
 	        return windowId;
 	    }
-	    async ejectWindow(itemId) {
-	        const windowId = (await this.base.ejectWindow(itemId)).windowId;
-	        await this.base.notifyWindowAdded(windowId);
-	        return windowId;
+	    async ejectWindow(itemId, windowId) {
+	        const id = (await this.base.ejectWindow(itemId, windowId)).windowId;
+	        await this.base.notifyWindowAdded(id);
+	        return id;
 	    }
 	    async moveWindowTo(itemId, newParentId) {
 	        return await this.base.moveWindowTo(itemId, newParentId);
@@ -4882,6 +4901,16 @@
 	            callback(wsp, end);
 	        }
 	    }
+	    async legacyCloseWorkspace(workspaceId, frameId) {
+	        const isLastWorkspaceInFrame = await this.isLastWorkspaceInFrame(workspaceId, frameId);
+	        const platformFrameId = (await this.getPlatformFrameId()).id;
+	        const shouldCloseFrame = isLastWorkspaceInFrame &&
+	            platformFrameId !== frameId;
+	        if (shouldCloseFrame) {
+	            return await this.closeFrame(frameId, {});
+	        }
+	        await this.closeItem(workspaceId);
+	    }
 	}
 
 	class ShortcutsController {
@@ -5110,7 +5139,7 @@
 	    }
 	}
 
-	var version = "4.0.1";
+	var version = "4.1.0-beta.0";
 
 	const composeAPI = (glue, ioc) => {
 	    const controller = ioc.controller;