@netless/window-manager 1.0.7-beta.9 → 1.0.9-beta.0

package/docs/api.md

@@ -67,6 +67,7 @@ parameter
 | prefersColorScheme     | [optional] string                       | light   | auto, light, dark            |
 | debug                  | [optional] boolean                      | false   | print log information   |
 | applianceIcons         | [optional] {ApplianceNames, string}     |         | Configure the teaching aid picture used by the cursor           |
+| useBoxesStatus         | [optional] boolean                      | false   | Whether to use the boxesStatus status management window, after it is enabled, the status of each window can be managed separately               |
 
 
 <h3 id="register">WindowManager. register</h3>
@@ -294,8 +295,8 @@ manager.emitter.on(events, listener)
 | ready                    | undefined      |         | Triggered when all apps are created   |  
 | sceneStateChange         | SceneState     |         | Fired when sceneState is modified     |
 | pageStateChange          | PageState      |         |                            |
-| fullscreenChange          | boolean      |          | Triggered when the full-screen status changes          ｜
-| appsChange                 | string[]    |         | Triggered when the list of opened apps changes       |
+| fullscreenChange         | boolean        |         | Triggered when the full-screen status changes          ｜
+| appsChange               | string[]       |         | Triggered when the list of opened apps changes       |
 
 ```ts
 type LoadAppEvent = {

package/docs/cn/api.md

@@ -66,6 +66,7 @@ const manager = await WindowManager.mount(
 | prefersColorScheme     | [optional] string                       | light   | auto, light, dark            |
 | debug                  | [optional] boolean                      | false   | 打印日志信息   
 | applianceIcons         | [optional] {ApplianceNames, string}     |         | 配置光标使用的教具图片           ｜
+| useBoxesStatus         | [optional] boolean                      | false   | 是否使用 boxesStatus 状态管理窗口, 开启后可以单独管理每个窗口的状态               |
 
 <h3 id="register">WindowManager.register</h3>
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/window-manager",
-  "version": "1.0.7-beta.9",
+  "version": "1.0.9-beta.0",
   "description": "Multi-window mode for Netless Whiteboard",
   "author": "l1shen <lishen1635@gmail.com> (https://github.com/l1shen)",
   "license": "MIT",

package/src/AppListener.ts

@@ -1,9 +1,9 @@
 import { callbacks } from "./callback";
 import { internalEmitter } from "./InternalEmitter";
 import { Events, MagixEventName } from "./constants";
-import { isEqual, omit } from "lodash";
+// import { isEqual, omit } from "lodash";
 import { setViewFocusScenePath } from "./Utils/Common";
-import type { AnimationMode, Camera, Event } from "white-web-sdk";
+import type { Event } from "white-web-sdk";
 import type { AppManager } from "./AppManager";
 import type { TeleBoxState } from "@netless/telebox-insider";
 
@@ -50,14 +50,14 @@ export class AppListeners {
                     this.setMainViewScenePathHandler(data.payload);
                     break;
                 }
-                case Events.MoveCamera: {
-                    this.moveCameraHandler(data.payload);
-                    break;
-                }
-                case Events.MoveCameraToContain: {
-                    this.moveCameraToContainHandler(data.payload);
-                    break;
-                }
+                // case Events.MoveCamera: {
+                //     this.moveCameraHandler(data.payload);
+                //     break;
+                // }
+                // case Events.MoveCameraToContain: {
+                //     this.moveCameraToContainHandler(data.payload);
+                //     break;
+                // }
                 case Events.CursorMove: {
                     this.cursorMoveHandler(data.payload);
                     break;
@@ -102,16 +102,16 @@ export class AppListeners {
         callbacks.emit("mainViewScenePathChange", nextScenePath);
     };
 
-    private moveCameraHandler = (
-        payload: Camera & { animationMode?: AnimationMode | undefined }
-    ) => {
-        if (isEqual(omit(payload, ["animationMode"]), { ...this.manager.mainView.camera })) return;
-        this.manager.mainView.moveCamera(payload);
-    };
+    // private moveCameraHandler = (
+    //     payload: Camera & { animationMode?: AnimationMode | undefined }
+    // ) => {
+    //     if (isEqual(omit(payload, ["animationMode"]), { ...this.manager.mainView.camera })) return;
+    //     this.manager.mainView.moveCamera(payload);
+    // };
 
-    private moveCameraToContainHandler = (payload: any) => {
-        this.manager.mainView.moveCameraToContain(payload);
-    };
+    // private moveCameraToContainHandler = (payload: any) => {
+    //     this.manager.mainView.moveCameraToContain(payload);
+    // };
 
     private cursorMoveHandler = (payload: any) => {
         internalEmitter.emit("cursorMove", payload);

package/src/AppManager.ts

@@ -345,15 +345,12 @@ export class AppManager {
     private async onCreated() {
         if (Object.keys(this.attributes.apps).length && this.store.focus) {
             this._focusAppId = this.store.focus;
-            console.log("onCreated===>", this._focusAppId);
             await new Promise<AppProxy | undefined>(resolve => {
                 this._focusAppCreatedResolve = resolve;
                 this._resolveTimer = setTimeout(() => {
-                    console.log("onCreated===>3333", this._focusAppId);
-                    resolve(this.appProxies.get(this._focusAppId || ''));
+                    resolve(this.appProxies.get(this._focusAppId || ""));
                 }, 500);
             }).then(() => {
-                console.log("onCreated===>2222", this._focusAppId);
                 this.focusByAttributes(this.attributes.apps);
             });
         }
@@ -409,14 +406,16 @@ export class AppManager {
         this.displayer.callbacks.on("onEnableWriteNowChanged", this.displayerWritableListener);
         this._prevFocused = this.attributes.focus;
 
-        this.sideEffectManager.add(() => {
-            const redoUndo = new RedoUndo({
-                mainView: () => this.mainViewProxy.view,
-                focus: () => this.attributes.focus,
-                getAppProxy: id => this.appProxies.get(id),
+        if (!WindowManager.supportAppliancePlugin) {
+            this.sideEffectManager.add(() => {
+                const redoUndo = new RedoUndo({
+                    mainView: () => this.mainViewProxy.view,
+                    focus: () => this.attributes.focus,
+                    getAppProxy: id => this.appProxies.get(id),
+                });
+                return () => redoUndo.destroy();
             });
-            return () => redoUndo.destroy();
-        });
+        }
     }
 
     private onBoxMove = (payload: BoxMovePayload) => {
@@ -604,7 +603,7 @@ export class AppManager {
                         if (!appAttributes) {
                             throw new Error("appAttributes is undefined");
                         }
-                        
+
                         this.appCreateQueue.push<AppProxy>(async () => {
                             this.appStatus.set(id, AppStatus.StartCreate);
                             const appProxy = await this.baseInsertApp(
@@ -624,7 +623,6 @@ export class AppManager {
                                 this._focusAppId === id &&
                                 this._focusAppCreatedResolve
                             ) {
-                                console.log("onCreated===>4444", this._focusAppId);
                                 if (this._resolveTimer) {
                                     clearTimeout(this._resolveTimer);
                                 }

package/src/index.ts

@@ -66,6 +66,7 @@ import type { ExtendPluginInstance } from "./ExtendPluginManager";
 import { ExtendPluginManager } from "./ExtendPluginManager";
 import { getExtendClass } from "./Utils/extendClass";
 import type { ExtendClass } from "./Utils/extendClass";
+// import type { AppliancePluginInstance } from "@netless/appliance-plugin/dist/plugin/types";
 
 export * from "./utils/extendClass";
 
@@ -230,6 +231,8 @@ export class WindowManager
     private _cursorUIDs: string[] = [];
     private _cursorUIDsStyleDOM?: HTMLStyleElement;
 
+    public _appliancePlugin?: any;
+
     private boxManager?: BoxManager;
     private static params?: MountParams;
     static extendClass?: ExtendClass;
@@ -972,7 +975,7 @@ export class WindowManager
         const mainViewCamera = { ...this.mainView.camera };
         if (isEqual({ ...mainViewCamera, ...pureCamera }, mainViewCamera)) return;
         this.mainView.moveCamera(camera);
-        this.appManager?.dispatchInternalEvent(Events.MoveCamera, camera);
+        // this.appManager?.dispatchInternalEvent(Events.MoveCamera, camera);
         setTimeout(() => {
             this.appManager?.mainViewProxy.setCameraAndSize();
         }, 500);
@@ -985,7 +988,7 @@ export class WindowManager
             }>
     ): void {
         this.mainView.moveCameraToContain(rectangle);
-        this.appManager?.dispatchInternalEvent(Events.MoveCameraToContain, rectangle);
+        // this.appManager?.dispatchInternalEvent(Events.MoveCameraToContain, rectangle);
         setTimeout(() => {
             this.appManager?.mainViewProxy.setCameraAndSize();
         }, 500);