@netless/window-manager 0.4.0-canary.18 → 0.4.0-canary.21

package/package.json

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

package/src/AppManager.ts

@@ -511,6 +511,7 @@ export class AppManager {
         const reconnected = appProxies.map(appProxy => {
             return appProxy.onReconnected();
         });
+        this.mainViewProxy.onReconnect();
         await Promise.all(reconnected);
     }
 

package/src/AppProxy.ts

@@ -187,6 +187,8 @@ export class AppProxy {
             });
             if (this.isAddApp && this.box) {
                 this.store.updateAppState(appId, AppAttributes.ZIndex, this.box.zIndex);
+                this.store.setAppFocus(appId, true);
+                this.focusBox();
             }
         } catch (error: any) {
             console.error(error);

package/src/Cursor/index.ts

@@ -1,4 +1,4 @@
-import { compact, throttle, uniq } from "lodash";
+import { throttle } from "lodash";
 import { Cursor } from "./Cursor";
 import { CursorState, Events } from "../constants";
 import { emitter, WindowManager } from "../index";
@@ -45,6 +45,12 @@ export class CursorManager {
                 cursorInstance.move(payload.position);
             }
         });
+        this.sideEffectManager.add(() => {
+            const unsubscribe = emitter.on("playgroundSizeChange", () => {
+                this.updateContainerRect();
+            });
+            return unsubscribe;
+        })
     }
 
     public setupWrapper(wrapper: HTMLElement) {
@@ -66,10 +72,6 @@ export class CursorManager {
         this.mainViewElement = div;
     }
 
-    private getUids = (members: readonly RoomMember[] | undefined) => {
-        return compact(uniq(members?.map(member => member.payload?.uid)));
-    };
-
     public get boxState() {
         return this.store.getBoxState();
     }

package/src/View/MainView.ts

@@ -13,7 +13,6 @@ export class MainViewProxy {
     private started = false;
     private mainViewIsAddListener = false;
     private mainView: View;
-    private viewId = "mainView";
     private store = this.manager.store;
 
     private sideEffectManager = new SideEffectManager();
@@ -104,6 +103,13 @@ export class MainViewProxy {
         return mainView;
     }
 
+    public onReconnect(): void {
+        const mainViewScenePath = this.store.getMainViewScenePath();
+        if (mainViewScenePath) {
+            setViewFocusScenePath(this.view, mainViewScenePath);
+        }
+    }
+
     private onCameraUpdatedByDevice = (camera: Camera) => {
         this.store.setMainViewCamera({ ...camera, id: this.manager.uid });
         if (!isEqual(this.mainViewSize, { ...this.mainView.size, id: this.manager.uid })) {