fabric-vectr 6.7.11 → 6.7.13

package/dist/index.js

@@ -366,7 +366,7 @@
   }
   const cache = new Cache();
 
-  var version = "6.7.11";
+  var version = "6.7.13";
 
   // use this syntax so babel plugin see this import here
   const VERSION = version;
@@ -1814,7 +1814,8 @@
   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) {
@@ -1831,9 +1832,12 @@
           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) {
@@ -1842,8 +1846,15 @@
       }
       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;
@@ -4046,9 +4057,13 @@
         patternTransform,
         ...otherOptions
       } = _ref2;
+      const {
+        crossOrigin
+      } = otherOptions;
       const img = await loadImage(source, {
         ...options,
-        crossOrigin: otherOptions.crossOrigin
+        crossOrigin,
+        fallbackToEmptyImage: true
       });
       return new this({
         ...otherOptions,
@@ -12240,9 +12255,17 @@
     _toSVG(reviver) {
       const svgString = ['<g ', 'COMMON_PARTS', ' >\n'];
       const bg = this._createSVGBgRect(reviver);
+      const groupTransformMatrix = this.calcTransformMatrix();
       bg && svgString.push('\t\t', bg);
       for (let i = 0; i < this._objects.length; i++) {
-        svgString.push('\t\t', this._objects[i].toSVG(reviver));
+        const object = this._objects[i];
+        if (object.group && object.group !== this) {
+          // 组内对象被 ActiveSelection 临时接管时，需要补回当前组坐标系的变换。
+          const planeChangeMatrix = calcPlaneChangeMatrix(object.group.calcTransformMatrix(), groupTransformMatrix);
+          svgString.push('\t\t<g transform="', matrixToSVG(planeChangeMatrix), '">\n\t\t', object.toSVG(reviver), '\t\t</g>\n');
+          continue;
+        }
+        svgString.push('\t\t', object.toSVG(reviver));
       }
       svgString.push('</g>\n');
       return svgString;
@@ -25942,11 +25965,13 @@
       } = _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