@netless/app-slide 0.2.62 → 0.2.64

package/package.json

@@ -1,22 +1,16 @@
 {
   "name": "@netless/app-slide",
-  "version": "0.2.62",
+  "version": "0.2.64",
   "main": "dist/main.cjs.js",
   "module": "dist/main.es.js",
   "types": "dist/index.d.ts",
-  "scripts": {
-    "types": "node scripts/build-types.mjs",
-    "build": "vite build && npm run types",
-    "build:dev": "vite build --mode development && npm run types",
-    "cleanup": "rimraf ./dist"
-  },
   "files": [
     "src",
     "dist",
     "README-zh.md"
   ],
   "devDependencies": {
-    "@netless/slide": "^1.4.10",
+    "@netless/slide": "^1.4.18",
     "@types/color-string": "^1.5.2",
     "color-string": "^1.9.1",
     "jspdf": "2.5.1",
@@ -30,5 +24,11 @@
     "jspdf": {
       "optional": true
     }
+  },
+  "scripts": {
+    "types": "node scripts/build-types.mjs",
+    "build": "vite build && npm run types",
+    "build:dev": "vite build --mode development && npm run types",
+    "cleanup": "rimraf ./dist"
   }
-}
+}

package/src/SlideController/index.ts

@@ -120,11 +120,11 @@ export class SlideController {
   }
 
   public ready = false;
-  private resolveReady!: () => void;
+  private resolveReady!: (index: number) => void;
   public readonly readyPromise = new Promise<void>(resolve => {
-    this.resolveReady = () => {
+    this.resolveReady = (slideIndex) => {
       if (this.ready) {
-        log("[Slide] render end");
+        log("[Slide] render end", slideIndex);
       } else {
         setTimeout(() => {
           this.ready = true;
@@ -370,16 +370,20 @@ export class SlideController {
     if (!this.visible) return;
     this.isFrozen = false;
     if (this.ready) {
+      let isNeedSyncState = false;
       log("[Slide] unfreeze", this.context.appId);
-      if (this.invisibleBehavior === "frozen") {
+      if (this.invisibleBehavior === "frozen" && !this.slide.view) {
         this.slide.release();
+        isNeedSyncState = true;
       } else {
         this.slide.resume();
       }
-      const currentSlideIndex = this.context.storage.state.state?.currentSlideIndex;
-      if (currentSlideIndex) {
-        log("[Slide] sync storage", currentSlideIndex);
-        this.slide.setSlideState({currentSlideIndex});
+      if (isNeedSyncState) {
+        const currentSlideIndex = this.context.storage.state.state?.currentSlideIndex;
+        if (currentSlideIndex) {
+          log("[Slide] sync storage", currentSlideIndex);
+          this.slide.setSlideState({ currentSlideIndex });
+        }
       }
     } else {
       this._toFreeze = -1;

package/src/SlideDocsViewer/index.ts

@@ -39,7 +39,7 @@ export interface SavePdfConfig {
 }
 
 export class SlideDocsViewer {
-  readonly context: AppContext<Attributes, MagixEvents, AppOptions>
+  readonly context: AppContext<Attributes, MagixEvents, AppOptions>;
   public viewer: DocsViewer;
   public slideController: SlideController | null = null;
 
@@ -209,7 +209,7 @@ export class SlideDocsViewer {
 
   public onPageChanged = () => {
     clearTimeout(this._onPageChangedTimer);
-    this._onPageChangedTimer = setTimeout(this._onPageChanged, 200);
+    this._onPageChangedTimer = setTimeout(this._onPageChanged, 200) as unknown as number;
   };
 
   private _onPageChangedTimer = 0;
@@ -313,26 +313,26 @@ export class SlideDocsViewer {
     slideWidth: number,
     slideHeight: number
   ) {
-      const camera = {
-        centerX: 0,
-        centerY: 0,
-        scale: Math.min(canvas.width / slideWidth, canvas.height / slideHeight),
-      };
-      const scenePath = `${this.baseScenePath}/${pageIndex}`;
-      // appliancePlugin is a performance optimization for whiteboard;
-      const windowManger = (this.context as any).manager.windowManger as any;
-      if (windowManger._appliancePlugin) {
-        await windowManger._appliancePlugin.screenshotToCanvasAsync(ctx, scenePath, canvas.width, canvas.height, camera);
-      } else {
-        // Render whiteboard into canvas, and it must fit the slide size.
-        this.whiteboardView.screenshotToCanvas(
-          ctx,
-          scenePath,
-          canvas.width,
-          canvas.height,
-          camera
-        );
-      }
+    const camera = {
+      centerX: 0,
+      centerY: 0,
+      scale: Math.min(canvas.width / slideWidth, canvas.height / slideHeight),
+    };
+    const scenePath = `${this.baseScenePath}/${pageIndex}`;
+    // appliancePlugin is a performance optimization for whiteboard;
+    const windowManger = (this.context as any).manager.windowManger as any;
+    if (windowManger._appliancePlugin) {
+      await windowManger._appliancePlugin.screenshotToCanvasAsync(
+        ctx,
+        scenePath,
+        canvas.width,
+        canvas.height,
+        camera
+      );
+    } else {
+      // Render whiteboard into canvas, and it must fit the slide size.
+      this.whiteboardView.screenshotToCanvas(ctx, scenePath, canvas.width, canvas.height, camera);
+    }
   }
 
   private reportProgress(progress: number, result: { pdf: ArrayBuffer; title: string } | null) {