fabric-vectr 6.7.12 → 6.7.14

package/dist/index.mjs

@@ -360,7 +360,7 @@ class Cache {
 }
 const cache = new Cache();
 
-var version = "6.7.12";
+var version = "6.7.14";
 
 // use this syntax so babel plugin see this import here
 const VERSION = version;
@@ -1808,7 +1808,8 @@ const composeMatrix = options => {
 const loadImage = function (url) {
   let {
     signal,
-    crossOrigin = null
+    crossOrigin = null,
+    fallbackToEmptyImage = false
   } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   return new Promise(function (resolve, reject) {
     if (signal && signal.aborted) {
@@ -1825,9 +1826,12 @@ const loadImage = function (url) {
         once: true
       });
     }
-    const done = function () {
+    const cleanup = function () {
       img.onload = img.onerror = null;
       abort && (signal === null || signal === void 0 ? void 0 : signal.removeEventListener('abort', abort));
+    };
+    const done = function () {
+      cleanup();
       resolve(img);
     };
     if (!url) {
@@ -1836,8 +1840,15 @@ const loadImage = function (url) {
     }
     img.onload = done;
     img.onerror = function () {
-      abort && (signal === null || signal === void 0 ? void 0 : signal.removeEventListener('abort', abort));
-      reject(new FabricError(`Error loading ${img.src}`));
+      const failedSrc = img.src;
+      cleanup();
+      if (fallbackToEmptyImage) {
+        log('warn', 'Image failed to load, continuing with an empty image source', failedSrc);
+        img.src = '';
+        resolve(img);
+        return;
+      }
+      reject(new FabricError(`Error loading ${failedSrc}`));
     };
     crossOrigin && (img.crossOrigin = crossOrigin);
     img.src = url;
@@ -3063,25 +3074,28 @@ class StaticCanvas extends createCollectionMixin(CommonMethods) {
    */
   _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) {
@@ -4040,9 +4054,13 @@ class Pattern {
       patternTransform,
       ...otherOptions
     } = _ref2;
+    const {
+      crossOrigin
+    } = otherOptions;
     const img = await loadImage(source, {
       ...options,
-      crossOrigin: otherOptions.crossOrigin
+      crossOrigin,
+      fallbackToEmptyImage: true
     });
     return new this({
       ...otherOptions,
@@ -5030,13 +5048,17 @@ class FabricObjectSVGExportMixin {
     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;
@@ -25944,11 +25966,13 @@ class FabricImage extends FabricObject {
     } = _ref;
     return Promise.all([loadImage(src, {
       ...options,
-      crossOrigin
+      crossOrigin,
+      fallbackToEmptyImage: true
     }), f && enlivenObjects(f, options),
     // TODO: redundant - handled by enlivenObjectEnlivables
     rf && enlivenObjects([rf], options), enlivenObjectEnlivables(object, options)]).then(_ref2 => {
-      let [el, filters = [], [resizeFilter] = [], hydratedProps = {}] = _ref2;
+      let [el, filters = [], resizeFilters = [], hydratedProps = {}] = _ref2;
+      const [resizeFilter] = resizeFilters;
       return new this(el, {
         ...object,
         // TODO: this creates a difference between image creation and restoring from JSON