@netless/forge-whiteboard 1.2.0-beta.0 → 1.2.0-beta.3

package/dist/whiteboard.js

@@ -23278,7 +23278,7 @@ var require_lodash = __commonJS({
           result2.__values__ = wrapper.__values__;
           return result2;
         }
-        function chunk7(array, size2, guard) {
+        function chunk8(array, size2, guard) {
           if (guard ? isIterateeCall(array, size2, guard) : size2 === undefined2) {
             size2 = 1;
           } else {
@@ -25150,7 +25150,7 @@ var require_lodash = __commonJS({
         lodash.bindKey = bindKey;
         lodash.castArray = castArray;
         lodash.chain = chain;
-        lodash.chunk = chunk7;
+        lodash.chunk = chunk8;
         lodash.compact = compact;
         lodash.concat = concat;
         lodash.cond = cond;
@@ -25651,6 +25651,7 @@ var import_forge_room6 = require("@netless/forge-room");
 
 // src/model/renderable/CurveModel.ts
 var Y2 = __toESM(require("yjs"), 1);
+var import_lodash = __toESM(require_lodash(), 1);
 
 // ../../node_modules/.pnpm/perfect-freehand@1.2.2/node_modules/perfect-freehand/dist/esm/index.mjs
 function $(e, t, u, x = (h) => h) {
@@ -26208,7 +26209,7 @@ var CurveModel = class extends ElementModel {
     _defineProperty3(this, "debug", false);
     _defineProperty3(this, "clearLocalPointsWhenYPointsChange", false);
     _defineProperty3(this, "shouldUseLocalPoints", true);
-    _defineProperty3(this, "localPointsPick", 6);
+    _defineProperty3(this, "localPointsPick", 4);
     if (!this.root.doc || !this.root.has("type")) {
       this.root.set("type", "curve");
     }
@@ -26220,7 +26221,6 @@ var CurveModel = class extends ElementModel {
     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);
@@ -26229,7 +26229,7 @@ var CurveModel = class extends ElementModel {
       smoothing: 0.7,
       thinning: 0.5,
       streamline,
-      simulatePressure: !hasRealPressure,
+      simulatePressure: true,
       start: {
         taper,
         cap: true
@@ -26240,36 +26240,13 @@ var CurveModel = class extends ElementModel {
       }
     });
   }
-  isPressureValue(value) {
-    return typeof value === "number" && Number.isFinite(value) && value >= 0 && value <= 1;
-  }
-  pointStride(points) {
-    if (points.length >= 3 && points.length % 3 === 0) {
-      let hasPressureSlot = false;
-      for (let i = 2; i < points.length; i += 3) {
-        if (!this.isPressureValue(points[i])) {
-          return 2;
-        }
-        hasPressureSlot = true;
-      }
-      if (hasPressureSlot) {
-        return 3;
-      }
-    }
-    return 2;
-  }
   matrixedPoints() {
     const points = this.localPoints.length === 0 ? this.points : this.localPoints;
     const matrix = new this.scope.Matrix(this.pointsMatrix);
-    const output = [];
-    const stride = this.pointStride(points);
-    for (let i = 0, len = points.length; i + 1 < len; i += stride) {
-      const p = new this.scope.Point(points[i], points[i + 1]);
-      const tp = p.transform(matrix);
-      const pressure = stride === 3 ? points[i + 2] ?? 0 : 0;
-      output.push([tp.x, tp.y, pressure]);
-    }
-    return output;
+    return (0, import_lodash.chunk)(points, 2).filter((point) => point.length === 2).map((_ref) => {
+      let [x, y] = _ref;
+      return new this.scope.Point(x, y).transform(matrix);
+    }).map((point) => [point.x, point.y]);
   }
   createPath(points) {
     const path = new this.scope.Path();
@@ -26343,12 +26320,11 @@ var CurveModel = class extends ElementModel {
   liveCursorPoint() {
     const yArray = this.root.get(ElementModel.KEYS.points);
     const points = yArray.toArray();
-    const stride = this.pointStride(points);
-    if (points.length < stride) {
+    if (points.length < 2) {
       return null;
     }
     const len = points.length;
-    const point = new this.scope.Point(points[len - stride], points[len - stride + 1]);
+    const point = new this.scope.Point(points[len - 2], points[len - 1]);
     return point.transform(new this.scope.Matrix(this.pointsMatrix));
   }
   onStyleKeyUpdate(key) {
@@ -26449,7 +26425,7 @@ var SelectorModel = class extends ElementModel {
 var Y4 = __toESM(require("yjs"), 1);
 
 // src/utils/paperjs.ts
-var import_lodash = __toESM(require_lodash(), 1);
+var import_lodash2 = __toESM(require_lodash(), 1);
 var import_forge_room2 = require("@netless/forge-room");
 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;
@@ -26483,7 +26459,7 @@ function serializePath(path) {
   }, []);
 }
 function deserializePath(points, scope, matrix) {
-  const segmentGroup = (0, import_lodash.chunk)(points, 6);
+  const segmentGroup = (0, import_lodash2.chunk)(points, 6);
   const path = new scope.Path();
   path.segments = segmentGroup.map((v) => deserializeSegment(v, scope, matrix));
   return path;
@@ -26626,7 +26602,7 @@ var SegmentsModel = class extends ElementModel {
 
 // src/model/renderable/LineModel.ts
 var Y5 = __toESM(require("yjs"), 1);
-var import_lodash3 = __toESM(require_lodash(), 1);
+var import_lodash4 = __toESM(require_lodash(), 1);
 
 // src/tool/WhiteboardTool.ts
 function _defineProperty7(e, r, t) {
@@ -26725,7 +26701,7 @@ var WhiteboardTool = class {
 };
 
 // src/tool/LineTool.ts
-var import_lodash2 = __toESM(require_lodash(), 1);
+var import_lodash3 = __toESM(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;
 }
@@ -26774,7 +26750,7 @@ var LineTool = class extends WhiteboardTool {
         const point = path.getPointAt(distance);
         return [point.x, point.y];
       });
-      this.elementModel.setPoints((0, import_lodash2.flattenDeep)(points));
+      this.elementModel.setPoints((0, import_lodash3.flattenDeep)(points));
     }
   }
   onMouseUp(_event) {
@@ -26857,7 +26833,7 @@ var LineModel = class extends ElementModel {
   }
   renderLine() {
     const matrix = new this.scope.Matrix(this.pointsMatrix);
-    const papperPoints = (0, import_lodash3.chunk)(this.drawPoints, 2).map((item) => {
+    const papperPoints = (0, import_lodash4.chunk)(this.drawPoints, 2).map((item) => {
       return new this.scope.Point(item[0], item[1]).transform(matrix);
     });
     const path = new this.scope.Path();
@@ -26993,7 +26969,7 @@ var LineControlPoint = class {
     const invertedPoint = point.transform(pointsMatrix.inverted());
     const points = this.model["drawPoints"];
     this.position = invertedPoint;
-    const clonedPoints = (0, import_lodash3.cloneDeep)(points);
+    const clonedPoints = (0, import_lodash4.cloneDeep)(points);
     clonedPoints[this.options.index * 2] = invertedPoint.x;
     clonedPoints[this.options.index * 2 + 1] = invertedPoint.y;
     this.model.setPoints(clonedPoints);
@@ -27478,7 +27454,7 @@ var elementsUndoOrigin = "elementsUndoOrigin";
 
 // src/model/renderable/EraserModel.ts
 var Y9 = __toESM(require("yjs"), 1);
-var import_lodash4 = __toESM(require_lodash(), 1);
+var import_lodash5 = __toESM(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;
 }
@@ -27546,7 +27522,7 @@ var EraserModel = class extends ElementModel {
     return path;
   }
   parsePoints(points) {
-    const groupPoints = (0, import_lodash4.chunk)(points, 2);
+    const groupPoints = (0, import_lodash5.chunk)(points, 2);
     return ae(groupPoints, {
       size: this.strokeWidth,
       smoothing: 0.5,
@@ -27564,7 +27540,7 @@ var EraserModel = class extends ElementModel {
     });
   }
   matrixedPoints() {
-    const currentPoints = (0, import_lodash4.chunk)(this.drawPoints, 2).slice(this.sliceBegin);
+    const currentPoints = (0, import_lodash5.chunk)(this.drawPoints, 2).slice(this.sliceBegin);
     return currentPoints.map((_ref) => {
       let [x, y] = _ref;
       return new this.scope.Point(x, y);
@@ -27630,7 +27606,7 @@ var EraserModel = class extends ElementModel {
 
 // src/model/renderable/LaserPointerModel.ts
 var Y10 = __toESM(require("yjs"), 1);
-var import_lodash5 = __toESM(require_lodash(), 1);
+var import_lodash6 = __toESM(require_lodash(), 1);
 var import_forge_room4 = require("@netless/forge-room");
 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;
@@ -27757,7 +27733,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_lodash5.chunk)(points, 2).slice(this.sliceBegin);
+    const groupPoints = (0, import_lodash6.chunk)(points, 2).slice(this.sliceBegin);
     return groupPoints.map((_ref) => {
       let [x, y] = _ref;
       return matrix.transform([x, y]);
@@ -27837,7 +27813,7 @@ var WhiteboardPermissions = class extends import_forge_room5.AbstractApplication
 
 // src/model/renderable/StraightLineModel.ts
 var Y11 = __toESM(require("yjs"), 1);
-var import_lodash6 = __toESM(require_lodash(), 1);
+var import_lodash7 = __toESM(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;
 }
@@ -27896,7 +27872,7 @@ var StraightLineModel = class extends ElementModel {
   }
   renderLine() {
     const matrix = new this.scope.Matrix(this.pointsMatrix);
-    const papperPoints = (0, import_lodash6.chunk)(this.drawPoints, 2).map((item) => {
+    const papperPoints = (0, import_lodash7.chunk)(this.drawPoints, 2).map((item) => {
       return new this.scope.Point(item[0], item[1]).transform(matrix);
     });
     const path = new this.scope.Path();
@@ -28530,7 +28506,7 @@ var RenderableModel = class extends import_eventemitter3.default {
       if (shadow) {
         yMap.set(ElementModel.KEYS.shadow, "layer");
       }
-      yMap.set(ElementModel.KEYS.points, new Y12.Array());
+      yMap.set(ElementModel.KEYS.points, Y12.Array.from([x, y]));
       yMap.set(ElementModel.KEYS.strokeWidth, this.toolbarModel.strokeWidth);
       yMap.set(ElementModel.KEYS.strokeColor, this.toolbarModel.strokeColor);
       yMap.set(ElementModel.KEYS.fillColor, this.toolbarModel.fillColor);
@@ -28538,7 +28514,6 @@ var RenderableModel = class extends import_eventemitter3.default {
       this.elements.set(uuid, yMap);
     }, elementsUndoOrigin);
     pointTextModel.bindObserver();
-    pointTextModel.setPoints([x, y]);
     pointTextModel.fontSize = this.toolbarModel.fontSize;
     pointTextModel.fontFamily = this.toolbarModel.fontFamily;
     this.initElement(pointTextModel);
@@ -28572,7 +28547,7 @@ var RenderableModel = class extends import_eventemitter3.default {
 };
 
 // src/utils/Recognizer.ts
-var import_lodash7 = __toESM(require_lodash(), 1);
+var import_lodash8 = __toESM(require_lodash(), 1);
 
 // src/utils/UnistrokeRecognizer.js
 function Point(x, y) {
@@ -28819,7 +28794,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_lodash7.chunk)(points, 3).map((v) => {
+    const result = this.dollar.Recognize((0, import_lodash8.chunk)(points, 2).map((v) => {
       minX = Math.min(minX, v[0]);
       maxX = Math.max(maxX, v[0]);
       minY = Math.min(minY, v[1]);
@@ -28899,22 +28874,20 @@ var CurveTool = class extends WhiteboardTool {
     if (this.elementModel) {
       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];
+      if (this.pendingPoints.length >= 2) {
+        lastX = this.pendingPoints[this.pendingPoints.length - 2];
+        lastY = this.pendingPoints[this.pendingPoints.length - 1];
       } else {
         const len = this.elementModel.points.length;
-        if (len >= 3) {
-          lastX = this.elementModel.points[len - 3];
-          lastY = this.elementModel.points[len - 2];
+        if (len >= 2) {
+          lastX = this.elementModel.points[len - 2];
+          lastY = this.elementModel.points[len - 1];
         }
       }
       const dist = Math.max(Math.abs(lastX - event.point.x), Math.abs(lastY - event.point.y));
       if (dist >= MIN_DISTANCE) {
         this.pointCount += 1;
-        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);
+        this.pendingPoints.push(event.point.x, event.point.y);
         if (!this.flushRafId) {
           this.flushRafId = requestAnimationFrame(this.flushPendingPoints);
         }