@netless/window-manager 0.3.24 → 0.3.27

package/docs/0.3.x-clean-all-scenes.md

@@ -0,0 +1,19 @@
+## 清除所有笔迹
+
+```ts
+// 删除根目录所有 scenes
+room.removeScenes("/")
+
+// 关闭所有 App
+manager.queryAll().map(app => manager.closeApp(app.id))
+
+// 清除掉之前的 index 信息
+manager.safeSetAttributes({ _mainSceneIndex: undefined, _mainScenePath: undefined });
+
+// 如果当前主白板 index 在第一页则切换一下 index 才可以让第一页恢复可写
+setTimeout(async () => {
+    room.putScenes("/", [{}]);
+    await manager.setMainViewSceneIndex(1);
+    await manager.setMainViewSceneIndex(0);
+}, 50);
+```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/window-manager",
-  "version": "0.3.24",
+  "version": "0.3.27",
   "description": "",
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",
@@ -8,6 +8,7 @@
   "scripts": {
     "prettier": "prettier --write .",
     "build": "vite build && yarn type-gen",
+    "build:dev": "vite build --mode development && yarn type-gen",
     "type-gen": "tsc --emitDeclarationOnly",
     "predev": "yarn type-gen",
     "build:lib:types": "tsc --emitDeclarationOnly",
@@ -29,6 +30,9 @@
     "video.js": ">=7"
   },
   "devDependencies": {
+    "@netless/app-docs-viewer": "0.2.5",
+    "@netless/app-media-player": "0.1.0-beta.5",
+    "@netless/telebox-insider": "0.2.21",
     "@rollup/plugin-commonjs": "^20.0.0",
     "@rollup/plugin-node-resolve": "^13.0.4",
     "@rollup/plugin-url": "^6.1.0",
@@ -53,9 +57,6 @@
     "typescript": "^4.3.5",
     "video.js": "^7.14.3",
     "vite": "^2.5.3",
-    "white-web-sdk": "^2.15.16",
-    "@netless/telebox-insider": "0.2.21",
-    "@netless/app-docs-viewer": "0.2.5",
-    "@netless/app-media-player": "0.1.0-beta.5"
+    "white-web-sdk": "^2.15.16"
   }
 }

package/src/AppManager.ts

@@ -70,6 +70,11 @@ export class AppManager {
                 this.onAppDelete(this.attributes.apps);
             });
         }
+        emitter.on("setReadonly", () => {
+            this.appProxies.forEach(appProxy => {
+                appProxy.emitAppIsWritableChange();
+            });
+        });
     }
 
     private async onCreated() {

package/src/AppProxy.ts

@@ -175,6 +175,9 @@ export class AppProxy {
                 canOperate: this.manager.canOperate,
                 smartPosition: this.isAddApp,
             });
+            if (this.isAddApp && this.box) {
+                this.store.updateAppState(appId, AppAttributes.ZIndex, this.box.zIndex);
+            }
         } catch (error: any) {
             console.error(error);
             throw new Error(`[WindowManager]: app setup error: ${error.message}`);

package/src/BoxManager.ts

@@ -1,11 +1,7 @@
-import { callbacks, emitter, WindowManager } from "./index";
-import { debounce, maxBy } from "lodash";
 import { AppAttributes, Events, MIN_HEIGHT, MIN_WIDTH } from "./constants";
-import {
-    TELE_BOX_STATE,
-    TeleBoxCollector,
-    TeleBoxManager,
-} from "@netless/telebox-insider";
+import { callbacks, emitter, WindowManager } from "./index";
+import { debounce } from "lodash";
+import { TELE_BOX_STATE, TeleBoxCollector, TeleBoxManager } from "@netless/telebox-insider";
 import type { AddAppOptions, AppInitState } from "./index";
 import type {
     TeleBoxManagerUpdateConfig,
@@ -233,8 +229,7 @@ export class BoxManager {
     }
 
     public getTopBox(): ReadonlyTeleBox | undefined {
-        const boxes = this.teleBoxManager.query();
-        return maxBy(boxes, "zIndex");
+        return this.teleBoxManager.topBox;
     }
 
     public updateBoxState(state?: AppInitState): void {

package/src/index.ts

@@ -141,6 +141,7 @@ export type EmitterEvent = {
     playgroundSizeChange: DOMRect;
     onReconnected: undefined;
     cursorMove: CursorMovePayload;
+    setReadonly: boolean;
 };
 
 export const emitter: Emittery<EmitterEvent> = new Emittery();
@@ -401,6 +402,9 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
                 params.options.scenePath = ensureValidScenePath(params.options.scenePath);
             }
             const appId = await this.appManager.addApp(params, Boolean(isDynamicPPT));
+            // 瞬间调用多个 addApp 可能会造成 view 的状态设置错误, 这里手动加一个延迟
+            // 在 0.4.x 的版本已经重构了这个行为, 这里只是 workaround
+            await wait(200);
             return appId;
         } else {
             throw new AppManagerNotInitError();
@@ -479,10 +483,9 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
      * 设置所有 app 的 readonly 模式
      */
     public setReadonly(readonly: boolean): void {
-        if (this.room?.isWritable) {
-            this.readonly = readonly;
-            this.appManager?.boxManager.setReadonly(readonly);
-        }
+        this.readonly = readonly;
+        this.appManager?.boxManager.setReadonly(readonly);
+        emitter.emit("setReadonly", readonly);
     }
 
     /**