@netless/forge-slide 1.1.1 → 1.1.2

package/dist/slide.esm.js

@@ -35304,6 +35304,7 @@ import * as Y from "yjs";
 import { removeDeepObserver } from "@netless/forge-room";
 import * as Y3 from "yjs";
 import * as Y4 from "yjs";
+import { metrics } from "@netless/forge-room";
 import * as Y5 from "yjs";
 import * as Y6 from "yjs";
 import { removeObserver } from "@netless/forge-room";
@@ -58604,7 +58605,7 @@ var require_lodash = __commonJS2({
           result2.__values__ = wrapper.__values__;
           return result2;
         }
-        function chunk8(array, size2, guard) {
+        function chunk7(array, size2, guard) {
           if (guard ? isIterateeCall(array, size2, guard) : size2 === undefined2) {
             size2 = 1;
           } else {
@@ -60476,7 +60477,7 @@ var require_lodash = __commonJS2({
         lodash.bindKey = bindKey;
         lodash.castArray = castArray;
         lodash.chain = chain;
-        lodash.chunk = chunk8;
+        lodash.chunk = chunk7;
         lodash.compact = compact;
         lodash.concat = concat;
         lodash.cond = cond;
@@ -61100,7 +61101,6 @@ function me(e, t = {}) {
 function ae(e, t = {}) {
   return ce(me(e, t), t);
 }
-var import_lodash = __toESM2(require_lodash(), 1);
 function _defineProperty(e, r, t) {
   return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: true, configurable: true, writable: true }) : e[r] = t, e;
 }
@@ -61483,35 +61483,37 @@ var CurveModel = class extends ElementModel {
   constructor(root, scope, liveCursor, isPerformanceMode) {
     super(root, scope, liveCursor, isPerformanceMode);
     _defineProperty3(this, "item", null);
-    _defineProperty3(this, "debugPath", void 0);
     _defineProperty3(this, "debug", false);
     _defineProperty3(this, "clearLocalPointsWhenYPointsChange", false);
     _defineProperty3(this, "shouldUseLocalPoints", true);
-    _defineProperty3(this, "localPointsPick", 4);
+    _defineProperty3(this, "localPointsPick", 6);
     if (!this.root.doc || !this.root.has("type")) {
       this.root.set("type", "curve");
     }
     if (!this.root.doc || !this.root.has("points")) {
       this.root.set("points", new Y2.Array());
     }
-    this.debugPath = new scope.Path();
   }
   average(a2, b2) {
     return (a2 + b2) / 2;
   }
   parsePoints(points) {
+    const hasRealPressure = points.some((p) => p.length >= 3 && p[2] > 0);
+    const viewScale = this.scope.project.view.matrix.scaling.x || 1;
+    const taper = this.strokeWidth * 5 / viewScale;
+    const streamline = Math.min(0.7, 0.7 * viewScale);
     return ae(points, {
       size: this.strokeWidth,
-      smoothing: 0.5,
-      thinning: -0.5,
-      streamline: 0.5,
-      simulatePressure: true,
+      smoothing: 0.7,
+      thinning: 0.5,
+      streamline,
+      simulatePressure: !hasRealPressure,
       start: {
-        taper: this.strokeWidth * 10,
+        taper,
         cap: true
       },
       end: {
-        taper: this.strokeWidth * 20,
+        taper,
         cap: true
       }
     });
@@ -61520,10 +61522,11 @@ var CurveModel = class extends ElementModel {
     const points = this.localPoints.length === 0 ? this.points : this.localPoints;
     const matrix = new this.scope.Matrix(this.pointsMatrix);
     const output = [];
-    for (let i = 0, len = points.length; i < len; i += 2) {
+    for (let i = 0, len = points.length; i < len; i += 3) {
       const p = new this.scope.Point(points[i], points[i + 1]);
       const tp = p.transform(matrix);
-      output.push([tp.x, tp.y]);
+      const pressure = points[i + 2] ?? 0;
+      output.push([tp.x, tp.y, pressure]);
     }
     return output;
   }
@@ -61552,34 +61555,30 @@ var CurveModel = class extends ElementModel {
     }
     return path;
   }
-  updateDebugPath() {
-    this.debugPath = new this.scope.Path();
-    const points = (0, import_lodash.chunk)(this.points, 2);
-    for (let i = 0, len = points.length; i < len; i++) {
-      const point = new this.scope.Point(points[i][0], points[i][1]);
-      if (i === 0) {
-        this.debugPath.moveTo(point);
-      } else {
-        this.debugPath.lineTo(point);
-      }
-      this.debugPath.strokeWidth = 1;
-      this.debugPath.strokeColor = new this.scope.Color(1, 0, 0, 1);
-    }
-  }
   onVectorUpdate() {
     if (!this.item) {
       return;
     }
+    const matrixedPts = this.matrixedPoints();
     if (this.debug) {
-      this.debugPath.remove();
-      this.updateDebugPath();
-    }
-    const points = this.parsePoints(this.matrixedPoints());
-    const path = this.createPath(points);
-    this.item.removeSegments();
-    this.item.addSegments(path.segments);
-    if (this.debug) {
-      this.item.addChild(this.debugPath);
+      const path = new this.scope.Path();
+      for (let i = 0; i < matrixedPts.length; i++) {
+        const p = new this.scope.Point(matrixedPts[i][0], matrixedPts[i][1]);
+        if (i === 0) {
+          path.moveTo(p);
+        } else {
+          path.lineTo(p);
+        }
+      }
+      this.item.removeSegments();
+      this.item.addSegments(path.segments);
+      this.item.fillColor = null;
+      this.item.strokeWidth = this.strokeWidth;
+    } else {
+      const points = this.parsePoints(matrixedPts);
+      const path = this.createPath(points);
+      this.item.removeSegments();
+      this.item.addSegments(path.segments);
     }
   }
   createPaperItem() {
@@ -61602,11 +61601,11 @@ var CurveModel = class extends ElementModel {
   }
   liveCursorPoint() {
     const yArray = this.root.get(ElementModel.KEYS.points);
-    if (yArray.length < 2) {
+    if (yArray.length < 3) {
       return null;
     }
     const len = yArray.length;
-    const point = new this.scope.Point(yArray.get(len - 2), yArray.get(len - 1));
+    const point = new this.scope.Point(yArray.get(len - 3), yArray.get(len - 2));
     return point.transform(new this.scope.Matrix(this.pointsMatrix));
   }
   onStyleKeyUpdate(key) {
@@ -61699,7 +61698,7 @@ var SelectorModel = class extends ElementModel {
   onStyleKeyUpdate(_key) {
   }
 };
-var import_lodash2 = __toESM2(require_lodash(), 1);
+var import_lodash = __toESM2(require_lodash(), 1);
 function _defineProperty5(e, r, t) {
   return (r = _toPropertyKey5(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: true, configurable: true, writable: true }) : e[r] = t, e;
 }
@@ -61732,7 +61731,7 @@ function serializePath(path) {
   }, []);
 }
 function deserializePath(points, scope, matrix) {
-  const segmentGroup = (0, import_lodash2.chunk)(points, 6);
+  const segmentGroup = (0, import_lodash.chunk)(points, 6);
   const path = new scope.Path();
   path.segments = segmentGroup.map((v) => deserializeSegment(v, scope, matrix));
   return path;
@@ -61742,7 +61741,27 @@ var AnimationFrame = class {
     _defineProperty5(this, "callbacks", []);
     _defineProperty5(this, "lastTime", 0);
     _defineProperty5(this, "fps", 45);
+    _defineProperty5(this, "lastCallbackTime", 0);
+    _defineProperty5(this, "fpsBuffer", []);
+    _defineProperty5(this, "FPS_REPORT_INTERVAL", 2700);
     _defineProperty5(this, "handleCallbacks", () => {
+      const now = performance.now();
+      if (this.lastCallbackTime > 0) {
+        const actualFps = 1e3 / (now - this.lastCallbackTime);
+        this.fpsBuffer.push(actualFps);
+        if (this.fpsBuffer.length >= this.FPS_REPORT_INTERVAL) {
+          const avg = this.fpsBuffer.reduce((a2, b2) => a2 + b2, 0) / this.fpsBuffer.length;
+          const min = Math.min(...this.fpsBuffer);
+          const sorted = [...this.fpsBuffer].sort((a2, b2) => a2 - b2);
+          const p90 = sorted[Math.floor(sorted.length * 0.9)];
+          metrics().gauge("fps", Math.round(avg), {
+            min: Math.round(min),
+            p90: Math.round(p90)
+          });
+          this.fpsBuffer = [];
+        }
+      }
+      this.lastCallbackTime = now;
       const functions = this.callbacks;
       this.callbacks = [];
       for (let i = 0, l2 = functions.length; i < l2; i++) {
@@ -61850,7 +61869,7 @@ var SegmentsModel = class extends ElementModel {
   onStyleKeyUpdate(_key) {
   }
 };
-var import_lodash4 = __toESM2(require_lodash(), 1);
+var import_lodash3 = __toESM2(require_lodash(), 1);
 function _defineProperty7(e, r, t) {
   return (r = _toPropertyKey7(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: true, configurable: true, writable: true }) : e[r] = t, e;
 }
@@ -61868,6 +61887,8 @@ function _toPrimitive7(t, r) {
   }
   return ("string" === r ? String : Number)(t);
 }
+var DRAG_FPS = 10;
+var DRAG_FRAME_MS = 1e3 / DRAG_FPS;
 var WhiteboardTool = class {
   constructor(enableToolEvent, modelGetter, shadowEmitter, scope) {
     _defineProperty7(this, "modelGetter", void 0);
@@ -61876,24 +61897,60 @@ var WhiteboardTool = class {
     _defineProperty7(this, "shadowEmitter", void 0);
     _defineProperty7(this, "enableToolEvent", void 0);
     _defineProperty7(this, "eventAvailable", false);
+    _defineProperty7(this, "lastDragTime", 0);
+    _defineProperty7(this, "dragRafId", 0);
+    _defineProperty7(this, "pendingDragEvent", null);
     _defineProperty7(this, "onMouseDownSelf", (event) => {
       this.eventAvailable = this.enableToolEvent();
       if (!this.eventAvailable) {
         return;
       }
+      this.lastDragTime = 0;
+      if (this.dragRafId) {
+        cancelAnimationFrame(this.dragRafId);
+        this.dragRafId = 0;
+      }
+      this.pendingDragEvent = null;
       this.shadowEmitter.setActive(true);
       this.onMouseDown(event);
     });
+    _defineProperty7(this, "flushPendingDrag", () => {
+      this.dragRafId = 0;
+      if (this.pendingDragEvent) {
+        this.lastDragTime = performance.now();
+        const event = this.pendingDragEvent;
+        this.pendingDragEvent = null;
+        this.onMouseDrag(event);
+      }
+    });
     _defineProperty7(this, "onMouseDragSelf", (event) => {
       if (!this.eventAvailable) {
         return;
       }
-      this.onMouseDrag(event);
+      const now = performance.now();
+      if (now - this.lastDragTime >= DRAG_FRAME_MS) {
+        this.lastDragTime = now;
+        this.pendingDragEvent = null;
+        this.onMouseDrag(event);
+      } else {
+        this.pendingDragEvent = event;
+        if (!this.dragRafId) {
+          this.dragRafId = requestAnimationFrame(this.flushPendingDrag);
+        }
+      }
     });
     _defineProperty7(this, "onMouseUpSelf", (event) => {
       if (!this.eventAvailable) {
         return;
       }
+      if (this.dragRafId) {
+        cancelAnimationFrame(this.dragRafId);
+        this.dragRafId = 0;
+      }
+      if (this.pendingDragEvent) {
+        this.onMouseDrag(this.pendingDragEvent);
+        this.pendingDragEvent = null;
+      }
       this.onMouseUp(event);
       this.shadowEmitter.setActive(false);
     });
@@ -61907,7 +61964,7 @@ var WhiteboardTool = class {
     this.tool.onMouseUp = this.onMouseUpSelf;
   }
 };
-var import_lodash3 = __toESM2(require_lodash(), 1);
+var import_lodash2 = __toESM2(require_lodash(), 1);
 function _defineProperty8(e, r, t) {
   return (r = _toPropertyKey8(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: true, configurable: true, writable: true }) : e[r] = t, e;
 }
@@ -61956,7 +62013,7 @@ var LineTool = class extends WhiteboardTool {
         const point = path.getPointAt(distance);
         return [point.x, point.y];
       });
-      this.elementModel.setPoints((0, import_lodash3.flattenDeep)(points));
+      this.elementModel.setPoints((0, import_lodash2.flattenDeep)(points));
     }
   }
   onMouseUp(_event) {
@@ -62037,7 +62094,7 @@ var LineModel = class extends ElementModel {
   }
   renderLine() {
     const matrix = new this.scope.Matrix(this.pointsMatrix);
-    const papperPoints = (0, import_lodash4.chunk)(this.drawPoints, 2).map((item) => {
+    const papperPoints = (0, import_lodash3.chunk)(this.drawPoints, 2).map((item) => {
       return new this.scope.Point(item[0], item[1]).transform(matrix);
     });
     const path = new this.scope.Path();
@@ -62173,7 +62230,7 @@ var LineControlPoint = class {
     const invertedPoint = point.transform(pointsMatrix.inverted());
     const points = this.model["drawPoints"];
     this.position = invertedPoint;
-    const clonedPoints = (0, import_lodash4.cloneDeep)(points);
+    const clonedPoints = (0, import_lodash3.cloneDeep)(points);
     clonedPoints[this.options.index * 2] = invertedPoint.x;
     clonedPoints[this.options.index * 2 + 1] = invertedPoint.y;
     this.model.setPoints(clonedPoints);
@@ -62639,7 +62696,7 @@ var RectangleModel = class extends ElementModel {
   }
 };
 var elementsUndoOrigin = "elementsUndoOrigin";
-var import_lodash5 = __toESM2(require_lodash(), 1);
+var import_lodash4 = __toESM2(require_lodash(), 1);
 function _defineProperty13(e, r, t) {
   return (r = _toPropertyKey13(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: true, configurable: true, writable: true }) : e[r] = t, e;
 }
@@ -62707,7 +62764,7 @@ var EraserModel = class extends ElementModel {
     return path;
   }
   parsePoints(points) {
-    const groupPoints = (0, import_lodash5.chunk)(points, 2);
+    const groupPoints = (0, import_lodash4.chunk)(points, 2);
     return ae(groupPoints, {
       size: this.strokeWidth,
       smoothing: 0.5,
@@ -62725,7 +62782,7 @@ var EraserModel = class extends ElementModel {
     });
   }
   matrixedPoints() {
-    const currentPoints = (0, import_lodash5.chunk)(this.drawPoints, 2).slice(this.sliceBegin);
+    const currentPoints = (0, import_lodash4.chunk)(this.drawPoints, 2).slice(this.sliceBegin);
     return currentPoints.map((_ref) => {
       let [x, y] = _ref;
       return new this.scope.Point(x, y);
@@ -62788,7 +62845,7 @@ var EraserModel = class extends ElementModel {
     return point.transform(new this.scope.Matrix(this.pointsMatrix));
   }
 };
-var import_lodash6 = __toESM2(require_lodash(), 1);
+var import_lodash5 = __toESM2(require_lodash(), 1);
 function _defineProperty14(e, r, t) {
   return (r = _toPropertyKey14(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: true, configurable: true, writable: true }) : e[r] = t, e;
 }
@@ -62905,7 +62962,7 @@ var LaserPointerModel = class extends ElementModel {
     const matrix = new this.scope.Matrix(this.pointsMatrix);
     const points = this.cachedPoints || this.points;
     console.log("[][][] ,", this.points.length, this.cachedPoints?.length, this.localPoints.length);
-    const groupPoints = (0, import_lodash6.chunk)(points, 2).slice(this.sliceBegin);
+    const groupPoints = (0, import_lodash5.chunk)(points, 2).slice(this.sliceBegin);
     return groupPoints.map((_ref) => {
       let [x, y] = _ref;
       return matrix.transform([x, y]);
@@ -62981,7 +63038,7 @@ var WhiteboardPermissions = class extends AbstractApplicationPermissions {
     return [WhiteboardPermissionFlag.draw, WhiteboardPermissionFlag.editSelf, WhiteboardPermissionFlag.editOthers, WhiteboardPermissionFlag.deleteSelf, WhiteboardPermissionFlag.deleteOthers, WhiteboardPermissionFlag.mainView, WhiteboardPermissionFlag.setOthersView].filter((v) => (v & value) !== 0);
   }
 };
-var import_lodash7 = __toESM2(require_lodash(), 1);
+var import_lodash6 = __toESM2(require_lodash(), 1);
 function _defineProperty15(e, r, t) {
   return (r = _toPropertyKey15(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: true, configurable: true, writable: true }) : e[r] = t, e;
 }
@@ -63040,7 +63097,7 @@ var StraightLineModel = class extends ElementModel {
   }
   renderLine() {
     const matrix = new this.scope.Matrix(this.pointsMatrix);
-    const papperPoints = (0, import_lodash7.chunk)(this.drawPoints, 2).map((item) => {
+    const papperPoints = (0, import_lodash6.chunk)(this.drawPoints, 2).map((item) => {
       return new this.scope.Point(item[0], item[1]).transform(matrix);
     });
     const path = new this.scope.Path();
@@ -63654,7 +63711,7 @@ var RenderableModel = class extends EventEmitter {
     });
   }
 };
-var import_lodash8 = __toESM2(require_lodash(), 1);
+var import_lodash7 = __toESM2(require_lodash(), 1);
 function Point(x, y) {
   this.X = x;
   this.Y = y;
@@ -63897,7 +63954,7 @@ var Recognizer = class {
     let maxX = -Number.MAX_VALUE;
     let minY = Number.MAX_VALUE;
     let maxY = -Number.MAX_VALUE;
-    const result = this.dollar.Recognize((0, import_lodash8.chunk)(points, 2).map((v) => {
+    const result = this.dollar.Recognize((0, import_lodash7.chunk)(points, 3).map((v) => {
       minX = Math.min(minX, v[0]);
       maxX = Math.max(maxX, v[0]);
       minY = Math.min(minY, v[1]);
@@ -63939,11 +63996,24 @@ var CurveTool = class extends WhiteboardTool {
     _defineProperty19(this, "elementModel", null);
     _defineProperty19(this, "recognizer", new Recognizer());
     _defineProperty19(this, "pointCount", 0);
+    _defineProperty19(this, "pendingPoints", []);
+    _defineProperty19(this, "flushRafId", 0);
     _defineProperty19(this, "showLiveCursor", true);
-    this.tool.minDistance = 20;
+    _defineProperty19(this, "flushPendingPoints", () => {
+      this.flushRafId = 0;
+      if (this.elementModel && this.pendingPoints.length > 0) {
+        this.elementModel.appendPoints(this.pendingPoints);
+        this.pendingPoints = [];
+      }
+    });
   }
   onMouseDown(_event) {
     this.pointCount = 0;
+    this.pendingPoints = [];
+    if (this.flushRafId) {
+      cancelAnimationFrame(this.flushRafId);
+      this.flushRafId = 0;
+    }
     if (this.elementModel) {
       this.elementModel.dispose();
     }
@@ -63958,27 +64028,38 @@ var CurveTool = class extends WhiteboardTool {
     if (this.pointCount > 1024) {
       return;
     }
-    const MIN_DISTANCE = 4;
+    const MIN_DISTANCE = 2;
     if (this.elementModel) {
-      const len = this.elementModel.points.length;
-      let last = {
-        x: 0,
-        y: 0
-      };
-      if (len >= 2) {
-        last = {
-          x: this.elementModel.points[len - 2],
-          y: this.elementModel.points[len - 1]
-        };
+      let lastX = 0;
+      let lastY = 0;
+      if (this.pendingPoints.length >= 3) {
+        lastX = this.pendingPoints[this.pendingPoints.length - 3];
+        lastY = this.pendingPoints[this.pendingPoints.length - 2];
+      } else {
+        const len = this.elementModel.points.length;
+        if (len >= 3) {
+          lastX = this.elementModel.points[len - 3];
+          lastY = this.elementModel.points[len - 2];
+        }
       }
-      const dist = Math.max(Math.abs(last.x - event.point.x), Math.abs(last.y - event.point.y));
+      const dist = Math.max(Math.abs(lastX - event.point.x), Math.abs(lastY - event.point.y));
       if (dist >= MIN_DISTANCE) {
         this.pointCount += 1;
-        this.elementModel.appendPoints([Math.round(event.point.x), Math.round(event.point.y)]);
+        const nativeEvent = event.event;
+        const pressure = nativeEvent.pointerType === "pen" && nativeEvent.pressure > 0 ? nativeEvent.pressure : 0;
+        this.pendingPoints.push(event.point.x, event.point.y, pressure);
+        if (!this.flushRafId) {
+          this.flushRafId = requestAnimationFrame(this.flushPendingPoints);
+        }
       }
     }
   }
   onMouseUp(event) {
+    if (this.flushRafId) {
+      cancelAnimationFrame(this.flushRafId);
+      this.flushRafId = 0;
+    }
+    this.flushPendingPoints();
     this.modelGetter().then((model) => {
       if (!model) {
         return;
@@ -67127,6 +67208,7 @@ var WhiteboardApplication = class _WhiteboardApplication extends AbstractApplica
     _defineProperty43(this, "permissions", void 0);
     _defineProperty43(this, "inputType", "any");
     _defineProperty43(this, "isPenEvent", false);
+    _defineProperty43(this, "activePenPointerId", null);
     _defineProperty43(this, "hasPenInput", null);
     _defineProperty43(this, "disableViewModelUpdate", false);
     _defineProperty43(this, "internalResizeObserver", true);
@@ -67455,11 +67537,34 @@ var WhiteboardApplication = class _WhiteboardApplication extends AbstractApplica
     this.imageSets.setAttribute("data-image-sets", "");
     this.rootElement.appendChild(this.imageSets);
     document.body.addEventListener("pointerdown", (evt) => {
-      this.isPenEvent = evt.pointerType === "pen";
-      if (evt.pointerType === "pen" && this.hasPenInput === null) {
-        this.hasPenInput = true;
-        this.inputType = "pen";
-        this.emitter.emit("inputTypeChange", this.inputType);
+      if (evt.pointerType === "pen") {
+        this.isPenEvent = true;
+        this.activePenPointerId = evt.pointerId;
+        if (this.hasPenInput === null) {
+          this.hasPenInput = true;
+          this.inputType = "pen";
+          this.emitter.emit("inputTypeChange", this.inputType);
+        }
+      } else {
+        if (this.activePenPointerId === null) {
+          this.isPenEvent = false;
+        }
+      }
+    }, {
+      capture: true
+    });
+    document.body.addEventListener("pointerup", (evt) => {
+      if (evt.pointerId === this.activePenPointerId) {
+        this.activePenPointerId = null;
+        this.isPenEvent = false;
+      }
+    }, {
+      capture: true
+    });
+    document.body.addEventListener("pointercancel", (evt) => {
+      if (evt.pointerId === this.activePenPointerId) {
+        this.activePenPointerId = null;
+        this.isPenEvent = false;
       }
     }, {
       capture: true