@netless/window-manager 1.0.7-beta.8 → 1.0.8

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import pRetry from "p-retry";
 import Emittery from "emittery";
-import { debounce, isEqual, omit, isObject, has, get, size as size$1, mapValues, noop as noop$2, isEmpty, pick, isInteger, orderBy, isFunction, isNumber, isNull } from "lodash";
+import { debounce, isObject, has, get, size as size$1, mapValues, noop as noop$2, isEmpty, omit, pick, isEqual, isInteger, orderBy, isFunction, isNumber, isNull } from "lodash";
 import { ScenePathType, UpdateEventKind, listenUpdated, unlistenUpdated, reaction, autorun, toJS, listenDisposed, unlistenDisposed, WhiteVersion, ApplianceNames, isRoom, ViewMode, AnimationMode, isPlayer, RoomPhase, PlayerPhase, InvisiblePlugin } from "white-web-sdk";
 import { v4 } from "uuid";
 import { ResizeObserver as ResizeObserver$3 } from "@juggle/resize-observer";
@@ -466,14 +466,6 @@ class AppListeners {
             this.setMainViewScenePathHandler(data.payload);
             break;
           }
-          case Events.MoveCamera: {
-            this.moveCameraHandler(data.payload);
-            break;
-          }
-          case Events.MoveCameraToContain: {
-            this.moveCameraToContainHandler(data.payload);
-            break;
-          }
           case Events.CursorMove: {
             this.cursorMoveHandler(data.payload);
             break;
@@ -513,14 +505,6 @@ class AppListeners {
       setViewFocusScenePath(this.manager.mainView, nextScenePath);
       callbacks$1.emit("mainViewScenePathChange", nextScenePath);
     };
-    this.moveCameraHandler = (payload) => {
-      if (isEqual(omit(payload, ["animationMode"]), { ...this.manager.mainView.camera }))
-        return;
-      this.manager.mainView.moveCamera(payload);
-    };
-    this.moveCameraToContainHandler = (payload) => {
-      this.manager.mainView.moveCameraToContain(payload);
-    };
     this.cursorMoveHandler = (payload) => {
       internalEmitter.emit("cursorMove", payload);
     };
@@ -6992,9 +6976,8 @@ function getExtendClass$1(baseClass, extendClass) {
       default:
         return baseClass;
     }
-  } else {
-    return baseClass;
   }
