@netless/app-presentation 0.1.9-beta.3 → 0.1.9-beta.5

package/dist/index.d.ts

@@ -311,7 +311,7 @@ interface ScrollbarEventCallback {
     onScrollbarDragEnd?: () => void;
     onScrollbarDragX?: (x: number) => void;
     onScrollbarDragY?: (y: number) => void;
-    onScrollCameraUpdated?: (originScale: number, scale: number) => void;
+    onScrollCameraUpdated?: (appid: string, originScale: number, scale: number) => void;
 }
 
 type Logger = (...data: any[]) => void;
@@ -380,6 +380,8 @@ interface PresentationController {
     }) => void;
     /** get the origin scale */
     getOriginScale: () => number;
+    /** get the view scale */
+    getScale: () => number;
 }
 
 declare const NetlessAppPresentation: NetlessApp<{}, {}, PresentationAppOptions, PresentationController>;

package/dist/index.global.js

@@ -6821,6 +6821,7 @@ var NetlessAppPresentation = (function (exports) {
       this.namespace = "netless-app-presentation";
       this.scrollContainer = document.createElement("div");
       this.option = {
+        appId: "",
         getPageSize: () => {
           return {
             width: 0,
@@ -6850,7 +6851,7 @@ var NetlessAppPresentation = (function (exports) {
           this.scrollbarY.style.display = ratio === 1 ? "none" : "block";
           this.scrollbarY.style.transform = `translateY(${scrollY}px)`;
         }
-        (_b = (_a = this.option.scrollbarEventCallback) == null ? void 0 : _a.onScrollCameraUpdated) == null ? void 0 : _b.call(_a, originScale, scale);
+        (_b = (_a = this.option.scrollbarEventCallback) == null ? void 0 : _a.onScrollCameraUpdated) == null ? void 0 : _b.call(_a, this.appId, originScale, scale);
       }, 50);
       this.onDragStart = () => {
         var _a, _b;
@@ -6911,6 +6912,7 @@ var NetlessAppPresentation = (function (exports) {
       this.scrollContainer.className = this.c("scrollbar-container");
       this.container = container;
       this.option = option;
+      this.appId = option.appId;
       this.readonly = option.readonly || false;
       this.view = view;
       this.init();
@@ -6920,9 +6922,8 @@ var NetlessAppPresentation = (function (exports) {
     }
     setReadonly(bol) {
       this.readonly = bol;
-      if (this.readonly) {
-        this.destroy();
-      } else {
+      this.destroy();
+      if (!this.readonly) {
         this.init();
       }
     }
@@ -6987,16 +6988,27 @@ var NetlessAppPresentation = (function (exports) {
       this.onCameraUpdated();
     }
     destroy() {
-      var _a, _b, _c, _d;
       this.view.callbacks.off("onCameraUpdated", this.onCameraUpdated);
-      (_a = this.scrollbarX) == null ? void 0 : _a.remove();
-      (_b = this.scrollbarY) == null ? void 0 : _b.remove();
-      this.scrollbarX = void 0;
-      this.scrollbarY = void 0;
-      (_c = this.draggableX) == null ? void 0 : _c.destroy();
-      (_d = this.draggableY) == null ? void 0 : _d.destroy();
-      this.draggableX = void 0;
-      this.draggableY = void 0;
+      if (this.scrollbarX && this.scrollbarContainerX) {
+        this.scrollbarContainerX.removeChild(this.scrollbarX);
+        this.scrollbarX.remove();
+        this.scrollbarContainerX.remove();
+        this.scrollbarX = void 0;
+      }
+      if (this.scrollbarY && this.scrollbarContainerY) {
+        this.scrollbarContainerY.removeChild(this.scrollbarY);
+        this.scrollbarY.remove();
+        this.scrollbarContainerY.remove();
+        this.scrollbarY = void 0;
+      }
+      if (this.draggableX) {
+        this.draggableX.destroy();
+        this.draggableX = void 0;
+      }
+      if (this.draggableY) {
+        this.draggableY.destroy();
+        this.draggableY = void 0;
+      }
     }
   };
 
@@ -7233,7 +7245,7 @@ var NetlessAppPresentation = (function (exports) {
       dispose2.add(view$$.addStateChangedListener(() => syncViewFromRemote(false, true)));
       const box = context.getBox();
       const app = dispose2.add(createPresentation(box, pages, jumpPage, pageIndex$, options.thumbnail));
-      app.contentDOM.dataset.appPresentationVersion = "0.1.9-beta.3";
+      app.contentDOM.dataset.appPresentationVersion = "0.1.9-beta.5";
       app.scaleDocsToFit = scaleDocsToFit;
       app.log = log;
       if (options.justDocsViewReadonly) {
@@ -7277,6 +7289,9 @@ var NetlessAppPresentation = (function (exports) {
         const { width, height } = getPageSize();
         return Math.min(size.height / height, size.width / width);
       };
+      const getScale = () => {
+        return view.camera.scale;
+      };
       const moveCamera = (camera) => {
         if (context.getIsWritable()) {
           view.moveCamera(__spreadProps(__spreadValues({}, camera), { animationMode: "immediately" }));
@@ -7289,6 +7304,7 @@ var NetlessAppPresentation = (function (exports) {
       if (options.useScrollbar) {
         dispose2.make(() => {
           scrollbar = new Scrollbar(app.contentDOM, {
+            appId: context.appId,
             getPageSize,
             getOriginScale,
             syncView,
@@ -7421,7 +7437,7 @@ var NetlessAppPresentation = (function (exports) {
           scrollbar.setReadonly(bol);
         }
       };
-      const controller = { app, view, context, jumpPage, prevPage, nextPage, pageState, toPdf, log, setDocsViewReadonly, setReadonly, moveCamera, getOriginScale };
+      const controller = { app, view, context, jumpPage, prevPage, nextPage, pageState, toPdf, log, setDocsViewReadonly, setReadonly, moveCamera, getOriginScale, getScale };
       dispose2.add(listen(window, "message", (ev) => {
         if (ev.data === "@netless/_presentation_") {
           if (typeof window !== "undefined")
@@ -7477,7 +7493,7 @@ var NetlessAppPresentation = (function (exports) {
   };
 
   // src/index.ts
-  var version = "0.1.9-beta.3";
+  var version = "0.1.9-beta.5";
   /*! Bundled license information:
 
   lodash/lodash.js:

package/dist/index.js

@@ -6822,6 +6822,7 @@ var Scrollbar = class {
     this.namespace = "netless-app-presentation";
     this.scrollContainer = document.createElement("div");
     this.option = {
+      appId: "",
       getPageSize: () => {
         return {
           width: 0,
@@ -6851,7 +6852,7 @@ var Scrollbar = class {
         this.scrollbarY.style.display = ratio === 1 ? "none" : "block";
         this.scrollbarY.style.transform = `translateY(${scrollY}px)`;
       }
-      (_b = (_a = this.option.scrollbarEventCallback) == null ? void 0 : _a.onScrollCameraUpdated) == null ? void 0 : _b.call(_a, originScale, scale);
+      (_b = (_a = this.option.scrollbarEventCallback) == null ? void 0 : _a.onScrollCameraUpdated) == null ? void 0 : _b.call(_a, this.appId, originScale, scale);
     }, 50);
     this.onDragStart = () => {
       var _a, _b;
@@ -6912,6 +6913,7 @@ var Scrollbar = class {
     this.scrollContainer.className = this.c("scrollbar-container");
     this.container = container;
     this.option = option;
+    this.appId = option.appId;
     this.readonly = option.readonly || false;
     this.view = view;
     this.init();
@@ -6921,9 +6923,8 @@ var Scrollbar = class {
   }
   setReadonly(bol) {
     this.readonly = bol;
-    if (this.readonly) {
-      this.destroy();
-    } else {
+    this.destroy();
+    if (!this.readonly) {
       this.init();
     }
   }
@@ -6988,16 +6989,27 @@ var Scrollbar = class {
     this.onCameraUpdated();
   }
   destroy() {
-    var _a, _b, _c, _d;
     this.view.callbacks.off("onCameraUpdated", this.onCameraUpdated);
-    (_a = this.scrollbarX) == null ? void 0 : _a.remove();
-    (_b = this.scrollbarY) == null ? void 0 : _b.remove();
-    this.scrollbarX = void 0;
-    this.scrollbarY = void 0;
-    (_c = this.draggableX) == null ? void 0 : _c.destroy();
-    (_d = this.draggableY) == null ? void 0 : _d.destroy();
-    this.draggableX = void 0;
-    this.draggableY = void 0;
+    if (this.scrollbarX && this.scrollbarContainerX) {
+      this.scrollbarContainerX.removeChild(this.scrollbarX);
+      this.scrollbarX.remove();
+      this.scrollbarContainerX.remove();
+      this.scrollbarX = void 0;
+    }
+    if (this.scrollbarY && this.scrollbarContainerY) {
+      this.scrollbarContainerY.removeChild(this.scrollbarY);
+      this.scrollbarY.remove();
+      this.scrollbarContainerY.remove();
+      this.scrollbarY = void 0;
+    }
+    if (this.draggableX) {
+      this.draggableX.destroy();
+      this.draggableX = void 0;
+    }
+    if (this.draggableY) {
+      this.draggableY.destroy();
+      this.draggableY = void 0;
+    }
   }
 };
 
@@ -7234,7 +7246,7 @@ var NetlessAppPresentation = {
     dispose2.add(view$$.addStateChangedListener(() => syncViewFromRemote(false, true)));
     const box = context.getBox();
     const app = dispose2.add(createPresentation(box, pages, jumpPage, pageIndex$, options.thumbnail));
-    app.contentDOM.dataset.appPresentationVersion = "0.1.9-beta.3";
+    app.contentDOM.dataset.appPresentationVersion = "0.1.9-beta.5";
     app.scaleDocsToFit = scaleDocsToFit;
     app.log = log;
     if (options.justDocsViewReadonly) {
@@ -7278,6 +7290,9 @@ var NetlessAppPresentation = {
       const { width, height } = getPageSize();
       return Math.min(size.height / height, size.width / width);
     };
+    const getScale = () => {
+      return view.camera.scale;
+    };
     const moveCamera = (camera) => {
       if (context.getIsWritable()) {
         view.moveCamera(__spreadProps(__spreadValues({}, camera), { animationMode: "immediately" }));
@@ -7290,6 +7305,7 @@ var NetlessAppPresentation = {
     if (options.useScrollbar) {
       dispose2.make(() => {
         scrollbar = new Scrollbar(app.contentDOM, {
+          appId: context.appId,
           getPageSize,
           getOriginScale,
           syncView,
@@ -7422,7 +7438,7 @@ var NetlessAppPresentation = {
         scrollbar.setReadonly(bol);
       }
     };
-    const controller = { app, view, context, jumpPage, prevPage, nextPage, pageState, toPdf, log, setDocsViewReadonly, setReadonly, moveCamera, getOriginScale };
+    const controller = { app, view, context, jumpPage, prevPage, nextPage, pageState, toPdf, log, setDocsViewReadonly, setReadonly, moveCamera, getOriginScale, getScale };
     dispose2.add(listen(window, "message", (ev) => {
       if (ev.data === "@netless/_presentation_") {
         if (typeof window !== "undefined")
@@ -7478,7 +7494,7 @@ var install = (register, options = {}) => {
 };
 
 // src/index.ts
-var version = "0.1.9-beta.3";
+var version = "0.1.9-beta.5";
 /*! Bundled license information:
 
 lodash/lodash.js: