@netless/window-manager 1.0.0-canary.54 → 1.0.0-canary.56

package/dist/index.cjs.js

@@ -2508,12 +2508,6 @@ class ScrollMode {
         this.sideEffect.addEventListener(el.parentElement, "wheel", this.onWheel, { capture: true, passive: false }, "wheel");
       }
     }));
-    this.sideEffect.push(scale$.reaction((scale2) => {
-      if (scale2 > 0) {
-        this.sideEffect.flush("initScroll");
-        this.sideEffect.setTimeout(this.initScroll, 0);
-      }
-    }), "initScroll");
     const maxScrollPage$ = valueEnhancer.combine([this._size$, this._scale$], ([size, scale2]) => {
       const halfWbHeight = size.height / 2 / scale2;
       return (this.baseHeight - halfWbHeight) / halfWbHeight / 2 - 0.51;
@@ -2527,6 +2521,12 @@ class ScrollMode {
     });
     this.updateScroll(scrollTop$.value);
     this.sideEffect.push(this.scrollState$.subscribe((state) => callbacks.emit("scrollStateChange", state)));
+    this.sideEffect.push(valueEnhancer.combine([this._size$, this._scale$]).subscribe(([size, scale2]) => {
+      if (size.height > 0 && scale2 > 0) {
+        this.initScroll();
+        this.sideEffect.flush("initScroll");
+      }
+    }), "initScroll");
   }
   setRoot(root) {
     this._root$.setValue(root);
@@ -3085,7 +3085,6 @@ class AppManager {
   bindMainView(divElement, disableCameraTransform) {
     const mainView = this.mainViewProxy.view;
     mainView.disableCameraTransform = disableCameraTransform;
-    console.log("bindMainView", mainView.disableCameraTransform);
     wait(30).then(() => {
       mainView.divElement = divElement;
       emitter.emit("mainViewMounted");
@@ -11649,7 +11648,7 @@ const reconnectRefresher = new ReconnectRefresher({ emitter });
 const _WindowManager = class extends whiteWebSdk.InvisiblePlugin {
   constructor(context) {
     super(context);
-    this.version = "1.0.0-canary.54";
+    this.version = "1.0.0-canary.56";
     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": "^0.3.3", "@netless/app-plyr": "0.2.2", "@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": "^2.5.3", "vite-plugin-dts": "^1.2.1", "vitest": "^0.18.0", "white-web-sdk": "^2.16.35" } };
     this.emitter = callbacks;
     this.viewMode = whiteWebSdk.ViewMode.Broadcaster;

package/dist/index.es.js

@@ -2501,12 +2501,6 @@ class ScrollMode {
         this.sideEffect.addEventListener(el.parentElement, "wheel", this.onWheel, { capture: true, passive: false }, "wheel");
       }
     }));
-    this.sideEffect.push(scale$.reaction((scale2) => {
-      if (scale2 > 0) {
-        this.sideEffect.flush("initScroll");
-        this.sideEffect.setTimeout(this.initScroll, 0);
-      }
-    }), "initScroll");
     const maxScrollPage$ = combine([this._size$, this._scale$], ([size, scale2]) => {
       const halfWbHeight = size.height / 2 / scale2;
       return (this.baseHeight - halfWbHeight) / halfWbHeight / 2 - 0.51;
@@ -2520,6 +2514,12 @@ class ScrollMode {
     });
     this.updateScroll(scrollTop$.value);
     this.sideEffect.push(this.scrollState$.subscribe((state) => callbacks.emit("scrollStateChange", state)));
+    this.sideEffect.push(combine([this._size$, this._scale$]).subscribe(([size, scale2]) => {
+      if (size.height > 0 && scale2 > 0) {
+        this.initScroll();
+        this.sideEffect.flush("initScroll");
+      }
+    }), "initScroll");
   }
   setRoot(root) {
     this._root$.setValue(root);
@@ -3078,7 +3078,6 @@ class AppManager {
   bindMainView(divElement, disableCameraTransform) {
     const mainView = this.mainViewProxy.view;
     mainView.disableCameraTransform = disableCameraTransform;
-    console.log("bindMainView", mainView.disableCameraTransform);
     wait(30).then(() => {
       mainView.divElement = divElement;
       emitter.emit("mainViewMounted");
@@ -11642,7 +11641,7 @@ const reconnectRefresher = new ReconnectRefresher({ emitter });
 const _WindowManager = class extends InvisiblePlugin {
   constructor(context) {
     super(context);
-    this.version = "1.0.0-canary.54";
+    this.version = "1.0.0-canary.56";
     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": "^0.3.3", "@netless/app-plyr": "0.2.2", "@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": "^2.5.3", "vite-plugin-dts": "^1.2.1", "vitest": "^0.18.0", "white-web-sdk": "^2.16.35" } };
     this.emitter = callbacks;
     this.viewMode = ViewMode.Broadcaster;

package/dist/index.umd.js

@@ -2501,12 +2501,6 @@ var __objRest = (source, exclude) => {
           this.sideEffect.addEventListener(el.parentElement, "wheel", this.onWheel, { capture: true, passive: false }, "wheel");
         }
       }));
-      this.sideEffect.push(scale$.reaction((scale2) => {
-        if (scale2 > 0) {
-          this.sideEffect.flush("initScroll");
-          this.sideEffect.setTimeout(this.initScroll, 0);
-        }
-      }), "initScroll");
       const maxScrollPage$ = valueEnhancer.combine([this._size$, this._scale$], ([size, scale2]) => {
         const halfWbHeight = size.height / 2 / scale2;
         return (this.baseHeight - halfWbHeight) / halfWbHeight / 2 - 0.51;
@@ -2520,6 +2514,12 @@ var __objRest = (source, exclude) => {
       });
       this.updateScroll(scrollTop$.value);
       this.sideEffect.push(this.scrollState$.subscribe((state) => callbacks.emit("scrollStateChange", state)));
+      this.sideEffect.push(valueEnhancer.combine([this._size$, this._scale$]).subscribe(([size, scale2]) => {
+        if (size.height > 0 && scale2 > 0) {
+          this.initScroll();
+          this.sideEffect.flush("initScroll");
+        }
+      }), "initScroll");
     }
     setRoot(root) {
       this._root$.setValue(root);
@@ -3078,7 +3078,6 @@ var __objRest = (source, exclude) => {
     bindMainView(divElement, disableCameraTransform) {
       const mainView = this.mainViewProxy.view;
       mainView.disableCameraTransform = disableCameraTransform;
-      console.log("bindMainView", mainView.disableCameraTransform);
       wait(30).then(() => {
         mainView.divElement = divElement;
         emitter.emit("mainViewMounted");
@@ -11642,7 +11641,7 @@ var __objRest = (source, exclude) => {
   const _WindowManager = class extends whiteWebSdk.InvisiblePlugin {
     constructor(context) {
       super(context);
-      this.version = "1.0.0-canary.54";
+      this.version = "1.0.0-canary.56";
       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": "^0.3.3", "@netless/app-plyr": "0.2.2", "@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": "^2.5.3", "vite-plugin-dts": "^1.2.1", "vitest": "^0.18.0", "white-web-sdk": "^2.16.35" } };
       this.emitter = callbacks;
       this.viewMode = whiteWebSdk.ViewMode.Broadcaster;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/window-manager",
-  "version": "1.0.0-canary.54",
+  "version": "1.0.0-canary.56",
   "description": "",
   "main": "dist/index.cjs.js",
   "module": "dist/index.es.js",

package/src/AppManager.ts

@@ -597,7 +597,6 @@ export class AppManager {
     public bindMainView(divElement: HTMLDivElement, disableCameraTransform: boolean) {
         const mainView = this.mainViewProxy.view;
         mainView.disableCameraTransform = disableCameraTransform;
-        console.log("bindMainView", mainView.disableCameraTransform);
         // 延迟挂载 mainView 的 dom, 避免因为同步 camera 的闪动
         wait(30).then(() => {
             mainView.divElement = divElement;

package/src/View/ScrollMode.ts

@@ -129,17 +129,6 @@ export class ScrollMode {
             })
         );
 
-        this.sideEffect.push(
-            scale$.reaction(scale => {
-                if (scale > 0) {
-                    this.sideEffect.flush("initScroll");
-                    // XXX: wait window-manager's sync behavior then we reset the camera
-                    this.sideEffect.setTimeout(this.initScroll, 0);
-                }
-            }),
-            "initScroll"
-        );
-
         const maxScrollPage$ = combine([this._size$, this._scale$], ([size, scale]) => {
             const halfWbHeight = size.height / 2 / scale;
             return (this.baseHeight - halfWbHeight) / halfWbHeight / 2 - 0.51;
@@ -160,6 +149,16 @@ export class ScrollMode {
         this.sideEffect.push(
             this.scrollState$.subscribe(state => callbacks.emit("scrollStateChange", state))
         );
+
+        this.sideEffect.push(
+            combine([this._size$, this._scale$]).subscribe(([size, scale]) => {
+                if (size.height > 0 && scale > 0) {
+                    this.initScroll();
+                    this.sideEffect.flush("initScroll");
+                }
+            }),
+            "initScroll"
+        );
     }
 
     private initScroll = (): void => {