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

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,7 @@ class ScrollMode {
     });
     this.updateScroll(scrollTop$.value);
     this.sideEffect.push(this.scrollState$.subscribe((state) => callbacks.emit("scrollStateChange", state)));
+    this.initScroll();
   }
   setRoot(root) {
     this._root$.setValue(root);
@@ -3085,7 +3080,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");

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,7 @@ class ScrollMode {
     });
     this.updateScroll(scrollTop$.value);
     this.sideEffect.push(this.scrollState$.subscribe((state) => callbacks.emit("scrollStateChange", state)));
+    this.initScroll();
   }
   setRoot(root) {
     this._root$.setValue(root);
@@ -3078,7 +3073,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");

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,7 @@ var __objRest = (source, exclude) => {
       });
       this.updateScroll(scrollTop$.value);
       this.sideEffect.push(this.scrollState$.subscribe((state) => callbacks.emit("scrollStateChange", state)));
+      this.initScroll();
     }
     setRoot(root) {
       this._root$.setValue(root);
@@ -3078,7 +3073,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");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/window-manager",
-  "version": "1.0.0-canary.54",
+  "version": "1.0.0-canary.55",
   "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,7 @@ export class ScrollMode {
         this.sideEffect.push(
             this.scrollState$.subscribe(state => callbacks.emit("scrollStateChange", state))
         );
+        this.initScroll();
     }
 
     private initScroll = (): void => {