@netless/app-slide 0.2.2 → 0.2.5

package/dist/typings.d.ts

@@ -15,5 +15,3 @@ export declare type MagixPayload = {
 export declare type MagixEvents = {
     [SLIDE_EVENTS.syncDispatch]: MagixPayload;
 };
-export interface A {
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/app-slide",
-  "version": "0.2.2",
+  "version": "0.2.5",
   "main": "dist/main.cjs.js",
   "module": "dist/main.es.js",
   "types": "dist/index.d.ts",
@@ -11,11 +11,11 @@
   ],
   "devDependencies": {
     "@netless/app-shared": "0.1.2",
-    "@netless/slide": "^0.4.7",
+    "@netless/slide": "^0.5.13",
     "@types/color-string": "^1.5.2",
     "color-string": "^1.9.1",
-    "side-effect-manager": "^1.1.0",
-    "vanilla-lazyload": "^17.8.2"
+    "side-effect-manager": "^1.1.1",
+    "vanilla-lazyload": "^17.8.3"
   },
   "scripts": {
     "types": "cross-env NODE_ENV=production tsc --declaration --emitDeclarationOnly --outDir dist",

package/src/SlideController/index.ts

@@ -247,6 +247,7 @@ export class SlideController {
   }
 
   private createSlide(anchor: HTMLDivElement) {
+    const options = this.context.getAppOptions() || {};
     const slide = new Slide({
       anchor,
       interactive: true,
@@ -255,13 +256,21 @@ export class SlideController {
       controller: logger.enable,
       enableGlobalClick: true,
       renderOptions: {
-        minFPS: this.context.getAppOptions()?.minFPS || 25,
-        maxFPS: this.context.getAppOptions()?.maxFPS || 30,
-        autoFPS: this.context.getAppOptions()?.autoFPS ?? true,
-        autoResolution: this.context.getAppOptions()?.autoResolution ?? true,
-        resolution: this.context.getAppOptions()?.resolution,
-        transactionBgColor: this.context.getAppOptions()?.bgColor || cachedGetBgColor(anchor),
+        minFPS: options.minFPS || 25,
+        maxFPS: options.maxFPS || 30,
+        autoFPS: options.autoFPS ?? true,
+        autoResolution: options.autoResolution ?? true,
+        resolution: options.resolution,
+        transactionBgColor: options.bgColor || cachedGetBgColor(anchor),
+        maxResolutionLevel: options.maxResolutionLevel,
       },
+      fixedFrameSize: options.fixedFrameSize,
+      loaderDelegate: options.loaderDelegate,
+      navigatorDelegate: options.navigatorDelegate,
+      resourceTimeout: options.resourceTimeout,
+      rtcAudio: options.rtcAudio,
+      useLocalCache: options.useLocalCache,
+      logger: options.logger,
       timestamp: this.timestamp,
     });
     if (import.meta.env.DEV) {
@@ -294,33 +303,12 @@ export class SlideController {
 
   public isFrozen = false;
   private _toFreeze: -1 | 0 | 1 = 0; // -1: unfreeze, 0: no change, 1: freeze
-  private freezePromise: Promise<void> | null = null;
-
-  private afterFreeze(from: -1 | 1) {
-    if (from === 1) {
-      this.isFrozen = true;
-      this.freezePromise = null;
-      if (this._toFreeze === -1) {
-        this.unfreeze();
-      }
-    } else if (from === -1) {
-      this.isFrozen = false;
-      this.freezePromise = null;
-      if (this._toFreeze === 1) {
-        this.freeze();
-      }
-    }
-  }
 
   public freeze = () => {
+    this.isFrozen = true;
     if (this.ready) {
       log("[Slide] freeze", this.context.appId);
-      if (this.freezePromise) {
-        this._toFreeze = 1;
-      } else if (!this.isFrozen) {
-        this._toFreeze = 0;
-        this.freezePromise = this.slide.frozen().then(this.afterFreeze.bind(this, 1));
-      }
+      this.slide.frozen();
     } else {
       this._toFreeze = 1;
     }
@@ -328,14 +316,10 @@ export class SlideController {
 
   public unfreeze = async () => {
     if (!this.visible) return;
+    this.isFrozen = false;
     if (this.ready) {
       log("[Slide] unfreeze", this.context.appId);
-      if (this.freezePromise) {
-        this._toFreeze = -1;
-      } else if (this.isFrozen) {
-        this._toFreeze = 0;
-        this.freezePromise = this.slide.release().then(this.afterFreeze.bind(this, -1));
-      }
+      this.slide.release();
     } else {
       this._toFreeze = -1;
     }
@@ -343,7 +327,7 @@ export class SlideController {
 
   private onVisibilityChange = async () => {
     if (!(this.visible = document.visibilityState === "visible")) {
-      this.savedIsFrozen = this.freezePromise ? this._toFreeze === 1 : this.isFrozen;
+      this.savedIsFrozen = this.isFrozen;
       log("[Slide] freeze because tab becomes invisible");
       this.freeze();
     } else {

package/src/index.ts

@@ -1,10 +1,11 @@
 import type { NetlessApp } from "@netless/window-manager";
 import type { RoomState } from "white-web-sdk";
-import type { Slide } from "@netless/slide";
+import type { ISlideConfig } from "@netless/slide";
 import type { MountSlideOptions } from "./SlideDocsViewer";
 import type { Attributes, MagixEvents } from "./typings";
 import type { AddHooks, FreezableSlide } from "./utils/freezer";
 
+import { Slide } from "@netless/slide";
 import { SideEffectManager } from "side-effect-manager";
 import {
   DefaultUrl,
@@ -21,12 +22,25 @@ export type { PreviewParams } from "./SlidePreviewer";
 export { SlidePreviewer, default as previewSlide } from "./SlidePreviewer";
 
 export type { Attributes, AddHooks, FreezableSlide };
+export { Slide };
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export const usePlugin: (plugin: any) => any = /* @__PURE__ */ Slide.usePlugin.bind(Slide);
 
 export const version = __APP_VERSION__;
 
 export { DefaultUrl, apps, FreezerLength, addHooks };
 
-export interface AppOptions {
+export interface AppOptions
+  extends Pick<
+    ISlideConfig,
+    | "rtcAudio"
+    | "useLocalCache"
+    | "resourceTimeout"
+    | "loaderDelegate"
+    | "navigatorDelegate"
+    | "fixedFrameSize"
+    | "logger"
+  > {
   /** show debug controller */
   debug?: boolean;
   /** scale */
@@ -41,6 +55,14 @@ export interface AppOptions {
   autoFPS?: boolean;
   /** whether to re-scale automatically @default true */
   autoResolution?: boolean;
+  /** 1~4, default: 3 */
+  maxResolutionLevel?: number;
+}
+
+export interface ILogger {
+  info?(msg: string): void;
+  error?(msg: string): void;
+  warn?(msg: string): void;
 }
 
 export interface Controller {

package/src/typings.ts

@@ -19,5 +19,3 @@ export type MagixPayload = {
 export type MagixEvents = {
   [SLIDE_EVENTS.syncDispatch]: MagixPayload;
 };
-
-export interface A {}