@netless/window-manager 1.0.15 → 1.0.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/window-manager",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "description": "Multi-window mode for Netless Whiteboard",
   "author": "l1shen <lishen1635@gmail.com> (https://github.com/l1shen)",
   "license": "MIT",
@@ -23,7 +23,7 @@
   },
   "peerDependencies": {
     "jspdf": "2.5.1",
-    "white-web-sdk": "^2.16.54"
+    "white-web-sdk": "^2.16.55"
   },
   "peerDependenciesMeta": {
     "jspdf": {
@@ -73,6 +73,6 @@
     "typescript": "^4.5.5",
     "vite": "^2.9.9",
     "vitest": "^0.14.1",
-    "white-web-sdk": "^2.16.54"
+    "white-web-sdk": "^2.16.55"
   }
 }

package/src/App/AppProxy.ts

@@ -154,13 +154,17 @@ export class AppProxy implements PageRemoveService {
         }
         const appImpl = await appRegister.appClasses.get(params.kind)?.();
         const appParams = appRegister.registered.get(params.kind);
+        const appOptions = this.manager.windowManger.resolveAppOptions(
+            params.kind,
+            appParams?.appOptions
+        );
         if (appImpl) {
             await this.setupApp(
                 this.id,
                 skipUpdate,
                 appImpl,
                 params.options,
-                appParams?.appOptions,
+                appOptions,
                 this.manager.useBoxesStatus ? boxStatus : undefined,
                 params.forceTop,
                 params.forceNormal,

package/src/BuiltinApps.ts

@@ -1,4 +1,9 @@
 import { WindowManager } from "./index";
+import type { PresentationAppOptions } from "@netless/app-presentation";
+
+export interface BuiltinAppOptions {
+    Presentation?: PresentationAppOptions;
+}
 
 const loadAppMediaPlayer = async () => {
     const mod = await import("@netless/app-media-player");
@@ -31,7 +36,6 @@ export const setupBuiltin = () => {
         kind: BuiltinApps.Presentation,
         src: loadAppPresentation,
         appOptions: {
-            reScaleOnPageChange: true,
             debounceSync: true,
             useScrollbar: true,
         },

package/src/Utils/resolveAppOptions.ts

@@ -0,0 +1,12 @@
+export function resolveAppOptions(
+    registeredOptions: any | (() => any),
+    override: any
+): any | (() => any) {
+    if (override === undefined) {
+        return registeredOptions;
+    }
+    return () => ({
+        ...(typeof registeredOptions === "function" ? registeredOptions() : registeredOptions),
+        ...override,
+    });
+}

package/src/index.ts

@@ -17,6 +17,7 @@ import { PageStateImpl } from "./PageState";
 import { ReconnectRefresher } from "./ReconnectRefresher";
 import { replaceRoomFunction } from "./Utils/RoomHacker";
 import { BuiltinApps, setupBuiltin } from "./BuiltinApps";
+import type { BuiltinAppOptions } from "./BuiltinApps";
 import "video.js/dist/video-js.css";
 import "./style.css";
 import "@netless/telebox-insider/dist/style.css";
@@ -66,6 +67,7 @@ import type { ExtendPluginInstance } from "./ExtendPluginManager";
 import { ExtendPluginManager } from "./ExtendPluginManager";
 import { getExtendClass } from "./Utils/extendClass";
 import type { ExtendClass } from "./Utils/extendClass";
+import { resolveAppOptions as mergeAppOptions } from "./Utils/resolveAppOptions";
 
 export * from "./utils/extendClass";
 
@@ -244,6 +246,8 @@ export type MountParams = {
     supportAppliancePlugin?: boolean;
     /** 是否使用 boxesStatus 状态管理窗口 */
     useBoxesStatus?: boolean;
+    /** Local Presentation options applied before restoring apps. Not synchronized. */
+    builtinAppOptions?: BuiltinAppOptions;
 };
 
 export const reconnectRefresher = new ReconnectRefresher({ emitter: internalEmitter });
@@ -281,6 +285,8 @@ export class WindowManager
 
     public _appliancePlugin?: any;
 
+    public builtinAppOptions?: BuiltinAppOptions;
+
     private boxManager?: BoxManager;
     private static params?: MountParams;
     static extendClass?: ExtendClass;
@@ -385,6 +391,8 @@ export class WindowManager
             throw new Error("[WindowManager]: create manager failed");
         }
 
+        manager.builtinAppOptions = params.builtinAppOptions;
+
         if (containerSizeRatio) {
             WindowManager.containerSizeRatio = containerSizeRatio;
         }
@@ -586,6 +594,15 @@ export class WindowManager
         return appRegister.unregister(kind);
     }
 
+    public resolveAppOptions(
+        kind: string,
+        registeredOptions?: any | (() => any)
+    ): any | (() => any) {
+        const override =
+            kind === BuiltinApps.Presentation ? this.builtinAppOptions?.Presentation : undefined;
+        return mergeAppOptions(registeredOptions, override);
+    }
+
     /**
      * 创建一个 app 至白板
      */
@@ -1494,6 +1511,7 @@ setupBuiltin();
 export * from "./typings";
 
 export { BuiltinApps } from "./BuiltinApps";
+export type { BuiltinAppOptions } from "./BuiltinApps";
 export type { PublicEvent } from "./callback";
 
 export * from "./ExtendPluginManager";