@netless/forge-whiteboard 0.1.5 → 0.1.7

package/dist/WhiteboardApplication.d.ts

@@ -34,6 +34,8 @@ export declare class WhiteboardApplication extends AbstractApplication<Whiteboar
     private paperScope;
     private canvasElement;
     private shadowScope;
+    private snapshotCanvasElement;
+    private snapshotScope;
     private shadowCanvasElement;
     private shadowEmitter;
     private tools;

package/dist/WhiteboardApplication.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WhiteboardApplication.d.ts","sourceRoot":"","sources":["../src/WhiteboardApplication.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,mBAAmB,EAAC,MAAM,qBAAqB,CAAC;AASxD,OAAO,EAAC,YAAY,EAAE,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAUhE,OAAO,EAAyC,UAAU,EAAC,MAAM,cAAc,CAAC;AAchF;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC7B;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;CAC/C;AAED,eAAO,MAAM,mBAAmB,eAAe,CAAC;AAEhD,MAAM,MAAM,kBAAkB,GAC1B,OAAO,GACL,WAAW,GACX,UAAU,GACV,MAAM,GACN,OAAO,GACP,MAAM,GACN,SAAS,GACT,UAAU,GACV,QAAQ,GACR,OAAO,GACP,MAAM,CAAC;AAEb,qBAAa,qBAAsB,SAAQ,mBAAmB,CAAC,gBAAgB,EAAE,UAAU,CAAC;IAExF,MAAM,CAAC,eAAe,SAAuB;IAE7C,SAAgB,IAAI,EAAE,MAAM,CAAuB;IAC5C,OAAO,EAAE,UAAU,CAAC;IAEpB,YAAY,EAAG,YAAY,CAAC;IACnC,OAAO,CAAC,mBAAmB,CAAuB;IAClD,OAAO,CAAC,oBAAoB,CAAwB;IACpD,OAAO,CAAC,SAAS,CAAa;IAC9B,OAAO,CAAC,MAAM,CAA2C;IACzD,OAAO,CAAC,YAAY,CAAyC;IAE7D,OAAO,CAAC,WAAW,CAAiD;IACpE,OAAO,CAAC,UAAU,CAA4C;IAC9D,OAAO,CAAC,aAAa,CAAuD;IAC5E,OAAO,CAAC,WAAW,CAA4C;IAC/D,OAAO,CAAC,mBAAmB,CAAuD;IAClF,OAAO,CAAC,aAAa,CAAiB;IACtC,OAAO,CAAC,KAAK,CAA8C;IAC3D,OAAO,CAAC,OAAO,CAAkC;IACjD,OAAO,CAAC,MAAM,CAAU;IACxB,OAAO,CAAC,cAAc,CAAkB;IACxC,OAAO,CAAC,MAAM,CAAoB;IAClC,OAAO,CAAC,WAAW,CAAyB;IAE5C,OAAO,CAAC,SAAS,CAAwB;IACzC,OAAO,CAAC,UAAU,CAAkB;IACpC,OAAO,CAAC,WAAW,CAAwB;IAE3C,OAAO,KAAK,WAAW,GAMtB;;IA+MD,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,eAAe,CAErB;IAEW,UAAU,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IA2NhE,OAAO,CAAC,gBAAgB,CA6CtB;IAEF,OAAO,CAAC,aAAa,CAEnB;IAEF,OAAO,CAAC,oBAAoB,CAI1B;IAEF,OAAO,CAAC,qBAAqB,CAG3B;IAEF,OAAO,CAAC,kBAAkB,CAmCxB;IAEF,OAAO,CAAC,aAAa;IAkBrB,OAAO,CAAC,yBAAyB,CAQhC;IAED,OAAO,CAAC,kBAAkB,CAExB;IAEF,OAAO,CAAC,gBAAgB;IAmBxB,OAAO,CAAC,mBAAmB,CAazB;IAEF,OAAO,CAAC,qBAAqB;IAY7B,OAAO,CAAC,mBAAmB,CAUzB;IAEF,OAAO,CAAC,iCAAiC,CAGvC;IAEF,OAAO,CAAC,mBAAmB,CAczB;IAEF,OAAO,CAAC,oBAAoB,CAqD1B;IAEK,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IA+C9D,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAcxC"}
+{"version":3,"file":"WhiteboardApplication.d.ts","sourceRoot":"","sources":["../src/WhiteboardApplication.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,mBAAmB,EAAM,MAAM,qBAAqB,CAAC;AAS7D,OAAO,EAAC,YAAY,EAAE,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAUhE,OAAO,EAAyC,UAAU,EAAC,MAAM,cAAc,CAAC;AAchF;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC7B;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;CAC/C;AAED,eAAO,MAAM,mBAAmB,eAAe,CAAC;AAEhD,MAAM,MAAM,kBAAkB,GAC1B,OAAO,GACL,WAAW,GACX,UAAU,GACV,MAAM,GACN,OAAO,GACP,MAAM,GACN,SAAS,GACT,UAAU,GACV,QAAQ,GACR,OAAO,GACP,MAAM,CAAC;AAEb,qBAAa,qBAAsB,SAAQ,mBAAmB,CAAC,gBAAgB,EAAE,UAAU,CAAC;IAExF,MAAM,CAAC,eAAe,SAAuB;IAE7C,SAAgB,IAAI,EAAE,MAAM,CAAuB;IAC5C,OAAO,EAAE,UAAU,CAAC;IAEpB,YAAY,EAAG,YAAY,CAAC;IACnC,OAAO,CAAC,mBAAmB,CAAuB;IAClD,OAAO,CAAC,oBAAoB,CAAwB;IACpD,OAAO,CAAC,SAAS,CAAa;IAC9B,OAAO,CAAC,MAAM,CAA2C;IACzD,OAAO,CAAC,YAAY,CAAyC;IAE7D,OAAO,CAAC,WAAW,CAAiD;IACpE,OAAO,CAAC,UAAU,CAA4C;IAC9D,OAAO,CAAC,aAAa,CAAuD;IAC5E,OAAO,CAAC,WAAW,CAA4C;IAC/D,OAAO,CAAC,qBAAqB,CAAuD;IACpF,OAAO,CAAC,aAAa,CAA4C;IACjE,OAAO,CAAC,mBAAmB,CAAuD;IAClF,OAAO,CAAC,aAAa,CAAiB;IACtC,OAAO,CAAC,KAAK,CAA8C;IAC3D,OAAO,CAAC,OAAO,CAAkC;IACjD,OAAO,CAAC,MAAM,CAAU;IACxB,OAAO,CAAC,cAAc,CAAkB;IACxC,OAAO,CAAC,MAAM,CAAoB;IAClC,OAAO,CAAC,WAAW,CAAyB;IAE5C,OAAO,CAAC,SAAS,CAAwB;IACzC,OAAO,CAAC,UAAU,CAAkB;IACpC,OAAO,CAAC,WAAW,CAAwB;IAE3C,OAAO,KAAK,WAAW,GAMtB;;IAsND,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,eAAe,CAErB;IAEW,UAAU,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAuOhE,OAAO,CAAC,gBAAgB,CA6CtB;IAEF,OAAO,CAAC,aAAa,CAEnB;IAEF,OAAO,CAAC,oBAAoB,CAI1B;IAEF,OAAO,CAAC,qBAAqB,CAG3B;IAEF,OAAO,CAAC,kBAAkB,CAmCxB;IAEF,OAAO,CAAC,aAAa;IAkBrB,OAAO,CAAC,yBAAyB,CAQhC;IAED,OAAO,CAAC,kBAAkB,CAExB;IAEF,OAAO,CAAC,gBAAgB;IAmBxB,OAAO,CAAC,mBAAmB,CAazB;IAEF,OAAO,CAAC,qBAAqB;IAY7B,OAAO,CAAC,mBAAmB,CAUzB;IAEF,OAAO,CAAC,iCAAiC,CAGvC;IAEF,OAAO,CAAC,mBAAmB,CAczB;IAEF,OAAO,CAAC,oBAAoB,CAqD1B;IAEK,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IA4C9D,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAexC"}

package/dist/whiteboard.esm.js

@@ -25362,7 +25362,7 @@ var require_lodash = __commonJS({
 
 // src/WhiteboardApplication.ts
 var import_paper = __toESM(require_paper_full(), 1);
-import { AbstractApplication } from "@netless/forge-room";
+import { AbstractApplication, log as log3 } from "@netless/forge-room";
 import * as Y15 from "yjs";
 
 // src/model/RenderableModel.ts
@@ -27751,7 +27751,7 @@ var ToolbarModel = class extends EventEmitter3 {
     this.root = root;
     this.root.observe(this.handleRootUpdate);
     Object.keys(defaultStyle).forEach((key) => {
-      if (!this.root.has(key)) {
+      if (!this.root.has(key) || this.root.get(key) === void 0) {
         this.root.set(key, defaultStyle[key]);
       }
     });
@@ -29983,6 +29983,8 @@ var WhiteboardApplication = class extends AbstractApplication {
   paperScope = new import_paper.default.PaperScope();
   canvasElement = document.createElement("canvas");
   shadowScope = new import_paper.default.PaperScope();
+  snapshotCanvasElement = document.createElement("canvas");
+  snapshotScope = new import_paper.default.PaperScope();
   shadowCanvasElement = document.createElement("canvas");
   shadowEmitter;
   tools;
@@ -30137,6 +30139,12 @@ var WhiteboardApplication = class extends AbstractApplication {
       this.inputType = type;
       this.emitter.emit("inputTypeChange", this.inputType);
     };
+    this.emitter.on("error", (errorCode, errorMessage) => {
+      log3("WhiteboardApplicationError", {
+        errorCode,
+        errorMessage
+      });
+    });
     const that = this;
     Object.defineProperty(this.emitter, "tool", {
       get() {
@@ -30282,10 +30290,19 @@ var WhiteboardApplication = class extends AbstractApplication {
       grab: new GrabTool(this.enableToolEvent, this.getCurrentRenderableModel, this.shadowEmitter, this.paperScope, this.camera)
     };
     this.toolbarModel.on("update", (style) => {
-      this.paperScope.tool = this.tools[style.tool].tool;
+      if (this.tools[style.tool]) {
+        this.paperScope.tool = this.tools[style.tool].tool;
+      } else {
+        this.emitter.emit("error", 300001, `${style.tool} not supported`);
+      }
       this.emitter.emit("toolbarStyleChange", style);
     });
-    this.paperScope.tool = this.tools[this.toolbarModel.currentTool].tool;
+    if (this.tools[this.toolbarModel.currentTool]) {
+      this.paperScope.tool = this.tools[this.toolbarModel.currentTool].tool;
+    } else {
+      this.paperScope.tool = this.tools["curve"].tool;
+      log3(`${this.toolbarModel.currentTool} not supported, backup to curve`);
+    }
     this.selectElementsModel.on("elementsChange", this.handleElementsSelect);
     this.trashedElementsModel.on("elementsChange", this.handleElementsTrash);
     this.trashedElementsModel.on("removeElementForSelf", this.handleRemoveTrashedElementForSelf);
@@ -30304,6 +30321,7 @@ var WhiteboardApplication = class extends AbstractApplication {
     this.rootElement.appendChild(this.shadowCanvasElement);
     this.shadowScope.setup(this.shadowCanvasElement);
     this.shadowScope.settings.insertItems = false;
+    this.snapshotScope.setup(this.snapshotCanvasElement);
     this.resizeObserver = new ResizeObserver(() => {
       const rootBounds = this.rootElement.getBoundingClientRect();
       const minWidth = Math.max(rootBounds.width, 10);
@@ -30503,7 +30521,7 @@ var WhiteboardApplication = class extends AbstractApplication {
   getCurrentRenderableModel = () => {
     let layerId = this.userMap(this.userId).get(WhiteboardKeys.currentPage);
     if (!this.layers.has(layerId)) {
-      this.emitter.emit("error", 20001, `target page: ${layerId} not found`);
+      this.emitter.emit("error", 300002, `target page: ${layerId} not found`);
     }
     return this.layers.get(layerId);
   };
@@ -30640,11 +30658,9 @@ var WhiteboardApplication = class extends AbstractApplication {
     if (!renderableModel) {
       return Promise.resolve(null);
     }
-    const scope = new import_paper.default.PaperScope();
-    const canvas = document.createElement("canvas");
-    scope.setup(canvas);
-    scope.view.matrix = this.paperScope.project.view.matrix.clone();
-    scope.view.viewSize = this.paperScope.project.view.viewSize.clone();
+    this.snapshotScope.project.activeLayer.removeChildren();
+    this.snapshotScope.view.matrix = this.paperScope.project.view.matrix.clone();
+    this.snapshotScope.view.viewSize = this.paperScope.project.view.viewSize.clone();
     for (const key of Array.from(renderableModel.elements.keys())) {
       let elementModel = null;
       if (renderableModel.elementModels.has(key)) {
@@ -30661,14 +30677,13 @@ var WhiteboardApplication = class extends AbstractApplication {
         }
         if (elementModel.item) {
           const paperItem = elementModel.item.clone({ insert: false });
-          scope.project.activeLayer.addChild(paperItem);
+          this.snapshotScope.project.activeLayer.addChild(paperItem);
         }
       }
     }
-    document.body.appendChild(scope.view.element);
     return new Promise((resolve) => {
       setTimeout(() => {
-        resolve(scope.view.element.toDataURL("image/png"));
+        resolve(this.snapshotScope.view.element.toDataURL("image/png"));
       }, 32);
     });
   }
@@ -30684,6 +30699,7 @@ var WhiteboardApplication = class extends AbstractApplication {
     this.rootElement.removeChild(this.shadowCanvasElement);
     this.paperScope.project.clear();
     this.shadowScope.project.clear();
+    this.snapshotScope.project.clear();
     this.resizeObserver.disconnect();
   }
 };