@netless/window-manager 0.4.25 → 0.4.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/window-manager",
-  "version": "0.4.25",
+  "version": "0.4.26",
   "description": "",
   "main": "dist/index.cjs.js",
   "module": "dist/index.es.js",

package/src/App/AppProxy.ts

@@ -48,6 +48,7 @@ export class AppProxy {
     private status: "normal" | "destroyed" = "normal";
     private stateKey: string;
     private _pageState: AppPageStateImpl;
+    private _prevFullPath: string | undefined;
 
     public appResult?: NetlessApp<any>;
     public appContext?: AppContext<any, any>;
@@ -348,7 +349,10 @@ export class AppProxy {
             return autorun(() => {
                 const fullPath = this.appAttributes?.fullPath;
                 this.setFocusScenePathHandler(fullPath);
-                this.notifyPageStateChange();
+                if (this._prevFullPath !== fullPath) {
+                    this.notifyPageStateChange();
+                    this._prevFullPath = fullPath;
+                }
             });
         });
     };
@@ -432,6 +436,7 @@ export class AppProxy {
         this.manager.refresher?.remove(this.id);
         this.manager.refresher?.remove(this.stateKey);
         this.manager.refresher?.remove(`${this.id}-fullPath`);
+        this._prevFullPath = undefined;
     }
 
     public close(): Promise<void> {

package/src/InternalEmitter.ts

@@ -16,7 +16,8 @@ export type EmitterEvent = {
     observerIdChange: number;
     boxStateChange: string;
     playgroundSizeChange: DOMRect;
-    onReconnected: void;
+    startReconnect: undefined;
+    onReconnected: undefined;
     removeScenes: string;
     cursorMove: CursorMovePayload;
     updateManagerRect: undefined;

package/src/ReconnectRefresher.ts

@@ -29,6 +29,9 @@ export class ReconnectRefresher {
     }
 
     private onPhaseChanged = (phase: RoomPhase) => {
+        if (phase === RoomPhase.Reconnecting) {
+            this.ctx.emitter.emit("startReconnect");
+        }
         if (phase === RoomPhase.Connected && this.phase === RoomPhase.Reconnecting) {
             this.onReconnected();
         }
@@ -47,7 +50,7 @@ export class ReconnectRefresher {
                 this.disposers.set(id, func());
             }
         });
-        this.ctx.emitter.emit("onReconnected", undefined);
+        this.ctx.emitter.emit("onReconnected");
     }
 
     private releaseDisposers() {

package/src/View/MainView.ts

@@ -1,7 +1,7 @@
 import { AnimationMode, reaction } from "white-web-sdk";
 import { callbacks } from "../callback";
 import { createView } from "./ViewManager";
-import { debounce, isEmpty, isEqual } from "lodash";
+import { debounce, get, isEmpty, isEqual } from "lodash";
 import { emitter } from "../InternalEmitter";
 import { Fields } from "../AttributesDelegate";
 import { setViewFocusScenePath } from "../Utils/Common";
@@ -37,6 +37,11 @@ export class MainViewProxy {
         this.sideEffectManager.add(() => {
             return emitter.on("containerSizeRatioUpdate", this.onUpdateContainerSizeRatio);
         });
+        this.sideEffectManager.add(() => {
+            return emitter.on("startReconnect", () => {
+                this.mainView.release();
+            });
+        });
     }
 
     private startListenWritableChange = () => {
@@ -64,6 +69,10 @@ export class MainViewProxy {
         return this.store.getMainViewSize();
     }
 
+    private get didRelease(): boolean {
+        return get(this.view, ["didRelease"]);
+    }
+
     private moveCameraSizeByAttributes() {
         this.moveCameraToContian(this.mainViewSize);
         this.moveCamera(this.mainViewCamera);
@@ -133,9 +142,13 @@ export class MainViewProxy {
     }
 
     public onReconnect(): void {
-        const mainViewScenePath = this.store.getMainViewScenePath();
-        if (mainViewScenePath) {
-            setViewFocusScenePath(this.view, mainViewScenePath);
+        if (this.didRelease) {
+            this.rebind();
+        } else {
+            const mainViewScenePath = this.store.getMainViewScenePath();
+            if (mainViewScenePath) {
+                setViewFocusScenePath(this.view, mainViewScenePath);
+            }
         }
     }
 
@@ -143,7 +156,9 @@ export class MainViewProxy {
         const divElement = this.mainView.divElement;
         const disableCameraTransform = this.mainView.disableCameraTransform;
         this.stop();
-        this.mainView.release();
+        if (!this.didRelease) {
+            this.mainView.release();
+        }
         this.removeMainViewListener();
         this.mainView = this.createMainView();
         this.mainView.disableCameraTransform = disableCameraTransform;