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

package/changelog.md

@@ -1,3 +1,5 @@
+4.0.2
+fix: Optimized the closing of a workspace
 4.0.0
 feat: io.Connect Browser 4.0
 3.5.7

package/dist/workspaces.es.js

@@ -1595,6 +1595,7 @@ const OPERATIONS = {
     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 },
@@ -2775,15 +2776,7 @@ class Workspace {
     }
     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");
@@ -3340,7 +3333,8 @@ class Window {
             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();
@@ -4283,6 +4277,9 @@ class BaseController {
     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 });
     }
@@ -4314,8 +4311,8 @@ class BaseController {
         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 });
@@ -4597,6 +4594,11 @@ class MainController {
         }));
         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);
@@ -4698,6 +4700,23 @@ class MainController {
         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);
     }
@@ -4730,10 +4749,10 @@ class MainController {
         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);
@@ -4876,6 +4895,16 @@ class MainController {
             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 {
@@ -5104,7 +5133,7 @@ class IoC {
     }
 }
 
-var version = "4.0.1";
+var version = "4.1.0-beta.0";
 
 const composeAPI = (glue, ioc) => {
     const controller = ioc.controller;