+  return baseClass;
 }
 var Fields = /* @__PURE__ */ ((Fields2) => {
   Fields2["Apps"] = "apps";
@@ -8517,8 +8500,12 @@ class AppManager {
   async onCreated() {
     var _a;
     if (Object.keys(this.attributes.apps).length && this.store.focus) {
+      this._focusAppId = this.store.focus;
       await new Promise((resolve) => {
         this._focusAppCreatedResolve = resolve;
+        this._resolveTimer = setTimeout(() => {
+          resolve(this.appProxies.get(this._focusAppId || ""));
+        }, 500);
       }).then(() => {
         this.focusByAttributes(this.attributes.apps);
       });
@@ -8630,7 +8617,10 @@ class AppManager {
                 id2,
                 false
               );
-              if (appProxy && this.store.focus === id2 && this._focusAppCreatedResolve) {
+              if (appProxy && this._focusAppId === id2 && this._focusAppCreatedResolve) {
+                if (this._resolveTimer) {
+                  clearTimeout(this._resolveTimer);
+                }
                 this._focusAppCreatedResolve(appProxy);
               }
               return appProxy;
@@ -8855,7 +8845,11 @@ class AppManager {
     this.sideEffectManager.flushAll();
     this._prevFocused = void 0;
     this._prevSceneIndex = void 0;
+    if (this._resolveTimer) {
+      clearTimeout(this._resolveTimer);
+    }
     this._focusAppCreatedResolve = void 0;
+    this._resolveTimer = void 0;
   }
 }
 AppManager.kind = "AppManager";
@@ -19636,15 +19630,14 @@ function getExtendClass(baseClass, extendClass) {
       default:
         return baseClass;
     }
-  } else {
-    return baseClass;
   }
+  return baseClass;
 }
 const reconnectRefresher = new ReconnectRefresher({ emitter: internalEmitter });
 const _WindowManager = class extends InvisiblePlugin {
   constructor(context) {
     super(context);
-    this.version = "1.0.7-beta.8";
+    this.version = "1.0.8";
     this.dependencies = { "dependencies": { "@juggle/resize-observer": "^3.3.1", "@netless/telebox-insider": "0.3.0-beta.14", "emittery": "^0.9.2", "lodash": "^4.17.21", "p-retry": "^4.6.1", "uuid": "^7.0.3", "video.js": ">=7" }, "peerDependencies": { "jspdf": "2.5.1", "white-web-sdk": "^2.16.52" }, "devDependencies": { "@hyrious/dts": "^0.2.2", "@netless/app-docs-viewer": "^0.2.19", "@netless/app-media-player": "0.1.4", "@rollup/plugin-commonjs": "^20.0.0", "@rollup/plugin-node-resolve": "^13.0.4", "@rollup/plugin-url": "^6.1.0", "@sveltejs/vite-plugin-svelte": "1.0.0-next.30", "@tsconfig/svelte": "^2.0.1", "@types/debug": "^4.1.7", "@types/lodash": "^4.14.182", "@types/lodash-es": "^4.17.4", "@types/uuid": "^8.3.1", "@typescript-eslint/eslint-plugin": "^4.30.0", "@typescript-eslint/parser": "^4.30.0", "@vitest/ui": "^0.14.1", "cypress": "^8.7.0", "dotenv": "^10.0.0", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-svelte3": "^3.2.0", "jsdom": "^19.0.0", "jspdf": "^2.5.1", "less": "^4.1.1", "prettier": "^2.3.2", "prettier-plugin-svelte": "^2.4.0", "rollup-plugin-analyzer": "^4.0.0", "rollup-plugin-styles": "^3.14.1", "side-effect-manager": "0.1.5", "svelte": "^3.42.4", "typescript": "^4.5.5", "vite": "^2.9.9", "vitest": "^0.14.1", "white-web-sdk": "^2.16.52" } };
     this.emitter = callbacks$1;
     this.viewMode = ViewMode.Broadcaster;
@@ -20257,25 +20250,21 @@ const _WindowManager = class extends InvisiblePlugin {
     }
   }
   moveCamera(camera) {
-    var _a;
     const pureCamera = omit(camera, ["animationMode"]);
     const mainViewCamera = { ...this.mainView.camera };
     if (isEqual({ ...mainViewCamera, ...pureCamera }, mainViewCamera))
       return;
     this.mainView.moveCamera(camera);
-    (_a = this.appManager) == null ? void 0 : _a.dispatchInternalEvent(Events.MoveCamera, camera);
     setTimeout(() => {
-      var _a2;
-      (_a2 = this.appManager) == null ? void 0 : _a2.mainViewProxy.setCameraAndSize();
+      var _a;
+      (_a = this.appManager) == null ? void 0 : _a.mainViewProxy.setCameraAndSize();
     }, 500);
   }
   moveCameraToContain(rectangle) {
-    var _a;
     this.mainView.moveCameraToContain(rectangle);
-    (_a = this.appManager) == null ? void 0 : _a.dispatchInternalEvent(Events.MoveCameraToContain, rectangle);
     setTimeout(() => {
-      var _a2;
-      (_a2 = this.appManager) == null ? void 0 : _a2.mainViewProxy.setCameraAndSize();
+      var _a;
+      (_a = this.appManager) == null ? void 0 : _a.mainViewProxy.setCameraAndSize();
     }, 500);
   }
   convertToPointInWorld(point) {