@netless/window-manager 0.3.5-canary.0 → 0.3.6-canary.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/window-manager",
-  "version": "0.3.5-canary.0",
+  "version": "0.3.6-canary.1",
   "description": "",
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",
@@ -24,7 +24,7 @@
     "@juggle/resize-observer": "^3.3.1",
     "@netless/app-docs-viewer": "^0.1.21",
     "@netless/app-media-player": "0.1.0-beta.5",
-    "@netless/telebox-insider": "0.2.5",
+    "@netless/telebox-insider": "0.2.6",
     "emittery": "^0.9.2",
     "lodash": "^4.17.21",
     "p-retry": "^4.6.1",
@@ -56,6 +56,6 @@
     "typescript": "^4.3.5",
     "video.js": "^7.14.3",
     "vite": "^2.5.3",
-    "white-web-sdk": "^2.15.1"
+    "white-web-sdk": "2.15.6"
   }
 }

package/src/AppListener.ts

@@ -1,6 +1,8 @@
-import { Events, MagixEventName } from "./constants";
+import { callbacks } from './index';
+import { Events, MagixEventName } from './constants';
 import type { Event } from "white-web-sdk";
 import type { AppManager } from "./AppManager";
+import type { TeleBoxState } from "@netless/telebox-insider";
 
 export class AppListeners {
     private displayer = this.manager.displayer;
@@ -32,6 +34,10 @@ export class AppListeners {
                     this.switchViewsToFreedomHandler();
                     break;
                 }
+                case Events.AppBoxStateChange: {
+                    this.boxStateChangeHandler(data.payload);
+                    break;
+                }
                 default:
                     break;
             }
@@ -50,4 +56,8 @@ export class AppListeners {
     private switchViewsToFreedomHandler = () => {
         this.manager.viewManager.freedomAllViews();
     };
+
+    private boxStateChangeHandler = (state: TeleBoxState) => {
+        callbacks.emit("boxStateChange", state);
+    }
 }

package/src/AppManager.ts

@@ -2,7 +2,7 @@ import { AppAttributes, AppStatus, Events, MagixEventName } from "./constants";
 import { AppListeners } from "./AppListener";
 import { AppProxy } from "./AppProxy";
 import { AttributesDelegate } from "./AttributesDelegate";
-import { BoxManager, TELE_BOX_STATE } from "./BoxManager";
+import { BoxManager } from "./BoxManager";
 import { callbacks, emitter } from "./index";
 import { CameraStore } from "./Utils/CameraStore";
 import { genAppId, makeValidScenePath, setScenePath } from "./Utils/Common";
@@ -14,7 +14,13 @@ import { ReconnectRefresher } from "./ReconnectRefresher";
 import { ViewManager } from "./ViewManager";
 import type { Displayer, DisplayerState, Room } from "white-web-sdk";
 import type { CreateCollectorConfig } from "./BoxManager";
