@netless/window-manager 0.3.7 → 0.3.8-canary.0

package/package.json

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

package/src/AppContext.ts

@@ -32,6 +32,7 @@ export class AppContext<TAttrs extends Record<string, any>, AppOptions = any> {
     private boxManager: BoxManager;
     private store = this.manager.store;
     public readonly isAddApp: boolean;
+    public readonly isReplay = this.manager.isReplay;
 
     constructor(
         private manager: AppManager,

package/src/AppManager.ts

@@ -9,7 +9,7 @@ import { genAppId, makeValidScenePath, setScenePath } from "./Utils/Common";
 import { autorun, isPlayer, isRoom, ScenePathType, ViewVisionMode } from "white-web-sdk";
 import { log } from "./Utils/log";
 import { MainViewProxy } from "./MainView";
-import { onObjectInserted, onObjectRemoved } from "./Utils/Reactive";
+import { onObjectRemoved, safeListenPropsUpdated } from "./Utils/Reactive";
 import { ReconnectRefresher } from "./ReconnectRefresher";
 import { ViewManager } from "./ViewManager";
 import type { Displayer, DisplayerState, Room } from "white-web-sdk";
@@ -31,6 +31,7 @@ export class AppManager {
     public store = new AttributesDelegate(this);
     public mainViewProxy: MainViewProxy;
     public refresher?: ReconnectRefresher;
+    public isReplay = this.windowManger.isReplay;
 
     private appListeners: AppListeners;
 
@@ -54,15 +55,17 @@ export class AppManager {
                     appProxy.onSeek(time);
                 });
                 this.attributesUpdateCallback(this.attributes.apps);
+                this.onAppDelete(this.attributes.apps);
             });
         }
     }
 
     private async onCreated() {
         await this.attributesUpdateCallback(this.attributes.apps);
+        this.boxManager.updateManagerRect();
         emitter.onAny(this.boxEventListener);
         this.refresher?.add("apps", () => {
-            return onObjectInserted(this.attributes.apps, () => {
+            return safeListenPropsUpdated(() => this.attributes.apps, () => {
                 this.attributesUpdateCallback(this.attributes.apps);
             });
         });

package/src/Utils/Common.ts

@@ -29,7 +29,7 @@ export const setScenePath = (room: Room | undefined, scenePath: string) => {
 }
 
 export const setViewMode = (view: View, mode: ViewVisionMode) => {
-    if (view.mode !== mode) {
+    if (!(view as any).didRelease && view.mode !== mode) {
         view.mode = mode;
     }
 };

package/src/Utils/Reactive.ts

@@ -1,5 +1,5 @@
 import { listenUpdated, unlistenUpdated, reaction, UpdateEventKind } from "white-web-sdk";
-import type { AkkoObjectUpdatedProperty } from "white-web-sdk";
+import type { AkkoObjectUpdatedProperty , AkkoObjectUpdatedListener } from "white-web-sdk";
 
 // 兼容 13 和 14 版本 SDK
 export const onObjectByEvent = (event: UpdateEventKind) => {
@@ -28,5 +28,30 @@ export const onObjectByEvent = (event: UpdateEventKind) => {
     }
 }
 
+export const safeListenPropsUpdated = <T>(
+    getProps: () => T,
+    callback: AkkoObjectUpdatedListener<T>
+  ) => {
+    let disposeListenUpdated: (() => void) | null = null;
+    const disposeReaction = reaction(
+      getProps,
+      () => {
+        if (disposeListenUpdated) {
+          disposeListenUpdated();
+          disposeListenUpdated = null;
+        }
+        const props = getProps();
+        disposeListenUpdated = () => unlistenUpdated(props, callback);
+        listenUpdated(props, callback);
+      },
+      { fireImmediately: true }
+    );
+
+    return () => {
+      disposeListenUpdated?.();
+      disposeReaction();
+    };
+}
+
 export const onObjectRemoved = onObjectByEvent(UpdateEventKind.Removed);
 export const onObjectInserted = onObjectByEvent(UpdateEventKind.Inserted);

package/src/index.ts

@@ -33,6 +33,7 @@ import {
 import type { Apps } from "./AttributesDelegate";
 import {
     InvisiblePlugin,
+    isPlayer,
     isRoom,
     RoomPhase,
     ViewMode,
@@ -168,7 +169,7 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
     public static containerSizeRatio = DEFAULT_CONTAINER_RATIO;
     private static isCreated = false;
 
-    public version = "0.3.7";
+    public version = "0.3.8-canary.0";
 
     public appListeners?: AppListeners;
 
@@ -177,7 +178,8 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
     public appManager?: AppManager;
     public cursorManager?: CursorManager;
     public viewMode = ViewMode.Broadcaster;
-    
+    public isReplay = isPlayer(this.displayer);
+
     constructor(context: InvisiblePluginContext) {
         super(context);
     }