fabric-vectr 6.7.13 → 6.7.14

package/dist/index.js

@@ -366,7 +366,7 @@
   }
   const cache = new Cache();
 
-  var version = "6.7.13";
+  var version = "6.7.14";
 
   // use this syntax so babel plugin see this import here
   const VERSION = version;
@@ -3080,25 +3080,28 @@
      */
     _createPathForText() {
       const pathMarkups = [];
-      let instance,
-        i,
-        len,
-        objects = this._objects;
-      for (i = 0, len = objects.length; i < len; i++) {
-        instance = objects[i];
+      const objects = [];
+      this._objects.forEach(function add(object) {
+        objects.push(object);
+        if (isCollection(object)) {
+          object._objects.forEach(add);
+        }
+      });
+      objects.forEach(instance => {
         if (instance.excludeFromExport) {
-          continue;
+          return;
         }
         if (!isTextObject(instance) || !instance.path) {
-          continue;
+          return;
         }
-        let pathId = `TEXTPATH_${instance.id}`;
-        let pathMarkup = instance.path._toSVG();
-        let index = pathMarkup.indexOf('COMMON_PARTS');
+        const pathId = `TEXTPATH_${instance.id}`;
+        const pathMarkup = instance.path._toSVG();
+        const index = pathMarkup.indexOf('COMMON_PARTS');
+
         // 加上id, 和路径偏移
         pathMarkup[index] = ['id="' + pathId + '" ', 'transform="translate(' + -instance.path.pathOffset.x + ',' + -instance.path.pathOffset.y + ')" '].join('');
         pathMarkups.push(pathMarkup.join(''));
-      }
+      });
       return pathMarkups.join('\n');
     }
     createSVGClipPathMarkup(options) {
@@ -5051,13 +5054,17 @@
       commonPieces = [styleInfo, vectorEffect, noStyle ? '' : this.addPaintOrder(), ' ', additionalTransform ? `transform="${additionalTransform}" ` : ''].join('');
 
       // James added shadow 放在上面
+      // 文本等调用方已经通过 withShadow 挂载 filter 时，避免再额外复制一份可见对象，
+      // 但仍然需要输出 filter 定义，否则普通 SVG 会丢失阴影。
       if (shadow) {
+        markup.push(shadow.toSVG(this));
+      }
+      if (shadow && !withShadow) {
         const styleInfoWithShadow = 'style="' + this.getSvgStyles(false) + '" ';
         const commonPiecesWithShadow = [styleInfoWithShadow, vectorEffect, noStyle ? '' : this.addPaintOrder(), ' ', additionalTransform ? 'transform="' + additionalTransform + '" ' : ''].join('');
         const objectMarkupCopy = JSON.parse(JSON.stringify(objectMarkup));
         objectMarkupCopy[index] = commonPiecesWithShadow;
         markup.push(objectMarkupCopy.join(''));
-        markup.push(shadow.toSVG(this));
       }
       // objectMarkup中是导出主对象(如path)的svg，index下标是style，放在commonPieces
       objectMarkup[index] = commonPieces;