@netless/window-manager 1.0.0-canary.67 → 1.0.0-canary.69

package/dist/index.js

@@ -2777,7 +2777,7 @@ const safeListenPropsUpdated = (getProps, callback, onDestroyed) => {
     disposeReaction();
   };
 };
-const onObjectRemoved = onObjectByEvent(whiteWebSdk.UpdateEventKind.Removed);
+onObjectByEvent(whiteWebSdk.UpdateEventKind.Removed);
 onObjectByEvent(whiteWebSdk.UpdateEventKind.Inserted);
 class RedoUndo {
   constructor(context) {
@@ -3201,8 +3201,8 @@ class AppManager {
     this.onBoxMove = (payload) => {
       this.dispatchInternalEvent(Events.AppMove, payload);
       this.store.updateAppState(payload.appId, AppAttributes.Position, {
-        x: isNaN(payload.x) ? 0 : payload.x,
-        y: isNaN(payload.y) ? 0 : payload.y
+        x: payload.x || 0,
+        y: payload.y || 0
       });
     };
     this.onBoxResize = (payload) => {
@@ -3239,9 +3239,14 @@ class AppManager {
     this.addAppCloseListener = () => {
       var _a2;
       (_a2 = this.refresher) == null ? void 0 : _a2.add("appsClose", () => {
-        return onObjectRemoved(this.attributes.apps, () => {
-          this.onAppDelete(this.attributes.apps);
-        });
+        return safeListenPropsUpdated(
+          () => this.attributes.apps,
+          (events) => {
+            if (events.some((e) => e.kind === whiteWebSdk.UpdateEventKind.Removed)) {
+              this.onAppDelete(this.attributes.apps);
+            }
+          }
+        );
       });
     };
     this.onMainViewIndexChange = (index2) => {
@@ -3656,8 +3661,8 @@ class AppManager {
       const box = appProxy.box;
       boxEmitter.emit("move", {
         appId: appProxy.id,
-        x: box == null ? void 0 : box.intrinsicX,
-        y: box == null ? void 0 : box.intrinsicY
+        x: box.intrinsicX || 0,
+        y: box.intrinsicY || 0
       });
       this.store.updateAppState(appProxy.id, AppAttributes.ZIndex, box.zIndex);
     }
@@ -6540,8 +6545,8 @@ class BoxManager {
       if (state.size) {
         box._intrinsicSize$.setValue(state.size, true);
       }
-      if (state.position) {
-        box._intrinsicCoord$.setValue(state.position, true);
+      if (state.position && state.position.x !== void 0 && state.position.y !== void 0) {
+        box._intrinsicCoord$.setValue({ x: state.position.x, y: state.position.y }, true);
       }
       if (state.zIndex) {
         box._zIndex$.setValue(state.zIndex, true);
@@ -12793,7 +12798,7 @@ const reconnectRefresher = new ReconnectRefresher({ emitter });
 const _WindowManager = class extends whiteWebSdk.InvisiblePlugin {
   constructor(context) {
     super(context);
-    this.version = "1.0.0-canary.67";
+    this.version = "1.0.0-canary.69";
     this.dependencies = { "dependencies": { "@juggle/resize-observer": "^3.3.1", "@netless/synced-store": "^2.0.7", "@netless/telebox-insider": "1.0.0-alpha.37", "emittery": "^0.11.0", "lodash": "^4.17.21", "p-retry": "^4.6.2", "side-effect-manager": "^1.2.1", "uuid": "^7.0.3", "value-enhancer": "^1.3.2" }, "peerDependencies": { "white-web-sdk": "^2.16.0" }, "devDependencies": { "@netless/app-docs-viewer": "^1.0.0-canary.3", "@netless/app-plyr": "^0.2.4", "@playwright/test": "^1.23.2", "@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.49", "@tsconfig/svelte": "^2.0.1", "@types/debug": "^4.1.7", "@types/lodash": "^4.14.182", "@types/lodash-es": "^4.17.6", "@types/node": "^18.0.3", "@types/uuid": "^8.3.4", "@typescript-eslint/eslint-plugin": "^4.30.0", "@typescript-eslint/parser": "^4.30.0", "@vitest/ui": "^0.14.2", "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", "less": "^4.1.3", "prettier": "^2.3.2", "prettier-plugin-svelte": "^2.4.0", "rollup-plugin-analyzer": "^4.0.0", "rollup-plugin-styles": "^3.14.1", "svelte": "^3.42.4", "typescript": "^4.5.5", "vite": "^3.1.3", "vite-plugin-dts": "^1.5.0", "vitest": "^0.23.4", "white-web-sdk": "^2.16.35" } };
     this.emitter = callbacks;
     this.viewMode$ = new valueEnhancer.Val(whiteWebSdk.ViewMode.Broadcaster);

package/dist/index.mjs

@@ -2772,7 +2772,7 @@ const safeListenPropsUpdated = (getProps, callback, onDestroyed) => {
     disposeReaction();
   };
 };
-const onObjectRemoved = onObjectByEvent(UpdateEventKind.Removed);
+onObjectByEvent(UpdateEventKind.Removed);
 onObjectByEvent(UpdateEventKind.Inserted);
 class RedoUndo {
   constructor(context) {
@@ -3196,8 +3196,8 @@ class AppManager {
     this.onBoxMove = (payload) => {
       this.dispatchInternalEvent(Events.AppMove, payload);
       this.store.updateAppState(payload.appId, AppAttributes.Position, {
-        x: isNaN(payload.x) ? 0 : payload.x,
-        y: isNaN(payload.y) ? 0 : payload.y
+        x: payload.x || 0,
+        y: payload.y || 0
       });
     };
     this.onBoxResize = (payload) => {
@@ -3234,9 +3234,14 @@ class AppManager {
     this.addAppCloseListener = () => {
       var _a2;
       (_a2 = this.refresher) == null ? void 0 : _a2.add("appsClose", () => {
-        return onObjectRemoved(this.attributes.apps, () => {
-          this.onAppDelete(this.attributes.apps);
-        });
+        return safeListenPropsUpdated(
+          () => this.attributes.apps,
+          (events) => {
+            if (events.some((e) => e.kind === UpdateEventKind.Removed)) {
+              this.onAppDelete(this.attributes.apps);
+            }
+          }
+        );
       });
     };
     this.onMainViewIndexChange = (index2) => {
@@ -3651,8 +3656,8 @@ class AppManager {
       const box = appProxy.box;
       boxEmitter.emit("move", {
         appId: appProxy.id,
-        x: box == null ? void 0 : box.intrinsicX,
-        y: box == null ? void 0 : box.intrinsicY
+        x: box.intrinsicX || 0,
+        y: box.intrinsicY || 0
       });
       this.store.updateAppState(appProxy.id, AppAttributes.ZIndex, box.zIndex);
     }
@@ -6535,8 +6540,8 @@ class BoxManager {
       if (state.size) {
         box._intrinsicSize$.setValue(state.size, true);
       }
-      if (state.position) {
-        box._intrinsicCoord$.setValue(state.position, true);
+      if (state.position && state.position.x !== void 0 && state.position.y !== void 0) {
+        box._intrinsicCoord$.setValue({ x: state.position.x, y: state.position.y }, true);
       }
       if (state.zIndex) {
         box._zIndex$.setValue(state.zIndex, true);
@@ -12788,7 +12793,7 @@ const reconnectRefresher = new ReconnectRefresher({ emitter });
 const _WindowManager = class extends InvisiblePlugin {
   constructor(context) {
     super(context);
-    this.version = "1.0.0-canary.67";
+    this.version = "1.0.0-canary.69";
     this.dependencies = { "dependencies": { "@juggle/resize-observer": "^3.3.1", "@netless/synced-store": "^2.0.7", "@netless/telebox-insider": "1.0.0-alpha.37", "emittery": "^0.11.0", "lodash": "^4.17.21", "p-retry": "^4.6.2", "side-effect-manager": "^1.2.1", "uuid": "^7.0.3", "value-enhancer": "^1.3.2" }, "peerDependencies": { "white-web-sdk": "^2.16.0" }, "devDependencies": { "@netless/app-docs-viewer": "^1.0.0-canary.3", "@netless/app-plyr": "^0.2.4", "@playwright/test": "^1.23.2", "@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.49", "@tsconfig/svelte": "^2.0.1", "@types/debug": "^4.1.7", "@types/lodash": "^4.14.182", "@types/lodash-es": "^4.17.6", "@types/node": "^18.0.3", "@types/uuid": "^8.3.4", "@typescript-eslint/eslint-plugin": "^4.30.0", "@typescript-eslint/parser": "^4.30.0", "@vitest/ui": "^0.14.2", "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", "less": "^4.1.3", "prettier": "^2.3.2", "prettier-plugin-svelte": "^2.4.0", "rollup-plugin-analyzer": "^4.0.0", "rollup-plugin-styles": "^3.14.1", "svelte": "^3.42.4", "typescript": "^4.5.5", "vite": "^3.1.3", "vite-plugin-dts": "^1.5.0", "vitest": "^0.23.4", "white-web-sdk": "^2.16.35" } };
     this.emitter = callbacks;
     this.viewMode$ = new Val(ViewMode.Broadcaster);

package/dist/index.umd.js

@@ -2770,7 +2770,7 @@
       disposeReaction();
     };
   };
-  const onObjectRemoved = onObjectByEvent(whiteWebSdk.UpdateEventKind.Removed);
+  onObjectByEvent(whiteWebSdk.UpdateEventKind.Removed);
   onObjectByEvent(whiteWebSdk.UpdateEventKind.Inserted);
   class RedoUndo {
     constructor(context) {
@@ -3194,8 +3194,8 @@
       this.onBoxMove = (payload) => {
         this.dispatchInternalEvent(Events.AppMove, payload);
         this.store.updateAppState(payload.appId, AppAttributes.Position, {
-          x: isNaN(payload.x) ? 0 : payload.x,
-          y: isNaN(payload.y) ? 0 : payload.y
+          x: payload.x || 0,
+          y: payload.y || 0
         });
       };
       this.onBoxResize = (payload) => {
@@ -3232,9 +3232,14 @@
       this.addAppCloseListener = () => {
         var _a2;
         (_a2 = this.refresher) == null ? void 0 : _a2.add("appsClose", () => {
-          return onObjectRemoved(this.attributes.apps, () => {
-            this.onAppDelete(this.attributes.apps);
-          });
+          return safeListenPropsUpdated(
+            () => this.attributes.apps,
+            (events) => {
+              if (events.some((e) => e.kind === whiteWebSdk.UpdateEventKind.Removed)) {
+                this.onAppDelete(this.attributes.apps);
+              }
+            }
+          );
         });
       };
       this.onMainViewIndexChange = (index2) => {
@@ -3649,8 +3654,8 @@
         const box = appProxy.box;
         boxEmitter.emit("move", {
           appId: appProxy.id,
-          x: box == null ? void 0 : box.intrinsicX,
-          y: box == null ? void 0 : box.intrinsicY
+          x: box.intrinsicX || 0,
+          y: box.intrinsicY || 0
         });
         this.store.updateAppState(appProxy.id, AppAttributes.ZIndex, box.zIndex);
       }
@@ -6533,8 +6538,8 @@
         if (state.size) {
           box._intrinsicSize$.setValue(state.size, true);
         }
-        if (state.position) {
-          box._intrinsicCoord$.setValue(state.position, true);
+        if (state.position && state.position.x !== void 0 && state.position.y !== void 0) {
+          box._intrinsicCoord$.setValue({ x: state.position.x, y: state.position.y }, true);
         }
         if (state.zIndex) {
           box._zIndex$.setValue(state.zIndex, true);
@@ -12786,7 +12791,7 @@
   const _WindowManager = class extends whiteWebSdk.InvisiblePlugin {
     constructor(context) {
       super(context);
-      this.version = "1.0.0-canary.67";
+      this.version = "1.0.0-canary.69";
       this.dependencies = { "dependencies": { "@juggle/resize-observer": "^3.3.1", "@netless/synced-store": "^2.0.7", "@netless/telebox-insider": "1.0.0-alpha.37", "emittery": "^0.11.0", "lodash": "^4.17.21", "p-retry": "^4.6.2", "side-effect-manager": "^1.2.1", "uuid": "^7.0.3", "value-enhancer": "^1.3.2" }, "peerDependencies": { "white-web-sdk": "^2.16.0" }, "devDependencies": { "@netless/app-docs-viewer": "^1.0.0-canary.3", "@netless/app-plyr": "^0.2.4", "@playwright/test": "^1.23.2", "@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.49", "@tsconfig/svelte": "^2.0.1", "@types/debug": "^4.1.7", "@types/lodash": "^4.14.182", "@types/lodash-es": "^4.17.6", "@types/node": "^18.0.3", "@types/uuid": "^8.3.4", "@typescript-eslint/eslint-plugin": "^4.30.0", "@typescript-eslint/parser": "^4.30.0", "@vitest/ui": "^0.14.2", "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", "less": "^4.1.3", "prettier": "^2.3.2", "prettier-plugin-svelte": "^2.4.0", "rollup-plugin-analyzer": "^4.0.0", "rollup-plugin-styles": "^3.14.1", "svelte": "^3.42.4", "typescript": "^4.5.5", "vite": "^3.1.3", "vite-plugin-dts": "^1.5.0", "vitest": "^0.23.4", "white-web-sdk": "^2.16.35" } };
       this.emitter = callbacks;
       this.viewMode$ = new valueEnhancer.Val(whiteWebSdk.ViewMode.Broadcaster);

package/package.json

@@ -1,22 +1,11 @@
 {
   "name": "@netless/window-manager",
-  "version": "1.0.0-canary.67",
+  "version": "1.0.0-canary.69",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/src/index.d.ts",
   "repository": "netless-io/window-manager",
-  "scripts": {
-    "prettier": "prettier --write .",
-    "dev": "vite build --watch",
-    "build": "vite build",
-    "type-gen": "tsc --emitDeclarationOnly",
-    "predev": "yarn type-gen",
-    "build:lib:types": "tsc --emitDeclarationOnly",
-    "lint": "eslint --ext .ts,.tsx,.svelte . && prettier --check .",
-    "test": "vitest",
-    "e2e": "playwright test"
-  },
   "keywords": [],
   "author": "",
   "license": "ISC",
@@ -68,5 +57,16 @@
     "vite-plugin-dts": "^1.5.0",
     "vitest": "^0.23.4",
     "white-web-sdk": "^2.16.35"
+  },
+  "scripts": {
+    "prettier": "prettier --write .",
+    "dev": "vite build --watch",
+    "build": "vite build",
+    "type-gen": "tsc --emitDeclarationOnly",
+    "predev": "yarn type-gen",
+    "build:lib:types": "tsc --emitDeclarationOnly",
+    "lint": "eslint --ext .ts,.tsx,.svelte . && prettier --check .",
+    "test": "vitest",
+    "e2e": "playwright test"
   }
-}
+}

package/src/AppManager.ts

@@ -3,7 +3,7 @@ import { AppCreateQueue } from "./Utils/AppCreateQueue";
 import { AppListeners } from "./AppListener";
 import { AppProxy } from "./App";
 import { appRegister } from "./Register";
-import { autorun, isPlayer, isRoom, ScenePathType, toJS } from "white-web-sdk";
+import { autorun, isPlayer, isRoom, ScenePathType, toJS, UpdateEventKind } from "white-web-sdk";
 import { boxEmitter } from "./BoxEmitter";
 import { calculateNextIndex } from "./Page";
 import { callbacks } from "./callback";
@@ -12,7 +12,7 @@ import { emitter } from "./InternalEmitter";
 import { Fields, store } from "./AttributesDelegate";
 import { log } from "./Utils/log";
 import { MainViewProxy } from "./View/MainView";
-import { onObjectRemoved, safeListenPropsUpdated } from "./Utils/Reactive";
+import { safeListenPropsUpdated } from "./Utils/Reactive";
 import { reconnectRefresher, WindowManager } from "./index";
 import { RedoUndo } from "./RedoUndo";
 import { serializeRoomMembers } from "./Helper";
@@ -40,7 +40,8 @@ import type {
     ScenesCallbacksNode,
     SceneState,
     RoomState,
- Size} from "white-web-sdk";
+    Size,
+} from "white-web-sdk";
 import type { AddAppParams, BaseInsertParams, TeleBoxRect } from "./index";
 import type {
     BoxClosePayload,
@@ -81,7 +82,6 @@ export class AppManager {
 
     public rootDirRemoving = false;
 
-
     constructor(public windowManger: WindowManager) {
         this.displayer = windowManger.displayer;
         this.store.setContext({
@@ -395,8 +395,8 @@ export class AppManager {
     private onBoxMove = (payload: BoxMovePayload) => {
         this.dispatchInternalEvent(Events.AppMove, payload);
         this.store.updateAppState(payload.appId, AppAttributes.Position, {
-            x: isNaN(payload.x) ? 0 : payload.x,
-            y: isNaN(payload.y) ? 0 : payload.y,
+            x: payload.x || 0,
+            y: payload.y || 0,
         });
     };
 
@@ -438,9 +438,14 @@ export class AppManager {
 
     public addAppCloseListener = () => {
         this.refresher?.add("appsClose", () => {
-            return onObjectRemoved(this.attributes.apps, () => {
-                this.onAppDelete(this.attributes.apps);
-            });
+            return safeListenPropsUpdated(
+                () => this.attributes.apps,
+                events => {
+                    if (events.some(e => e.kind === UpdateEventKind.Removed)) {
+                        this.onAppDelete(this.attributes.apps);
+                    }
+                }
+            );
         });
     };
 
@@ -653,8 +658,8 @@ export class AppManager {
             const box = appProxy.box;
             boxEmitter.emit("move", {
                 appId: appProxy.id,
-                x: box?.intrinsicX,
-                y: box?.intrinsicY,
+                x: box.intrinsicX || 0,
+                y: box.intrinsicY || 0,
             });
             this.store.updateAppState(appProxy.id, AppAttributes.ZIndex, box.zIndex);
         }

package/src/BoxManager.ts

@@ -331,8 +331,8 @@ export class BoxManager {
             if (state.size) {
                 box._intrinsicSize$.setValue(state.size, true);
             }
-            if (state.position) {
-                box._intrinsicCoord$.setValue(state.position, true);
+            if (state.position && state.position.x !== undefined && state.position.y !== undefined) {
+                box._intrinsicCoord$.setValue({ x: state.position.x, y: state.position.y }, true);
             }
             if (state.zIndex) {
                 box._zIndex$.setValue(state.zIndex, true);