-import type { AddAppParams, BaseInsertParams, WindowManager, TeleBoxRect } from "./index";
+import type {
+    AddAppParams,
+    BaseInsertParams,
+    WindowManager,
+    TeleBoxRect,
+    EmitterEvent,
+} from "./index";
 export class AppManager {
     public displayer: Displayer;
     public boxManager: BoxManager;
@@ -69,12 +75,6 @@ export class AppManager {
             return autorun(() => {
                 const maximized = this.attributes.maximized;
                 if (this.boxManager.maximized !== maximized) {
-                    if (maximized === true && this.boxManager.minimized === false) {
-                        const topBox = this.boxManager.getTopBox();
-                        if (topBox) {
-                            emitter.emit("focus", { appId: topBox.id });
-                        }
-                    }
                     this.boxManager.setMaximized(Boolean(maximized));
                 }
             });
@@ -83,7 +83,7 @@ export class AppManager {
             return autorun(() => {
                 const minimized = this.attributes.minimized;
                 if (this.boxManager.minimized !== minimized) {
-                    if (minimized === true) {
+                    if (minimized === true && this.store.focus !== undefined) {
                         this.store.cleanFocus();
                         this.boxManager.blurFocusBox();
                     }
@@ -336,7 +336,7 @@ export class AppManager {
         }
     }
 
-    private boxEventListener = (eventName: string | number, payload: any) => {
+    private boxEventListener = (eventName: keyof EmitterEvent, payload: any) => {
         switch (eventName) {
             case "move": {
                 this.dispatchInternalEvent(Events.AppMove, payload);
@@ -367,6 +367,10 @@ export class AppManager {
                 }
                 break;
             }
+            case "boxStateChange": {
+                this.dispatchInternalEvent(Events.AppBoxStateChange, payload);
+                break;
+            }
             default:
                 break;
         }

package/src/Base/Context.ts

@@ -13,7 +13,7 @@ export class Context {
     };
 
     public get uid() {
-        return this.findMember(this.observerId)?.payload?.uid || "";
+        return this.manager.room?.uid || "";
     }
 
     public findMember = (memberId: number) => {

package/src/BoxManager.ts

@@ -63,7 +63,7 @@ export class BoxManager {
         this.teleBoxManager.events.on(TELE_BOX_MANAGER_EVENT.State, state => {
             if (state) {
                 callbacks.emit("boxStateChange", state);
-                emitter.emit(state as TELE_BOX_STATE, undefined);
+                emitter.emit("boxStateChange", state);
             }
         });
         this.teleBoxManager.events.on("minimized", minimized => {

package/src/Cursor/Cursor.ts

@@ -181,6 +181,10 @@ export class Cursor extends Base {
 
     public setMember() {
         this.member = this.context.findMemberByUid(this.memberId);
+        this.updateComponent();
+    }
+
+    private updateComponent() {
         this.component?.$set(omit(this.initProps(), ["x", "y"]));
     }
 

package/src/Cursor/index.ts

@@ -187,7 +187,7 @@ export class CursorManager extends Base {
         }
     }
 
-    public cleanMemberCursor(uid: string) {
+    public deleteCursor(uid: string) {
         this.store.cleanCursor(uid);
         const cursor = this.cursorInstances.get(uid);
         if (cursor) {
@@ -213,11 +213,7 @@ export class CursorManager extends Base {
             }
         });
         needDeleteIds.forEach(uid => {
-            const instance = this.cursorInstances.get(uid);
-            if (instance) {
-                instance.destroy();
-            }
-            this.store.cleanCursor(uid);
+            this.deleteCursor(uid);
         });
     }
 

package/src/constants.ts

@@ -2,9 +2,7 @@ export enum Events {
     AppMove = "AppMove",
     AppFocus = "AppFocus",
     AppResize = "AppResize",
-    AppBlur = "AppBlur",
     AppBoxStateChange = "AppBoxStateChange",
-    AppSnapshot = "AppSnapshot",
     GetAttributes = "GetAttributes",
     UpdateWindowManagerWrapper = "UpdateWindowManagerWrapper",
     InitReplay = "InitReplay",

package/src/index.ts

@@ -120,7 +120,7 @@ export type AppInitState = {
     boxState?: TeleBoxState; // 兼容旧版 telebox
 };
 
-type EmitterEvent = {
+export type EmitterEvent = {
     onCreated: undefined,
     InitReplay: AppInitState,
     move: { appId: string, x: number, y: number },
@@ -131,9 +131,7 @@ type EmitterEvent = {
     seek: number,
     mainViewMounted: undefined,
     observerIdChange: number;
-    [TELE_BOX_STATE.Normal]: undefined,
-    [TELE_BOX_STATE.Maximized]: undefined,
-    [TELE_BOX_STATE.Minimized]: undefined,
+    boxStateChange: string;
 }
 
 export const emitter: Emittery<EmitterEvent> = new Emittery();
@@ -170,7 +168,7 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
     public static containerSizeRatio = DEFAULT_CONTAINER_RATIO;
     private static isCreated = false;
 
-    public version = "0.3.5-canary.0";
+    public version = "0.3.6-canary.1";
 
     public appListeners?: AppListeners;