@netless/app-slide 0.2.105-beta.3 → 0.2.106-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/app-slide",
-  "version": "0.2.105-beta.3",
+  "version": "0.2.106-beta.0",
   "main": "dist/main.cjs.js",
   "module": "dist/main.es.js",
   "types": "dist/index.d.ts",
@@ -17,7 +17,7 @@
     "README-zh.md"
   ],
   "devDependencies": {
-    "@netless/slide": "1.4.57",
+    "@netless/slide": "1.4.60",
     "@types/color-string": "^1.5.2",
     "color-string": "^1.9.1",
     "jspdf": "2.5.1",

package/src/DocsViewer/ResizableContainer.ts

@@ -35,6 +35,7 @@ export class ResizableContainer {
     enableResize: boolean,
     _box?: ReadonlyTeleBox
   ) {
+    void _box;
     this.enableResize = enableResize;
     this.parent = parent;
     this.context = context;
@@ -230,6 +231,7 @@ export class ResizableContainer {
   }
 
   public destroy(_box?: ReadonlyTeleBox): void {
+    void _box;
     this.cancelScheduledLayoutUpdate();
     this.onLayoutUpdated = null;
     this.scaleChangedListeners.clear();

package/src/SlideDocsViewer/index.ts

@@ -228,7 +228,7 @@ export class SlideDocsViewer {
         this.viewer.$content,
         this.context,
         this.enableScale,
-        this.box,
+        this.box
       );
       this.resizableContainer.onLayoutUpdated = () => {
         this.scaleDocsToFit();
@@ -391,7 +391,10 @@ export class SlideDocsViewer {
     this.latestBoxSize = { width: payload.width, height: payload.height };
 
     // observer 已经先处理过同一尺寸时，忽略晚到的 event
-    if (sizesEqual(this.lastObserverSize, this.latestBoxSize) || sizesEqual(this.lastAppliedSize, this.latestBoxSize)) {
+    if (
+      sizesEqual(this.lastObserverSize, this.latestBoxSize) ||
+      sizesEqual(this.lastAppliedSize, this.latestBoxSize)
+    ) {
       console.log("[app-slide] boxSizeChange skipped, observer already applied", {
         appId: this.appId,
         eventCount: this.boxSizeEventCount,
@@ -496,9 +499,10 @@ export class SlideDocsViewer {
       const { width: slideWidth, height: slideHeight } = this.slideController.slide;
       if (slideWidth && slideHeight) {
         const originSize = this.context.storage.state.originSize;
-        const { width, height } = originSize && originSize.width > 0 && originSize.height > 0
-          ? originSize
-          : { width: slideWidth, height: slideHeight };
+        const { width, height } =
+          originSize && originSize.width > 0 && originSize.height > 0
+            ? originSize
+            : { width: slideWidth, height: slideHeight };
         if (width > 0 && height > 0) {
           this.whiteboardView.moveCameraToContain({
             originX: -width / 2,

package/src/index.ts

@@ -118,6 +118,8 @@ export interface AppResult {
   scaleView: (to: number) => void;
   getViewScale: () => number | undefined;
   translateView: (offsetX: number, offsetY: number) => void;
+  onPptMediaPermissionRequest: (callback: () => void) => () => void;
+  playPptMedia: () => void;
 }
 
 const SlideApp: NetlessApp<Attributes, MagixEvents, AppOptions, AppResult> & {
@@ -285,28 +287,27 @@ const SlideApp: NetlessApp<Attributes, MagixEvents, AppOptions, AppResult> & {
       const boxState = context.getWindowManager()?.boxState;
       return boxState != null && boxState !== "normal";
     };
-    sideEffect.add(
-      () =>
-        context.emitter.on("focus", (isFocused: boolean) => {
-          if (disposed) return;
-          if (!isLazySetupMode()) return;
-          const controller = docsViewer?.slideController;
-          if (!controller) return;
-          if (!isFocused) {
-            if (!isBlurFreezeAllowed()) return;
-            if (!controller.isFrozen) {
-              log("[Slide] blur freeze", context.appId);
-              controller.freeze();
-            }
-            return;
-          }
-          if (useFreezer) {
-            apps.focus(context.appId);
-          } else if (controller.isFrozen) {
-            log("[Slide] focus unfreeze", context.appId);
-            controller.unfreeze();
+    sideEffect.add(() =>
+      context.emitter.on("focus", (isFocused: boolean) => {
+        if (disposed) return;
+        if (!isLazySetupMode()) return;
+        const controller = docsViewer?.slideController;
+        if (!controller) return;
+        if (!isFocused) {
+          if (!isBlurFreezeAllowed()) return;
+          if (!controller.isFrozen) {
+            log("[Slide] blur freeze", context.appId);
+            controller.freeze();
           }
-        }),
+          return;
+        }
+        if (useFreezer) {
+          apps.focus(context.appId);
+        } else if (controller.isFrozen) {
+          log("[Slide] focus unfreeze", context.appId);
+          controller.unfreeze();
+        }
+      })
     );
 
     let disposed = false;
@@ -338,12 +339,11 @@ const SlideApp: NetlessApp<Attributes, MagixEvents, AppOptions, AppResult> & {
     const waitForFirstRender = (timeoutMs: number): Promise<boolean> =>
       new Promise<boolean>(resolve => {
         let settled = false;
-        let pollTimer: number | undefined;
         const settle = (loaded: boolean) => {
           if (settled) return;
           settled = true;
           window.clearTimeout(timeoutTimer);
-          if (pollTimer !== undefined) window.clearInterval(pollTimer);
+          window.clearInterval(pollTimer);
           resolve(loaded);
         };
         const timeoutTimer = window.setTimeout(() => settle(false), timeoutMs);
@@ -351,14 +351,21 @@ const SlideApp: NetlessApp<Attributes, MagixEvents, AppOptions, AppResult> & {
         // the poll only catches teardown and pre-ready render failures.
         slideControllerRef?.readyPromise.then(
           () => settle(!firstRenderFailed),
-          () => settle(false),
+          () => settle(false)
         );
-        pollTimer = window.setInterval(() => {
+        const pollTimer = window.setInterval(() => {
           if (disposed || firstRenderFailed) settle(false);
         }, 100);
       });
 
     const appResult: AppResult = {
+      onPptMediaPermissionRequest: callback => {
+        const slide = docsViewer?.slideController?.slide;
+        return slide?.onPptMediaPermissionRequest(callback) ?? (() => undefined);
+      },
+      playPptMedia: () => {
+        docsViewer?.slideController?.slide.playPptMedia();
+      },
       onScaleChanged: (cb: (scale: number) => void) => {
         if (!docsViewer) {
           return () => void 0;
@@ -487,8 +494,7 @@ const SlideApp: NetlessApp<Attributes, MagixEvents, AppOptions, AppResult> & {
       },
     };
 
-    const setupReadyTimeout =
-      appOptions?.setupReadyTimeout ?? DEFAULT_SLIDE_SETUP_READY_TIMEOUT;
+    const setupReadyTimeout = appOptions?.setupReadyTimeout ?? DEFAULT_SLIDE_SETUP_READY_TIMEOUT;
     return waitForFirstRender(setupReadyTimeout).then(() => {
       if (firstRenderFailed) {
         throw new Error("[Slide] first render failed before ready");