@netless/window-manager 0.4.69 → 0.4.71-beta.0

package/dist/typings.d.ts

@@ -78,3 +78,7 @@ export type { SceneState, SceneDefinition, View, AnimationMode, Displayer, Room,
 export type { Storage, StorageStateChangedEvent, StorageStateChangedListener } from "./App/Storage";
 export * from "./Page";
 export * from "./Utils/error";
+export declare type AppPayload = {
+    appId: string;
+    view: View;
+};

package/package.json

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

package/src/App/AppContext.ts

@@ -29,6 +29,8 @@ import type {
 } from "./MagixEvent";
 import type { AddPageParams, PageController, PageState } from "../Page";
 import { internalEmitter } from "../InternalEmitter";
+import { WindowManager } from "../index";
+import { callbacks } from "../callback";
 
 export class AppContext<TAttributes extends {} = any, TMagixEventPayloads = any, TAppOptions = any>
     implements PageController
@@ -90,6 +92,9 @@ export class AppContext<TAttributes extends {} = any, TMagixEventPayloads = any,
             setTimeout(() => {
                 // 渲染需要时间，延迟 refresh
                 this.getRoom()?.refreshViewSize();
+                if (WindowManager.supportTeachingAidsPlugin) {
+                    callbacks.emit("onAppViewMounted", {appId: this.appId, view});
+                }
             }, 1000);
         }
     };

package/src/App/AppProxy.ts

@@ -30,6 +30,8 @@ import type { ReadonlyTeleBox } from "@netless/telebox-insider";
 import type { PageRemoveService, PageState } from "../Page";
 import { calculateNextIndex } from "../Page";
 import { boxEmitter } from "../BoxEmitter";
+import { WindowManager } from "../index";
+import { callbacks } from "../callback";
 
 export type AppEmitter = Emittery<AppEmitterEvent>;
 
