@netless/window-manager 1.0.0-canary.16 → 1.0.0-canary.17

package/package.json

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

package/src/App/AppContext.ts

@@ -47,7 +47,7 @@ export class AppContext<TAttributes = any, TMagixEventPayloads = any, TAppOption
     private store = this.manager.store;
     public readonly isAddApp: boolean;
     public readonly isReplay = this.manager.isReplay;
-    private whiteBoardView?: WhiteBoardView;
+    public whiteBoardView?: WhiteBoardView;
     public _viewWrapper?: HTMLElement;
 
     constructor(

package/src/App/AppProxy.ts

@@ -635,6 +635,8 @@ export class AppProxy implements PageRemoveService {
         this.manager.refresher.remove(this.id);
         this.manager.refresher.remove(this.stateKey);
         this.manager.refresher.remove(`${this.id}-fullPath`);
+        this.manager.refresher.remove(`${this.id}-camera`);
+        this.manager.refresher.remove(`${this.id}-size`);
         this.valManager.destroy();
     }
 

package/src/AppManager.ts

@@ -659,7 +659,6 @@ export class AppManager {
         if (sceneState) {
             const scenePath = sceneState.scenePath;
             this.appProxies.forEach(appProxy => {
-                console.log("scenePath", scenePath, appProxy.scenePath);
                 if (appProxy.scenePath && scenePath.startsWith(appProxy.scenePath)) {
                     appProxy.emitAppSceneStateChange(sceneState);
                     appProxy.setFullPath(scenePath);

package/src/ReconnectRefresher.ts

@@ -53,7 +53,7 @@ export class ReconnectRefresher {
 
     private onReconnected = debounce(() => {
         this._onReconnected();
-    }, 3000);
+    }, 1000);
 
     private _onReconnected = () => {
         log("onReconnected refresh reactors");

package/src/Utils/RoomHacker.ts

@@ -56,6 +56,9 @@ export const replaceRoomFunction = (room: Room | Player, manager: WindowManager)
         room.lockImages = (...args) => manager.lockImages(...args);
 
         delegateRemoveScenes(room, manager);
+        if (!(room as any).dynamicPpt.slideStateAdapter.pptHandler) {
+            (room as any).dynamicPpt.slideStateAdapter.pptHandler = manager.createPPTHandler();
+        }
     }
 };
 

package/src/View/MainView.ts

@@ -5,7 +5,7 @@ import { emitter } from "../InternalEmitter";
 import { Events } from "../constants";
 import { Fields } from "../AttributesDelegate";
 import { reaction, toJS } from "white-web-sdk";
-import { releaseView, setViewFocusScenePath } from "../Utils/Common";
+import { releaseView, setScenePath, setViewFocusScenePath } from "../Utils/Common";
 import { SideEffectManager } from "side-effect-manager";
 import { Val } from "value-enhancer";
 import { ViewSync } from "./ViewSync";
@@ -41,6 +41,14 @@ export class MainViewProxy {
             }),
         ]);
         this.createViewSync();
+        this.sideEffectManager.add(() => emitter.on("focusedChange", ({ focused }) => {
+            if (focused === undefined) {
+                const scenePath = this.store.getMainViewScenePath();
+                if (scenePath) {
+                    setScenePath(this.manager.room, scenePath);
+                }
+            }
+        }));
     }
 
     public createViewSync = () => {

package/src/View/ViewSync.ts

@@ -35,9 +35,10 @@ export class ViewSync {
             const iCamera = {
                 id: this.context.uid,
                 ...camera,
-            }
+            };
             this.context.camera$.setValue(iCamera, true);
-            const notStoreCamera = this.context.viewMode$ && this.context.viewMode$.value === ViewMode.Freedom;
+            const notStoreCamera =
+                this.context.viewMode$ && this.context.viewMode$.value === ViewMode.Freedom;
             if (notStoreCamera) {
                 return;
             } else {
@@ -54,8 +55,8 @@ export class ViewSync {
                         animationMode: AnimationMode.Immediately,
                     });
                     this.synchronizer.onRemoteUpdate(currentCamera, this.context.size$.value);
-                }   
-              
+                }
+
                 this.bindView(view);
             })
         );
@@ -74,18 +75,15 @@ export class ViewSync {
                 }
             })
         );
-        if (this.context.stageRect$.value) {
-            this.synchronizer.setRect(this.context.stageRect$.value);
-            this.sem.add(() =>
-                this.context.stageRect$.subscribe(rect => {
-                    if (rect) {
-                        this.synchronizer.setRect(rect);
-                    }
-                })
-            );
-        }
+        this.sem.add(() =>
+            this.context.stageRect$.reaction(rect => {
+                if (rect) {
+                    this.synchronizer.setRect(rect);
+                }
+            })
+        );
         const camera$size$ = combine([this.context.camera$, this.context.size$]);
-        camera$size$.subscribe(([camera, size]) => {
+        camera$size$.reaction(([camera, size]) => {
             if (camera && size) {
                 this.synchronizer.onRemoteUpdate(camera, size);
                 camera$size$.destroy();

package/src/index.ts

@@ -923,6 +923,24 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> imple
         emitter.emit("containerSizeRatioUpdate", ratio);
     }
 
+    public createPPTHandler() {
+        return {
+            onPageJumpTo: (_pptUUID: string, index: number) => {
+                this.appManager?.focusApp?.appContext?.whiteBoardView?.jumpPage(index);
+            },
+            onPageToNext: () => {
+                if (this.focused) {
+                    this.appManager?.focusApp?.appContext?.whiteBoardView?.nextPage();
+                }
+            },
+            onPageToPrev: () => {
+                if (this.focused) {
+                    this.appManager?.focusApp?.appContext?.whiteBoardView?.prevPage();
+                }
+            }
+        }
+    }
+
     private isDynamicPPT(scenes: SceneDefinition[]) {
         const sceneSrc = scenes[0]?.ppt?.src;
         return sceneSrc?.startsWith("pptx://");