@netless/window-manager 0.4.0-canary.12 → 0.4.0-canary.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/window-manager",
-  "version": "0.4.0-canary.12",
+  "version": "0.4.0-canary.13",
   "description": "",
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",

package/src/App/MagixEvent/index.ts

@@ -50,13 +50,15 @@ export type MagixEventHandler<
   TEvent extends MagixEventTypes<TPayloads> = MagixEventTypes<TPayloads>
 > = (message: MagixEventMessage<TPayloads, TEvent>) => void;
 
+export type MagixEventListenerDisposer = () => void
+
 export type MagixEventAddListener<TPayloads = any> = <
   TEvent extends MagixEventTypes<TPayloads> = MagixEventTypes<TPayloads>
 >(
   event: TEvent,
   handler: MagixEventHandler<TPayloads, TEvent>,
   options?: MagixEventListenerOptions | undefined
-) => void;
+) => MagixEventListenerDisposer;
 
 export type MagixEventRemoveListener<TPayloads = any> = <
   TEvent extends MagixEventTypes<TPayloads> = MagixEventTypes<TPayloads>

package/src/AppContext.ts

@@ -8,7 +8,7 @@ import {
     toJS
 } from 'white-web-sdk';
 import { BoxNotCreatedError } from './Utils/error';
-import type { Room, SceneDefinition, View } from "white-web-sdk";
+import type { Room, SceneDefinition, View, EventListener as WhiteEventListener } from "white-web-sdk";
 import type { ReadonlyTeleBox } from "@netless/telebox-insider";
 import type Emittery from "emittery";
 import type { BoxManager } from "./BoxManager";
@@ -158,7 +158,10 @@ export class AppContext<TAttributes = any, TMagixEventPayloads = any, TAppOption
     public dispatchMagixEvent: MagixEventDispatcher<TMagixEventPayloads> = (this.manager.displayer as Room).dispatchMagixEvent.bind(this.manager.displayer)
 
     /** Listen to events from others clients (and self messages). */
-    public addMagixEventListener: MagixEventAddListener<TMagixEventPayloads> = this.manager.displayer.addMagixEventListener.bind(this.manager.displayer)
+    public addMagixEventListener: MagixEventAddListener<TMagixEventPayloads> = (event, handler, options) => {
+        this.manager.displayer.addMagixEventListener(event, handler as WhiteEventListener, options);
+        return () => this.manager.displayer.removeMagixEventListener(event, handler as WhiteEventListener);
+    }
 
     /** Remove a Magix event listener. */
     public removeMagixEventListener = this.manager.displayer.removeMagixEventListener.bind(this.manager.displayer) as MagixEventRemoveListener<TMagixEventPayloads>

package/src/AppProxy.ts

@@ -327,7 +327,7 @@ export class AppProxy extends Base {
         });
         this.manager.refresher?.add(`${appId}-fullPath`, () => {
             return autorun(() => {
-                const fullPath = this.appAttributes.fullPath;
+                const fullPath = this.appAttributes?.fullPath;
                 this.setFocusScenePathHandler(fullPath);
             });
         });

package/src/Utils/RoomHacker.ts

@@ -51,6 +51,7 @@ export const replaceRoomFunction = (room: Room, manager: WindowManager) => {
         room.setMemberState = (...args) => manager.mainView.setMemberState(...args);
         room.redo = () => manager.mainView.redo();
         room.undo = () => manager.mainView.undo();
+        room.cleanCurrentScene = () => manager.mainView.cleanCurrentScene();
     }
 
 };