@netless/telebox-insider 0.3.0-beta.8 → 0.3.0-beta.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/telebox-insider",
-  "version": "0.3.0-beta.8",
+  "version": "0.3.0-beta.9",
   "private": false,
   "description": "Window widget for Whiteboard",
   "author": "CRIMX <straybugs@gmail.com> (https://github.com/crimx/)",

package/src/TeleBoxManager/index.ts

@@ -396,7 +396,7 @@ export class TeleBoxManager {
                                 const box = this.getBox(targetBox.id);
                                 if (box) {
                                     let isFocusChanged = false;
-                                    if (this.topBox === box) {
+                                    if (box.focus) {
                                         this.blurBox(box);
                                         isFocusChanged = true;
                                     }
@@ -426,7 +426,7 @@ export class TeleBoxManager {
                                 const box = this.getBox(targetBox.id);
                                 if (box) {
                                     let isFocusChanged = false;
-                                    if (this.topBox === box) {
+                                    if (box.focus) {
                                         this.blurBox(box);
                                         isFocusChanged = true;
                                     }
@@ -609,13 +609,13 @@ export class TeleBoxManager {
             }
         });
         this.effectBoxStatusChange();
+        console.log("effectBoxesStatusTimerFunc===>newTopBox", newTopBox, curTopBox);
         if (newTopBox && curTopBox !== newTopBox) {
             this.topBox$.setValue(newTopBox);
-            this.focusBox(newTopBox, skipUpdate);
         }
         if (!newTopBox && curTopBox) {
             this.topBox$.setValue(undefined);
-            this.blurBox(curTopBox, skipUpdate);
+            // this.blurBox(curTopBox, skipUpdate);
         }
     }
 
@@ -912,10 +912,8 @@ export class TeleBoxManager {
         });
         box._delegateEvents.on(TELE_BOX_DELEGATE_EVENT.Minimize, () => {
             if (box.boxStatus && this.useBoxesStatus) {
-                if (this.topBox === box) {
-                    if (this.topBox?.focus) {
-                        this.blurBox(this.topBox);
-                    }
+                if(box.focus) {
+                    this.blurBox(box);
                 }
                 this.setBox(box, {
                     status: TELE_BOX_STATE.Minimized,
@@ -929,6 +927,9 @@ export class TeleBoxManager {
             }
         });
         box._delegateEvents.on(TELE_BOX_DELEGATE_EVENT.Close, () => {
+            if (this.useBoxesStatus && box.focus) {
+                this.blurBox(box);
+            }
             this.remove(box);
             this.focusTopBox();
         });