@netless/window-manager 0.4.27-canary.0 → 0.4.29

package/dist/index.d.ts

@@ -144,7 +144,12 @@ export declare class WindowManager extends InvisiblePlugin<WindowMangerAttribute
     nextPage(): Promise<boolean>;
     prevPage(): Promise<boolean>;
     addPage(params?: AddPageParams): Promise<void>;
-    removePage(index: number): Promise<boolean>;
+    /**
+     * 删除一页
+     * 默认删除当前页, 可以删除指定 index 页
+     * 最低保留一页
+     */
+    removePage(index?: number): Promise<boolean>;
     /**
      * 返回 mainView 的 ScenePath
      */

package/dist/index.es.js

@@ -1021,12 +1021,16 @@ class AppContext {
       }
     };
     this.removePage = async (index) => {
-      if (index < 0 || index >= this.pageState.length) {
+      const needRemoveIndex = index === void 0 ? this.pageState.index : index;
+      if (this.pageState.length === 1) {
+        console.warn(`[WindowManager]: can not remove the last page`);
+        return false;
+      }
+      if (needRemoveIndex < 0 || needRemoveIndex >= this.pageState.length) {
         console.warn(`[WindowManager]: page index ${index} out of range`);
         return false;
       }
-      this.appProxy.removeSceneByIndex(index);
-      return true;
+      return this.appProxy.removeSceneByIndex(needRemoveIndex);
     };
     this.emitter = appProxy.appEmitter;
     this.isAddApp = appProxy.isAddApp;
@@ -1254,16 +1258,15 @@ const log = (...args) => {
 };
 const calculateNextIndex = (index, pageState) => {
   let nextIndex = 0;
-  if (index === 0) {
-    return index + 1;
-  }
-  if (pageState.index !== 0 && index !== 0) {
-    const maxIndex = pageState.length - 1;
+  const maxIndex = pageState.length - 1;
+  if (index === pageState.index) {
     if (index === maxIndex) {
-      nextIndex = maxIndex - 1;
-    } else if (index > 0 && index < maxIndex) {
-      nextIndex = index + 1;
+      nextIndex = index - 1;
+    } else {
+      nextIndex = pageState.index + 1;
     }
+  } else {
+    nextIndex = pageState.index;
   }
   return nextIndex;
 };
@@ -1604,9 +1607,6 @@ class AppProxy {
   async removeSceneByIndex(index) {
     const scenePath = this._pageState.getFullPath(index);
     if (scenePath) {
-      if (this.pageState.length <= 1) {
-        return false;
-      }
       const nextIndex = calculateNextIndex(index, this.pageState);
       this.setSceneIndexWithoutSync(nextIndex);
       this.manager.dispatchInternalEvent(Events.SetAppFocusIndex, {
@@ -15048,7 +15048,7 @@ const reconnectRefresher = new ReconnectRefresher({ emitter });
 const _WindowManager = class extends InvisiblePlugin {
   constructor(context) {
     super(context);
-    this.version = "0.4.27-canary.0";
+    this.version = "0.4.29";
     this.dependencies = { "dependencies": { "@juggle/resize-observer": "^3.3.1", "@netless/telebox-insider": "0.2.26", "emittery": "^0.9.2", "lodash": "^4.17.21", "p-retry": "^4.6.1", "side-effect-manager": "^0.1.5", "uuid": "^7.0.3", "video.js": ">=7" }, "peerDependencies": { "white-web-sdk": "^2.16.0" }, "devDependencies": { "@netless/app-docs-viewer": "^0.2.9", "@netless/app-media-player": "0.1.0-beta.5", "@rollup/plugin-commonjs": "^20.0.0", "@rollup/plugin-node-resolve": "^13.0.4", "@rollup/plugin-url": "^6.1.0", "@sveltejs/vite-plugin-svelte": "^1.0.0-next.22", "@tsconfig/svelte": "^2.0.1", "@types/debug": "^4.1.7", "@types/lodash": "^4.14.182", "@types/lodash-es": "^4.17.4", "@types/uuid": "^8.3.1", "@typescript-eslint/eslint-plugin": "^4.30.0", "@typescript-eslint/parser": "^4.30.0", "cypress": "^8.7.0", "dotenv": "^10.0.0", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-svelte3": "^3.2.0", "jsdom": "^19.0.0", "less": "^4.1.1", "prettier": "^2.3.2", "prettier-plugin-svelte": "^2.4.0", "rollup-plugin-analyzer": "^4.0.0", "rollup-plugin-styles": "^3.14.1", "svelte": "^3.42.4", "typescript": "^4.5.5", "vite": "^2.5.3", "vitest": "^0.12.4", "white-web-sdk": "2.16.10" } };
     this.emitter = callbacks$1;
     this.viewMode = ViewMode.Broadcaster;
@@ -15350,11 +15350,16 @@ const _WindowManager = class extends InvisiblePlugin {
   }
   async removePage(index) {
     if (this.appManager) {
-      if (index < 0 || index >= this.pageState.length) {
+      const needRemoveIndex = index === void 0 ? this.pageState.index : index;
+      if (this.pageState.length === 1) {
+        console.warn(`[WindowManager]: can not remove the last page`);
+        return false;
+      }
+      if (needRemoveIndex < 0 || needRemoveIndex >= this.pageState.length) {
         console.warn(`[WindowManager]: index ${index} out of range`);
         return false;
       }
-      return this.appManager.removeSceneByIndex(index);
+      return this.appManager.removeSceneByIndex(needRemoveIndex);
     } else {
       return false;
     }