@netless/window-manager 0.3.0-canary.0 → 0.3.0

package/src/Cursor/index.ts

@@ -22,7 +22,6 @@ export type MoveCursorParams = {
 export class CursorManager extends Base {
     public containerRect?: DOMRect;
     public wrapperRect?: DOMRect;
-    private disposer: any;
     public cursorInstances: Map<string, Cursor> = new Map();
     public roomMembers?: readonly RoomMember[];
     private mainViewElement?: HTMLDivElement;
@@ -48,20 +47,25 @@ export class CursorManager extends Base {
     }
 
     private startReaction(wrapper: HTMLElement) {
-        this.disposer = onObjectInserted(this.cursors, () => {
-            this.handleRoomMembersChange(wrapper);
-        });
+        this.manager.refresher?.add("cursors", () => {
+            return onObjectInserted(this.cursors, () => {
+                this.handleRoomMembersChange(wrapper);
+            });
+        })
     }
 
-    private handleRoomMembersChange(wrapper: HTMLElement) {
+    private handleRoomMembersChange = debounce((wrapper: HTMLElement) => {
         const uids = this.roomMembers?.map(member => member.payload?.uid);
+        const cursors = Object.keys(this.cursors);
         if (uids?.length) {
-            for (const uid in this.cursors) {
+            cursors.map(uid => {
                 if (
                     uids.includes(uid) &&
-                    !this.cursorInstances.has(uid) &&
-                    uid !== this.context.uid
+                    !this.cursorInstances.has(uid)
                 ) {
+                    if (uid === this.context.uid) {
+                        return;
+                    }
                     const component = new Cursor(
                         this.appManager,
                         this.cursors,
@@ -71,9 +75,9 @@ export class CursorManager extends Base {
                     );
                     this.cursorInstances.set(uid, component);
                 }
-            }
+            })
         }
-    }
+    }, 100);
 
     public get cursors() {
         return this.manager.attributes?.[Fields.Cursors];
@@ -221,10 +225,10 @@ export class CursorManager extends Base {
             wrapper.removeEventListener("mouseleave", this.mouseLeaveListener);
             wrapper.removeEventListener("touchend", this.mouseLeaveListener);
         }
-        this.disposer && this.disposer();
         if (this.cursorInstances.size) {
             this.cursorInstances.forEach(cursor => cursor.destroy());
             this.cursorInstances.clear();
         }
+        this.manager.refresher?.remove("cursors");
     }
 }

package/src/Utils/Common.ts

@@ -1,10 +1,10 @@
-import { emitter } from "../index";
+import { appRegister } from '../Register';
+import { debounce } from 'lodash';
+import { emitter } from '../index';
+import { v4 } from 'uuid';
 import type { PublicEvent } from "../index";
-import { v4 } from "uuid";
 import type { Displayer, ViewVisionMode, Room, View } from "white-web-sdk";
-import { debounce } from "lodash";
 import type Emittery from "emittery";
-import { appRegister } from "../Register";
 
 export const genAppId = async (kind: string) => {
     const impl = await appRegister.appClasses.get(kind)?.();

package/src/index.ts

@@ -20,9 +20,9 @@ import { log } from './Utils/log';
 import { replaceRoomFunction } from './Utils/RoomHacker';
 import { ResizeObserver as ResizeObserverPolyfill } from '@juggle/resize-observer';
 import { setupWrapper } from './ViewManager';
-import { TELE_BOX_STATE } from './BoxManager';
 import './style.css';
 import '@netless/telebox-insider/dist/style.css';
+import type { TELE_BOX_STATE } from './BoxManager';
 import {
     AppCreateError,
     AppManagerNotInitError,
@@ -45,7 +45,6 @@ import type {
     Room,
     InvisiblePluginContext,
     Camera,
-
     AnimationMode,
     CameraBound,
     Point,
@@ -61,6 +60,8 @@ const ResizeObserver = window.ResizeObserver || ResizeObserverPolyfill;
 export type WindowMangerAttributes = {
     modelValue?: string;
     boxState: TELE_BOX_STATE;
+    maximized?: boolean;
+    minimized?: boolean;
     [key: string]: any;
 };
 
@@ -169,7 +170,7 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
     public static containerSizeRatio = DEFAULT_CONTAINER_RATIO;
     private static isCreated = false;
 
-    public version = "0.3.0-canary.0";
+    public version = "0.3.0";
 
     public appListeners?: AppListeners;
 
@@ -503,7 +504,7 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
 
     public get boxState(): TeleBoxState {
         if (this.appManager) {
-            return this.appManager.store.getBoxState() || TELE_BOX_STATE.Normal;
+            return this.appManager.boxManager.teleBoxManager.state;
         } else {
             throw new AppManagerNotInitError();
         }