fabric-vectr 6.7.8 → 6.7.10

package/dist/index.js

@@ -366,7 +366,7 @@
   }
   const cache = new Cache();
 
-  var version = "6.7.8";
+  var version = "6.7.10";
 
   // use this syntax so babel plugin see this import here
   const VERSION = version;
@@ -3081,7 +3081,7 @@
         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, 和路径偏移
@@ -5063,7 +5063,10 @@
       if (clipPath) {
         markup.push(clipPathMarkup);
       }
-      markup.push(objectMarkup.join(''));
+      // if use pattern, ignore objectMarkup, because pattern clipPath has been applied in pattern's svg, and objectMarkup is not needed anymore
+      if (!this.clipPathPattern) {
+        markup.push(objectMarkup.join(''));
+      }
       markup.push('</g>\n');
       absoluteClipPath && markup.push('</g>\n');
       return reviver ? reviver(markup.join('')) : markup.join('');
@@ -14204,7 +14207,9 @@
         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;