@netless/window-manager 1.0.4 → 1.0.5-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/window-manager",
-  "version": "1.0.4",
+  "version": "1.0.5-beta.1",
   "description": "Multi-window mode for Netless Whiteboard",
   "author": "l1shen <lishen1635@gmail.com> (https://github.com/l1shen)",
   "license": "MIT",
@@ -32,7 +32,7 @@
   },
   "dependencies": {
     "@juggle/resize-observer": "^3.3.1",
-    "@netless/telebox-insider": "0.2.31",
+    "@netless/telebox-insider": "0.2.32-beta.1",
     "emittery": "^0.9.2",
     "lodash": "^4.17.21",
     "p-retry": "^4.6.1",
@@ -72,6 +72,6 @@
     "typescript": "^4.5.5",
     "vite": "^2.9.9",
     "vitest": "^0.14.1",
-    "white-web-sdk": "2.16.52"
+    "white-web-sdk": "^2.16.52"
   }
 }

package/src/AppManager.ts

@@ -67,6 +67,8 @@ export class AppManager {
     private callbacksNode: ScenesCallbacksNode | null = null;
     private appCreateQueue = new AppCreateQueue();
 
+    private _focusAppCreatedResolve?: (appProxy: AppProxy) => void;
+
     private sideEffectManager = new SideEffectManager();
 
     public sceneState: SceneState | null = null;
@@ -319,7 +321,15 @@ export class AppManager {
     }
 
     private async onCreated() {
+        if (Object.keys(this.attributes.apps).length && this.store.focus) {
+            await new Promise<AppProxy>(resolve => {
+                this._focusAppCreatedResolve = resolve;
+            }).then(() => {
+                this.focusByAttributes(this.attributes.apps);
+            });
+        }
         await this.attributesUpdateCallback(this.attributes.apps);
+        this.focusByAttributes(this.attributes.apps);
         internalEmitter.emit("updateManagerRect");
         boxEmitter.on("move", this.onBoxMove);
         boxEmitter.on("resize", this.onBoxResize);
@@ -512,9 +522,10 @@ export class AppManager {
                         if (!appAttributes) {
                             throw new Error("appAttributes is undefined");
                         }
-                        this.appCreateQueue.push<AppProxy>(() => {
+
+                        this.appCreateQueue.push<AppProxy>(async() => {
                             this.appStatus.set(id, AppStatus.StartCreate);
-                            return this.baseInsertApp(
+                            const appProxy = await this.baseInsertApp(
                                 {
                                     kind: app.kind,
                                     options: app.options,
@@ -523,6 +534,10 @@ export class AppManager {
                                 id,
                                 false
                             );
+                            if (appProxy &&this.store.focus === id && this._focusAppCreatedResolve) {
+                                this._focusAppCreatedResolve(appProxy);
+                            }
+                            return appProxy;
                         });
                         this.focusByAttributes(apps);
                     } catch (error) {
@@ -845,5 +860,6 @@ export class AppManager {
         this.sideEffectManager.flushAll();
         this._prevFocused = undefined;
         this._prevSceneIndex = undefined;
+        this._focusAppCreatedResolve = undefined;
     }
 }