@@ -194,6 +196,9 @@ export class AppProxy implements PageRemoveService {
                     appRegister.notifyApp(this.kind, "created", { appId, result });
                     this.afterSetupApp(boxInitState);
                     this.fixMobileSize();
+                    if (WindowManager.supportTeachingAidsPlugin) {
+                        callbacks.emit("onAppSetup", appId);
+                    }
                 }, SETUP_APP_DELAY);
             });
             this.boxManager?.createBox({
@@ -391,6 +396,9 @@ export class AppProxy implements PageRemoveService {
     private setFocusScenePathHandler = debounce((fullPath: string | undefined) => {
         if (this.view && fullPath && fullPath !== this.view?.focusScenePath) {
             setViewFocusScenePath(this.view, fullPath);
+            if (WindowManager.supportTeachingAidsPlugin) {
+                callbacks.emit("onAppScenePathChange", {appId: this.id, view:this.view});
+            }
         }
     }, 50);
 

package/src/AppManager.ts

@@ -31,13 +31,7 @@ import {
 } from "./Utils/Common";
 import type { ReconnectRefresher } from "./ReconnectRefresher";
 import type { BoxManager } from "./BoxManager";
-import type {
-    Displayer,
-    Room,
-    ScenesCallbacksNode,
-    SceneState,
-    RoomState,
-} from "white-web-sdk";
+import type { Displayer, Room, ScenesCallbacksNode, SceneState, RoomState } from "white-web-sdk";
 import type { AddAppParams, BaseInsertParams, TeleBoxRect } from "./index";
 import type {
     BoxClosePayload,
@@ -47,7 +41,6 @@ import type {
     BoxStateChangePayload,
 } from "./BoxEmitter";
 
-
 export class AppManager {
     public displayer: Displayer;
     public viewManager: ViewManager;
@@ -380,6 +373,9 @@ export class AppManager {
             x: payload.x,
             y: payload.y,
         });
+        if (WindowManager.supportTeachingAidsPlugin) {
+            callbacks.emit("onBoxMove", payload);
+        }
     };
 
     private onBoxResize = (payload: BoxResizePayload) => {
@@ -389,11 +385,18 @@ export class AppManager {
                 width: payload.width,
                 height: payload.height,
             });
+            if (WindowManager.supportTeachingAidsPlugin) {
+                callbacks.emit("onBoxResize", payload);
+            }
         }
     };
 
     private onBoxFocus = (payload: BoxFocusPayload) => {
         this.windowManger.safeSetAttributes({ focus: payload.appId });
+        if (WindowManager.supportTeachingAidsPlugin) {
+            // (WindowManager.externalNotifyManager as any).emit('onBoxFocus', payload)
+            callbacks.emit("onBoxFocus", payload);
+        }
     };
 
     private onBoxClose = (payload: BoxClosePayload) => {
@@ -401,10 +404,16 @@ export class AppManager {
         if (appProxy) {
             appProxy.destroy(false, true, true, payload.error);
         }
+        if (WindowManager.supportTeachingAidsPlugin) {
+            callbacks.emit("onBoxClose", payload);
+        }
     };
 
     private onBoxStateChange = (payload: BoxStateChangePayload) => {
         this.dispatchInternalEvent(Events.AppBoxStateChange, payload);
+        if (WindowManager.supportTeachingAidsPlugin) {
+            callbacks.emit("onBoxStateChange", payload);
+        }
     };
 
     public addAppsChangeListener = () => {
@@ -462,7 +471,10 @@ export class AppManager {
 
     private _appIds: string[] = [];
     public notifyAppsChange(appIds: string[]): void {
-        if (this._appIds.length !== appIds.length || !this._appIds.every(id => appIds.includes(id))) {
+        if (
+            this._appIds.length !== appIds.length ||
+            !this._appIds.every(id => appIds.includes(id))
+        ) {
             this._appIds = appIds;
             callbacks.emit("appsChange", appIds);
         }
@@ -480,12 +492,16 @@ export class AppManager {
             if (appIds.length === 0) {
                 this.appCreateQueue.emitReady();
             }
-            const appsWithCreatedAt = orderBy(appIds.map(appId => {
-                return {
-                    id: appId,
-                    createdAt: apps[appId].createdAt,
-                };
-            }), "createdAt", "asc");
+            const appsWithCreatedAt = orderBy(
+                appIds.map(appId => {
+                    return {
+                        id: appId,
+                        createdAt: apps[appId].createdAt,
+                    };
+                }),
+                "createdAt",
+                "asc"
+            );
             const orderedAppIds = appsWithCreatedAt.map(({ id }) => id);
             this.notifyAppsChange(orderedAppIds);
             for (const id of orderedAppIds) {
@@ -581,6 +597,9 @@ export class AppManager {
             this.setMainViewFocusPath();
         }
         internalEmitter.emit("mainViewMounted");
+        if (WindowManager.supportTeachingAidsPlugin) {
+            callbacks.emit("onMainViewMounted", mainView);
+        }
     }
 
     public setMainViewFocusPath(scenePath?: string) {
@@ -663,16 +682,6 @@ export class AppManager {
     }
 
     private displayerStateListener = (state: Partial<RoomState>) => {
-        const sceneState = state.sceneState;
-        if (sceneState) {
-            const scenePath = sceneState.scenePath;
-            this.appProxies.forEach(appProxy => {
-                if (appProxy.scenePath && scenePath.startsWith(appProxy.scenePath)) {
-                    appProxy.emitAppSceneStateChange(sceneState);
-                    appProxy.setFullPath(scenePath);
-                }
-            });
-        }
         this.appProxies.forEach(appProxy => {
             appProxy.appEmitter.emit("roomStateChange", state);
         });

package/src/Cursor/index.ts

@@ -1,4 +1,4 @@
-import { ApplianceNames } from "white-web-sdk";
+import { ApplianceNames, isRoom } from "white-web-sdk";
 import { Cursor } from "./Cursor";
 import { CursorState, Events } from "../constants";
 import { internalEmitter } from "../InternalEmitter";
@@ -6,7 +6,7 @@ import { SideEffectManager } from "side-effect-manager";
 import { WindowManager } from "../index";
 import type { CursorMovePayload, ApplianceIcons } from "../index";
 import type { PositionType } from "../AttributesDelegate";
-import type { Point, RoomMember, View } from "white-web-sdk";
+import type { Point, Room, RoomMember, View } from "white-web-sdk";
 import type { AppManager } from "../AppManager";
 import { ApplianceMap } from "./icons";
 import { findMemberByUid } from "../Helper";
@@ -31,6 +31,8 @@ export class CursorManager {
     private sideEffectManager = new SideEffectManager();
     private store = this.manager.store;
     public applianceIcons: ApplianceIcons = ApplianceMap;
+    private onceCount = true;
+
 
     constructor(private manager: AppManager, private enableCursor: boolean, applianceIcons?: ApplianceIcons) {
         this.roomMembers = this.manager.room?.state.roomMembers;
@@ -115,14 +117,24 @@ export class CursorManager {
     private mouseMoveListener = (event: PointerEvent) => {
         const isTouch = event.pointerType === "touch";
         if (isTouch && !event.isPrimary) return;
-
         const now = Date.now()
         if (now - this.mouseMoveTimer > 48) {
             this.mouseMoveTimer = now;
+            if (WindowManager.supportTeachingAidsPlugin && isRoom(WindowManager.displayer) && (WindowManager.displayer as Room).disableDeviceInputs) {
+                if(this.onceCount){
+                    this.manager.dispatchInternalEvent(Events.CursorMove, {
+                        uid: this.manager.uid,
+                        state: CursorState.Leave
+                    } as CursorMovePayload);
+                    this.onceCount = false;
+                }
+                return ;
+            }
             this.mouseMoveListener_(event, isTouch);
+            this.onceCount = true;
         }
     }
-
+    
     private mouseLeaveListener = () => {
         this.hideCursor(this.manager.uid);
     }

package/src/callback.ts

@@ -1,8 +1,10 @@
 import Emittery from "emittery";
 import type { TeleBoxColorScheme, TELE_BOX_STATE } from "@netless/telebox-insider";
-import type { CameraState, SceneState, ViewVisionMode } from "white-web-sdk";
+import type { CameraState, SceneState, View, ViewVisionMode } from "white-web-sdk";
 import type { LoadAppEvent } from "./Register";
 import type { PageState } from "./Page";
+import type { BoxClosePayload, BoxFocusPayload, BoxMovePayload, BoxResizePayload, BoxStateChangePayload } from "./BoxEmitter";
+import type { AppPayload } from "./typings";
 
 export type PublicEvent = {
     mainViewModeChange: ViewVisionMode;
@@ -22,6 +24,15 @@ export type PublicEvent = {
     pageStateChange: PageState;
     fullscreenChange: boolean;
     appsChange: string[]; // APP 列表变化时触发
+    onBoxMove: BoxMovePayload;
+    onBoxResize: BoxResizePayload;
+    onBoxFocus: BoxFocusPayload;
+    onBoxClose: BoxClosePayload;
+    onBoxStateChange: BoxStateChangePayload;
+    onMainViewMounted: View;
+    onAppViewMounted: AppPayload;
+    onAppSetup: string;
+    onAppScenePathChange: AppPayload;
 };
 
 export type CallbacksType = Emittery<PublicEvent>;

package/src/index.ts

@@ -143,6 +143,7 @@ export type MountParams = {
     applianceIcons?: ApplianceIcons;
     fullscreen?: boolean;
     polling?: boolean;
+    supportTeachingAidsPlugin?: boolean;
 };
 
 export const reconnectRefresher = new ReconnectRefresher({ emitter: internalEmitter });
@@ -156,6 +157,7 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes, any>
     public static container?: HTMLElement;
     public static debug = false;
     public static containerSizeRatio = DEFAULT_CONTAINER_RATIO;
+    public static supportTeachingAidsPlugin?: boolean;
     private static isCreated = false;
 
     public version = __APP_VERSION__;
@@ -187,6 +189,7 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes, any>
     public static async mount(params: MountParams): Promise<WindowManager> {
         const room = params.room;
         WindowManager.container = params.container;
+        WindowManager.supportTeachingAidsPlugin = params.supportTeachingAidsPlugin;
         const containerSizeRatio = params.containerSizeRatio;
         const debug = params.debug;
 
@@ -367,7 +370,7 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes, any>
         this.appManager?.resetMaximized();
         this.appManager?.resetMinimized();
         this.appManager?.displayerWritableListener(!this.room.isWritable);
-        WindowManager.container = container;
+        WindowManager.container = container;        
     }
 
     public bindCollectorContainer(container: HTMLElement) {

package/src/typings.ts

@@ -88,3 +88,8 @@ export type { SceneState, SceneDefinition, View, AnimationMode, Displayer, Room,
 export type { Storage, StorageStateChangedEvent, StorageStateChangedListener } from "./App/Storage";
 export * from "./Page";
 export * from "./Utils/error";
+
+export type AppPayload = {
+    appId: string,
+    view: View
+}