@netless/forge-whiteboard 0.1.5 → 0.1.7

package/dist/whiteboard.js

@@ -27761,7 +27761,7 @@ var ToolbarModel = class extends import_eventemitter33.default {
     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]);
       }
     });
@@ -29993,6 +29993,8 @@ var WhiteboardApplication = class extends import_forge_room3.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;
@@ -30147,6 +30149,12 @@ var WhiteboardApplication = class extends import_forge_room3.AbstractApplication
       this.inputType = type;
       this.emitter.emit("inputTypeChange", this.inputType);
     };
+    this.emitter.on("error", (errorCode, errorMessage) => {
+      (0, import_forge_room3.log)("WhiteboardApplicationError", {
+        errorCode,
+        errorMessage
+      });
+    });
     const that = this;
     Object.defineProperty(this.emitter, "tool", {
       get() {
@@ -30292,10 +30300,19 @@ var WhiteboardApplication = class extends import_forge_room3.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;
+      (0, import_forge_room3.log)(`${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);
@@ -30314,6 +30331,7 @@ var WhiteboardApplication = class extends import_forge_room3.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);
@@ -30513,7 +30531,7 @@ var WhiteboardApplication = class extends import_forge_room3.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);
   };
@@ -30650,11 +30668,9 @@ var WhiteboardApplication = class extends import_forge_room3.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)) {
@@ -30671,14 +30687,13 @@ var WhiteboardApplication = class extends import_forge_room3.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);
     });
   }
@@ -30694,6 +30709,7 @@ var WhiteboardApplication = class extends import_forge_room3.AbstractApplication
     this.rootElement.removeChild(this.shadowCanvasElement);
     this.paperScope.project.clear();
     this.shadowScope.project.clear();
+    this.snapshotScope.project.clear();
     this.resizeObserver.disconnect();
   }
 };