@8btc/whiteboard 0.0.6 → 0.0.7

package/dist/index.js

@@ -81,7 +81,6 @@ class CanvasStage {
       }
       if (toolType === "image-marker" && pointerPos) {
         const imageShape = __privateGet(this, _core).findImageAtPosition(pointerPos);
-        console.log(imageShape, "imageShape");
         if (imageShape) {
           const width = imageShape.width();
           const height = imageShape.height();
@@ -1448,21 +1447,21 @@ class CanvasCore extends CanvasState {
    * @internal 仅供内部使用
    */
   findImageAtPosition(position) {
-    const stage = __privateGet(this, _canvasStage).getStage();
-    const imageShapes = stage.find(
+    const layer = __privateGet(this, _mainLayer).getLayer();
+    const imageShapes = layer.find(
       (node) => node.getClassName() === "Image"
     );
     const originalListeningStates = imageShapes.map(
       (shape) => shape.listening()
     );
     imageShapes.forEach((shape) => shape.listening(true));
+    layer.draw();
     try {
-      const shapes = stage.getAllIntersections(position);
-      const imageShapesAtPos = shapes.filter(
-        (shape) => shape.getClassName() === "Image"
-      );
-      if (imageShapesAtPos.length === 0) return null;
-      return imageShapesAtPos[imageShapesAtPos.length - 1];
+      const shape = layer.getIntersection(position);
+      if (shape?.getClassName() === "Image") {
+        return shape;
+      }
+      return null;
     } finally {
       imageShapes.forEach((shape, index) => {
         shape.listening(originalListeningStates[index]);

package/dist/index.umd.js

@@ -1400,7 +1400,6 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
         }
         if (toolType === "image-marker" && pointerPos) {
           const imageShape = __privateGet(this, _core).findImageAtPosition(pointerPos);
-          console.log(imageShape, "imageShape");
           if (imageShape) {
             const width = imageShape.width();
             const height = imageShape.height();
@@ -2767,21 +2766,21 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
      * @internal 仅供内部使用
      */
     findImageAtPosition(position) {
-      const stage = __privateGet(this, _canvasStage).getStage();
-      const imageShapes = stage.find(
+      const layer = __privateGet(this, _mainLayer).getLayer();
+      const imageShapes = layer.find(
         (node) => node.getClassName() === "Image"
       );
       const originalListeningStates = imageShapes.map(
         (shape) => shape.listening()
       );
       imageShapes.forEach((shape) => shape.listening(true));
+      layer.draw();
       try {
-        const shapes = stage.getAllIntersections(position);
-        const imageShapesAtPos = shapes.filter(
-          (shape) => shape.getClassName() === "Image"
-        );
-        if (imageShapesAtPos.length === 0) return null;
-        return imageShapesAtPos[imageShapesAtPos.length - 1];
+        const shape = layer.getIntersection(position);
+        if (shape?.getClassName() === "Image") {
+          return shape;
+        }
+        return null;
       } finally {
         imageShapes.forEach((shape, index) => {
           shape.listening(originalListeningStates[index]);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@8btc/whiteboard",
   "private": false,
-  "version": "0.0.6",
+  "version": "0.0.7",
   "type": "module",
   "main": "./dist/index.umd.js",
   "module": "./dist/index.js",