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

package/docs/advanced.md

@@ -122,7 +122,16 @@ if (manager.boxState === "maximized") {
     const app = manager.queryOne(manager.focused)
     // 有 view 的 app 才可以插入图片, 像是 视频，音频之类的 app 是没有 view 的
     if (app.view) {
-        app.view.insertImage()
+        var imageInformation = {
+            uuid: uuid,
+            centerX: centerX,
+            centerY: centerY,
+            width: width,
+            height: height,
+            locked: false,
+        };
+        app.view.insertImage(imageInformation);
+        app.view.completeImageUpload(uuid, src);
     }
 }
 ```

package/docs/api.md

@@ -27,6 +27,7 @@
     - [`nextPage`](#nextPage)
     - [`prevPage`](#prevPage)
     - [`addPage`](#addPage)
+    - [`removePage`](#removePage)
     - [`refresh`](#refresh)
     - [`setContainerSizeRatio`](#setContainerSizeRatio)
   - [实例属性](#prototypes)
@@ -217,9 +218,11 @@ manager.addPage({ scene: { name: "page2" } }) // 传入 page 信息
 <h3 id="removePage">removePage</h3>
 
 > 移除一页
+> 当只剩一页时, 最后一页不允许被删除
 
 ```ts
-const success = await manager.removePage(1)
+const success = await manager.removePage() // 默认删除当前页
+const success = await manager.removePage(1) // 可以删除指定 index
 ```
 
 <h3 id="refresh">refresh</h3>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/window-manager",
-  "version": "0.4.27-canary.0",
+  "version": "0.4.29",
   "description": "",
   "main": "dist/index.cjs.js",
   "module": "dist/index.es.js",

package/src/App/AppContext.ts

@@ -231,13 +231,17 @@ export class AppContext<TAttributes = any, TMagixEventPayloads = any, TAppOption
         }
     };
 
-    public removePage = async (index: number): Promise<boolean> => {
-        if (index < 0 || index >= this.pageState.length) {
+    public removePage = async (index?: number): Promise<boolean> => {
+        const needRemoveIndex = index === undefined ? 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);;
     }
 
     public get pageState(): PageState {

package/src/App/AppProxy.ts

@@ -27,7 +27,8 @@ import type { SceneState, View, SceneDefinition } from "white-web-sdk";
 import type { AppManager } from "../AppManager";
 import type { NetlessApp } from "../typings";
 import type { ReadonlyTeleBox } from "@netless/telebox-insider";
-import { calculateNextIndex, PageRemoveService, PageState } from "../Page";
+import type { PageRemoveService, PageState } from "../Page";
+import { calculateNextIndex } from "../Page";
 
 export type AppEmitter = Emittery<AppEmitterEvent>;
 
@@ -415,10 +416,6 @@ export class AppProxy implements PageRemoveService {
     public async removeSceneByIndex(index: number) {
         const scenePath = this._pageState.getFullPath(index);
         if (scenePath) {
-            // 不能删除所有场景
-            if (this.pageState.length <= 1) {
-                return false;
-            }
             const nextIndex = calculateNextIndex(index, this.pageState);
             // 只修改 focus path 不修改 FullPath
             this.setSceneIndexWithoutSync(nextIndex);

package/src/AppManager.ts

@@ -6,7 +6,7 @@ import { appRegister } from "./Register";
 import { autorun, isPlayer, isRoom, ScenePathType } from "white-web-sdk";
 import { callbacks } from "./callback";
 import { debounce, get, isInteger, orderBy } from "lodash";
-import { emitter, RemoveSceneParams } from "./InternalEmitter";
+import { emitter } from "./InternalEmitter";
 import { Fields, store } from "./AttributesDelegate";
 import { log } from "./Utils/log";
 import { MainViewProxy } from "./View/MainView";
@@ -16,7 +16,7 @@ import { RedoUndo } from "./RedoUndo";
 import { SideEffectManager } from "side-effect-manager";
 import { ViewManager } from "./View/ViewManager";
 import type { SyncRegisterAppPayload } from "./Register";
-import type { EmitterEvent } from "./InternalEmitter";
+import type { EmitterEvent , RemoveSceneParams } from "./InternalEmitter";
 import {
     entireScenes,
     genAppId,

package/src/Page/index.ts

@@ -4,16 +4,15 @@ export * from "./PageController";
 
 export const calculateNextIndex = (index: number, pageState: 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;
 }

package/src/index.ts

@@ -537,13 +537,23 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> imple
         }
     }
 
-    public async removePage(index: number): Promise<boolean> {
+    /**
+     * 删除一页
+     * 默认删除当前页, 可以删除指定 index 页
+     * 最低保留一页
+     */
+    public async removePage(index?: number): Promise<boolean> {
         if (this.appManager) {
-            if (index < 0 || index >= this.pageState.length) {
+            const needRemoveIndex = index === undefined ? 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;
         }