@netless/app-slide 0.2.72 → 0.2.74-beta.0

package/package.json

@@ -1,16 +1,22 @@
 {
   "name": "@netless/app-slide",
-  "version": "0.2.72",
+  "version": "0.2.74-beta.0",
   "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.32",
+    "@netless/slide": "1.4.35",
     "@types/color-string": "^1.5.2",
     "color-string": "^1.9.1",
     "jspdf": "2.5.1",
@@ -24,11 +30,5 @@
     "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/helpers.ts

@@ -31,8 +31,8 @@ export function syncSceneWithSlide(
   if (!(page > 0) || !context.getIsWritable()) return;
 
   const scenePath = [baseScenePath, page].join("/");
-
-  if (room.scenePathType(scenePath) !== ("page" as ScenePathType.Page)) {
+  // 只有打开ppt用户，并且场景路径不是页面(未被其它用户创建出页面)，则需要同步场景
+  if (context.isAddApp && room.scenePathType(scenePath) !== ("page" as ScenePathType.Page)) {
     room.removeScenes(baseScenePath);
     const count = slide.slideCount;
     const scenes: { name: string }[] = [];
@@ -47,7 +47,10 @@ export function syncSceneWithSlide(
     currentScenePath = context.getView()?.focusScenePath || "";
   }
 
-  if (currentScenePath !== scenePath) {
+  if (
+    currentScenePath !== scenePath &&
+    room.scenePathType(scenePath) === ("page" as ScenePathType.Page)
+  ) {
     context.setScenePath(scenePath);
   }
 }

package/src/SlideController/index.ts

@@ -122,7 +122,7 @@ export class SlideController {
   public ready = false;
   private resolveReady!: (index: number) => void;
   public readonly readyPromise = new Promise<void>(resolve => {
-    this.resolveReady = (slideIndex) => {
+    this.resolveReady = slideIndex => {
       if (this.ready) {
         log("[Slide] render end", slideIndex);
       } else {
@@ -321,6 +321,7 @@ export class SlideController {
       whiteTracker: defaults.whiteTracker,
       timestamp: this.timestamp,
       skipActionWhenFrozen: true,
+      customLinks: options.customLinks,
     });
     if (import.meta.env.DEV) {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/src/SlideDocsViewer/index.ts

@@ -51,6 +51,7 @@ export class SlideDocsViewer {
   private readonly baseScenePath: string;
   private readonly appId: string;
   private isViewMounted = false;
+  private justSildeReadonly = false;
 
   public constructor({
     context,
@@ -106,11 +107,19 @@ export class SlideDocsViewer {
   public $whiteboardView!: HTMLDivElement;
   public $overlay!: HTMLDivElement;
 
+  public setJustSildeReadonly(justSildeReadonly: boolean) {
+    this.justSildeReadonly = justSildeReadonly;
+    this.slideController?.slide.setInteractive(!this.justSildeReadonly);
+  }
+
   public render() {
     this.viewer.$content.appendChild(this.renderSlideContainer());
     this.viewer.$content.appendChild(this.renderWhiteboardView());
     this.viewer.$content.appendChild(this.renderOverlay());
     this.sideEffect.addEventListener(window, "keydown", ev => {
+      if (this.justSildeReadonly) {
+        return;
+      }
       if (this.box.focus && this.slideController && !isEditable(ev.target)) {
         switch (ev.key) {
           case "ArrowUp":

package/src/index.ts

@@ -44,6 +44,7 @@ export interface AppOptions
     | "fixedFrameSize"
     | "logger"
     | "enableGlobalClick"
+    | "customLinks"
   > {
   /** show debug controller */
   debug?: boolean;
@@ -71,6 +72,8 @@ export interface AppOptions
   showRenderError?: boolean;
   /** Specify the behavior after hiding the slide; Freeze will destroy the slide and replace it with a snapshot, while Pause simply pauses the slide @default: 'frozen' */
   invisibleBehavior?: "frozen" | "pause";
+  /** just readonly, no operate silder */
+  justSildeReadonly?: true;
 }
 
 export interface ILogger {
@@ -89,6 +92,7 @@ export interface AppResult {
   nextPage: () => boolean;
   prevPage: () => boolean;
   jumpToPage: (page: number) => boolean;
+  setSildeReadonly: (bol: boolean) => void;
 }
 
 const SlideApp: NetlessApp<Attributes, MagixEvents, AppOptions, AppResult> = {
@@ -192,6 +196,10 @@ const SlideApp: NetlessApp<Attributes, MagixEvents, AppOptions, AppResult> = {
       },
     });
 
+    if (context.getAppOptions()?.justSildeReadonly) {
+      docsViewer?.setJustSildeReadonly(true);
+    }
+
     if (import.meta.env.DEV) {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       (window as any).slideDoc = docsViewer;
@@ -233,6 +241,9 @@ const SlideApp: NetlessApp<Attributes, MagixEvents, AppOptions, AppResult> = {
     docsViewer.mount();
 
     return {
+      setSildeReadonly: (bol: boolean) => {
+        docsViewer?.setJustSildeReadonly(bol);
+      },
       viewer: () => {
         return docsViewer;
       },

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2020 netless
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.