fabric-vectr 6.7.7 → 6.7.9

package/dist/index.mjs

@@ -360,7 +360,7 @@ class Cache {
 }
 const cache = new Cache();
 
-var version = "6.7.7";
+var version = "6.7.9";
 
 // use this syntax so babel plugin see this import here
 const VERSION = version;
@@ -1386,7 +1386,7 @@ function createCollectionMixin(Base) {
      * @param {{ includeIntersecting?: boolean }} options an object with includeIntersecting
      * @returns array of objects contained in the bounding box, ordered from top to bottom stacking wise
      */
-    collectObjects(_ref) {
+    collectObjects(fromObjects, _ref) {
       let {
         left,
         top,
@@ -1395,14 +1395,14 @@ function createCollectionMixin(Base) {
       } = _ref;
       let {
         includeIntersecting = true
-      } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+      } = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
       const objects = [],
         tl = new Point(left, top),
         br = tl.add(new Point(width, height));
 
       // we iterate reverse order to collect top first in case of click.
-      for (let i = this._objects.length - 1; i >= 0; i--) {
-        const object = this._objects[i];
+      for (let i = fromObjects.length - 1; i >= 0; i--) {
+        const object = fromObjects[i];
         if (object.selectable && object.visible && (includeIntersecting && object.intersectsWithRect(tl, br) || object.isContainedWithinRect(tl, br) || includeIntersecting && object.containsPoint(tl) || includeIntersecting && object.containsPoint(br))) {
           objects.push(object);
         }
@@ -3075,7 +3075,7 @@ class StaticCanvas extends createCollectionMixin(CommonMethods) {
       if (!isTextObject(instance) || !instance.path) {
         continue;
       }
-      let pathId = `TEXTPATH_${uid()}`;
+      let pathId = `TEXTPATH_${instance.id}`;
       let pathMarkup = instance.path._toSVG();
       let index = pathMarkup.indexOf('COMMON_PARTS');
       // 加上id, 和路径偏移
@@ -14198,7 +14198,9 @@ class SelectableCanvas extends StaticCanvas {
       activeObject = this._activeObject,
       aObjects = this.getActiveObjects();
     this.targets = [];
-    if (activeObject && aObjects.length >= 1 && !this._fixedSearchTargets) {
+
+    // valid _fixedSearchTargets is null or _fixedSearchTargets includes activeObject
+    if (activeObject && aObjects.length >= 1 && (!this._fixedSearchTargets || this._fixedSearchTargets.includes(activeObject))) {
       if (activeObject.findControl(pointer, isTouchEvent(e))) {
         // if we hit the corner of the active object, let's return that.
         return activeObject;
@@ -15582,6 +15584,8 @@ class Canvas extends SelectableCanvas {
     } else if (!isClick && !((_this$_activeObject = this._activeObject) !== null && _this$_activeObject !== void 0 && _this$_activeObject.isEditing)) {
       this.renderTop();
     }
+    // 框选不改变locked对象，不框选时如果没有点击到可以锁定组，设置锁定组为null
+    if (isClick && !this.getActiveObject()) this.isolatedObject = null;
   }
   _basicEventHandler(eventType, options) {
     const {
@@ -15721,11 +15725,14 @@ class Canvas extends SelectableCanvas {
       }
       this.setFixedSearchTargets(null);
     }
-    this.isolatedObject = isolatedObject;
-    // use __onMouseDown select other object immediately after unlocking
-    this._resetTransformEventData();
-    this.__onMouseDown(e);
-    return true;
+    if (isolatedObject) {
+      this.isolatedObject = isolatedObject;
+      // use __onMouseDown select other object immediately after unlocking
+      this._resetTransformEventData();
+      this.__onMouseDown(e);
+      return true;
+    }
+    return false;
   }
 
   /**
@@ -15773,8 +15780,11 @@ class Canvas extends SelectableCanvas {
       grouped = true;
       shouldRender = true;
     } else if (this._shouldClearSelection(e, target)) {
+      const objs = this.getActiveObjects();
       this.discardActiveObject(e);
-      if (this.switchIsolateObject(e)) {
+      // 多选取消，重置Coords， 防止无法再次选中
+      objs.forEach(obj => obj.setCoords());
+      if (!target && this.switchIsolateObject(e)) {
         return;
       }
     }
@@ -16180,7 +16190,7 @@ class Canvas extends SelectableCanvas {
       tl = point1.min(point2),
       br = point1.max(point2),
       size = br.subtract(tl);
-    const collectedObjects = this.collectObjects({
+    const collectedObjects = this.collectObjects(this.getSearchTargets(), {
       left: tl.x,
       top: tl.y,
       width: size.x,
@@ -23351,6 +23361,13 @@ class IText extends ITextClickBehavior {
     }
     this.canvas.contextTopDirty = true;
     ctx.restore();
+
+    // For grouped objects, ensure selection is rendered after other operations
+    if (this.parent && this.selectionStart !== this.selectionEnd) {
+      setTimeout(() => {
+        this.renderCursorOrSelection();
+      }, 0);
+    }
   }
 
   /**
@@ -24392,7 +24409,7 @@ class Textbox extends IText {
               rightGap = Math.max(rightGap, maxRight - (v.right || 0));
             });
             // 计算中心点位置
-            if (maxCenter && minCenter) {
+            if (maxCenter !== null && minCenter !== null) {
               const centerOff = maxCenter - minCenter;
               const onCharWidth = (lines[maxCharIdx].width || 0) / lines[maxCharIdx].text.length;
               // 左边间距大于右边两倍 或者 中心点偏移超过1/2字符且右边间距小于1/3字符