@anu3ev/fabric-image-editor 0.1.11 → 0.1.12

package/dist/main.js

@@ -440,9 +440,9 @@ class Re {
     this.worker.terminate();
   }
 }
-var p = 12, Ve = 2, G = 8, X = 20, Fe = 100, Q = 20, J = 8, Ge = 100, K = 32, $ = 1, Xe = "#2B2D33", q = "#3D8BF4", ee = "#FFFFFF";
+var b = 12, Ve = 2, G = 8, X = 20, Fe = 100, Q = 20, J = 8, Ge = 100, K = 32, $ = 1, Xe = "#2B2D33", q = "#3D8BF4", ee = "#FFFFFF";
 function U(o, e, t, a, r) {
-  var n = p, i = Ve;
+  var n = b, i = Ve;
   o.save(), o.translate(e, t), o.rotate(z.degreesToRadians(r.angle)), o.fillStyle = ee, o.strokeStyle = q, o.lineWidth = $, o.beginPath(), o.roundRect(-12 / 2, -12 / 2, n, n, i), o.fill(), o.stroke(), o.restore();
 }
 function he(o, e, t, a, r) {
@@ -463,29 +463,29 @@ var Ke = {
   // Угловые точки
   tl: {
     render: U,
-    sizeX: p,
-    sizeY: p,
+    sizeX: b,
+    sizeY: b,
     offsetX: 0,
     offsetY: 0
   },
   tr: {
     render: U,
-    sizeX: p,
-    sizeY: p,
+    sizeX: b,
+    sizeY: b,
     offsetX: 0,
     offsetY: 0
   },
   bl: {
     render: U,
-    sizeX: p,
-    sizeY: p,
+    sizeX: b,
+    sizeY: b,
     offsetX: 0,
     offsetY: 0
   },
   br: {
     render: U,
-    sizeX: p,
-    sizeY: p,
+    sizeX: b,
+    sizeY: b,
     offsetX: 0,
     offsetY: 0
   },
@@ -890,7 +890,7 @@ class ht {
     var {
       editor: t
     } = e;
-    this.editor = t, this.canvas = t.canvas, this._historySuspendCount = 0, this.baseState = null, this.patches = [], this.currentIndex = 0, this.maxHistoryLength = t.options.maxHistoryLength, this._createDiffPatcher();
+    this.editor = t, this.canvas = t.canvas, this._historySuspendCount = 0, this.baseState = null, this.patches = [], this.currentIndex = 0, this.maxHistoryLength = t.options.maxHistoryLength, this.totalChangesCount = 0, this.baseStateChangesCount = 0, this._createDiffPatcher();
   }
   /** Проверка, нужно ли пропускать сохранение истории */
   get skipHistory() {
@@ -918,6 +918,20 @@ class ht {
   resumeHistory() {
     this._historySuspendCount = Math.max(0, this._historySuspendCount - 1);
   }
+  /**
+   * Проверяет, есть ли в редакторе несохранённые изменения
+   * @returns {boolean}
+   */
+  hasUnsavedChanges() {
+    return this.totalChangesCount > 0;
+  }
+  /**
+   * Получает текущую позицию в общей истории изменений
+   * @returns {number}
+   */
+  getCurrentChangePosition() {
+    return this.baseStateChangesCount + this.currentIndex;
+  }
   /**
    * Получаем полное состояние, применяя все диффы к базовому состоянию.
    */
@@ -946,7 +960,7 @@ class ht {
         console.log("Нет изменений для сохранения.");
         return;
       }
-      console.log("baseState", this.baseState), this.currentIndex < this.patches.length && this.patches.splice(this.currentIndex), console.log("diff", a), this.patches.push(a), this.currentIndex += 1, this.patches.length > this.maxHistoryLength && (this.baseState = this.diffPatcher.patch(this.baseState, this.patches[0]), this.patches.shift(), this.currentIndex -= 1), console.log("Состояние сохранено. Текущий индекс истории:", this.currentIndex);
+      console.log("baseState", this.baseState), this.currentIndex < this.patches.length && this.patches.splice(this.currentIndex), console.log("diff", a), this.totalChangesCount += 1, this.patches.push(a), this.currentIndex += 1, this.patches.length > this.maxHistoryLength && (this.baseState = this.diffPatcher.patch(this.baseState, this.patches[0]), this.patches.shift(), this.currentIndex -= 1, this.baseStateChangesCount += 1), console.log("Состояние сохранено. Текущий индекс истории:", this.currentIndex);
     }
   }
   /**
@@ -980,7 +994,7 @@ class ht {
         }
         e.suspendHistory();
         try {
-          e.currentIndex -= 1;
+          e.currentIndex -= 1, e.totalChangesCount -= 1;
           var t = e.getFullState();
           yield e.loadStateFromFullState(t), console.log("Undo выполнен. Текущий индекс истории:", e.currentIndex), e.canvas.fire("editor:undo");
         } catch (a) {
@@ -1007,7 +1021,7 @@ class ht {
         }
         e.suspendHistory();
         try {
-          e.currentIndex += 1;
+          e.currentIndex += 1, e.totalChangesCount += 1;
           var t = e.getFullState();
           console.log("fullState", t), yield e.loadStateFromFullState(t), console.log("Redo выполнен. Текущий индекс истории:", e.currentIndex), e.canvas.fire("editor:redo");
         } catch (a) {
@@ -1021,7 +1035,7 @@ class ht {
     })();
   }
 }
-var gt = 0.1, vt = 2, mt = 0.1, ft = 90, k = 16, x = 16, D = 4096, C = 4096;
+var gt = 0.1, vt = 2, mt = 0.1, ft = 90, k = 16, x = 16, N = 4096, D = 4096;
 function Me(o, e, t, a, r, n, i) {
   try {
     var s = o[n](i), c = s.value;
@@ -1109,9 +1123,9 @@ class L {
             });
           var {
             width: f,
-            height: b
+            height: p
           } = h;
-          if (b > C || f > D) {
+          if (p > D || f > N) {
             var y = yield t.resizeImageToBoundaries(h._element.src, "max"), S = URL.createObjectURL(y);
             t._createdBlobUrls.push(S), h = yield de.fromURL(S, {
               crossOrigin: "anonymous"
@@ -1134,7 +1148,7 @@ class L {
               object: h,
               type: "contain",
               withoutSave: !0
-            }) : r === "image-cover" && (f > O || b > A) && u.fitObject({
+            }) : r === "image-cover" && (f > O || p > A) && u.fitObject({
               object: h,
               type: "cover",
               withoutSave: !0
@@ -1160,14 +1174,14 @@ class L {
   resizeImageToBoundaries(e) {
     var t = arguments, a = this;
     return P(function* () {
-      var r = t.length > 1 && t[1] !== void 0 ? t[1] : "max", n = "Размер изображения больше максимального размера канваса, поэтому оно будет уменьшено до максимальных размеров: ".concat(D, "x").concat(C);
+      var r = t.length > 1 && t[1] !== void 0 ? t[1] : "max", n = "Размер изображения больше максимального размера канваса, поэтому оно будет уменьшено до максимальных размеров: ".concat(N, "x").concat(D);
       console.warn("importImage. ".concat(n)), a.editor.canvas.fire("editor:warning", {
         message: n
       });
       var i = yield a.editor.workerManager.post("resizeImage", {
         dataURL: e,
-        maxWidth: D,
-        maxHeight: C,
+        maxWidth: N,
+        maxHeight: D,
         sizeType: r
       });
       return i;
@@ -1205,14 +1219,14 @@ class L {
         height: j
       } = c.getBoundingRect(), f = yield s.clone(["id", "format", "locked"]);
       ["image/jpg", "image/jpeg"].includes(d) && (f.backgroundColor = "#ffffff");
-      var b = f.getObjects().find((N) => N.id === c.id);
-      b.visible = !1, f.viewportTransform = [1, 0, 0, 1, -g, -v], f.setDimensions({
+      var p = f.getObjects().find((C) => C.id === c.id);
+      p.visible = !1, f.viewportTransform = [1, 0, 0, 1, -g, -v], f.setDimensions({
         width: m,
         height: j
       }, {
         backstoreOnly: !0
       }), f.renderAll();
-      var y = f.getObjects().filter((N) => N.format).every((N) => N.format === "svg");
+      var y = f.getObjects().filter((C) => C.format).every((C) => C.format === "svg");
       if (h === "svg" && y) {
         var S = f.toSVG();
         f.dispose();
@@ -1228,8 +1242,8 @@ class L {
         };
         return s.fire("editor:canvas-exported", A), A;
       }
-      var w = yield new Promise((N) => {
-        f.getElement().toBlob(N);
+      var w = yield new Promise((C) => {
+        f.getElement().toBlob(C);
       });
       if (f.dispose(), i) {
         var T = {
@@ -1252,18 +1266,18 @@ class L {
           format: [H, W]
         });
         if (_.addImage(re, "JPG", 0, 0, H, W), n) {
-          var Ne = _.output("datauristring"), ie = {
-            image: Ne,
+          var Ce = _.output("datauristring"), ie = {
+            image: Ce,
             format: "pdf",
             contentType: "application/pdf",
             fileName: a
           };
           return s.fire("editor:canvas-exported", ie), ie;
         }
-        var De = _.output("blob"), Ce = new File([De], a, {
+        var Ne = _.output("blob"), De = new File([Ne], a, {
           type: "application/pdf"
         }), oe = {
-          image: Ce,
+          image: De,
           format: "pdf",
           contentType: "application/pdf",
           fileName: a
@@ -1345,8 +1359,8 @@ class L {
         };
         return c.fire("editor:object-exported", f), f;
       }
-      var b = l.toCanvasElement(), y = yield new Promise((w) => {
-        b.toBlob(w);
+      var p = l.toCanvasElement(), y = yield new Promise((w) => {
+        p.toBlob(w);
       });
       if (s) {
         var S = {
@@ -1465,7 +1479,7 @@ class Mt {
       } = this.editor, {
         width: c,
         height: u
-      } = i, l = Number(Math.max(Math.min(e, D), k));
+      } = i, l = Number(Math.max(Math.min(e, N), k));
       if (!s || s === "auto" || r ? this.adaptCanvasToContainer() : s ? this.setCanvasBackstoreWidth(s) : this.setCanvasBackstoreWidth(l), i.set({
         width: l
       }), n.clipPath.set({
@@ -1508,7 +1522,7 @@ class Mt {
       } = this.editor, {
         width: c,
         height: u
-      } = i, l = Number(Math.max(Math.min(e, C), x));
+      } = i, l = Number(Math.max(Math.min(e, D), x));
       if (!s || s === "auto" || r ? this.adaptCanvasToContainer() : s ? this.setCanvasBackstoreHeight(s) : this.setCanvasBackstoreHeight(l), i.set({
         height: l
       }), n.clipPath.set({
@@ -1570,7 +1584,7 @@ class Mt {
   }
   setCanvasBackstoreWidth(e) {
     if (!(!e || typeof e != "number")) {
-      var t = Math.max(Math.min(e, D), k);
+      var t = Math.max(Math.min(e, N), k);
       this.editor.canvas.setDimensions({
         width: t
       }, {
@@ -1580,7 +1594,7 @@ class Mt {
   }
   setCanvasBackstoreHeight(e) {
     if (!(!e || typeof e != "number")) {
-      var t = Math.max(Math.min(e, C), x);
+      var t = Math.max(Math.min(e, D), x);
       this.editor.canvas.setDimensions({
         height: t
       }, {
@@ -1591,7 +1605,7 @@ class Mt {
   adaptCanvasToContainer() {
     var {
       canvas: e
-    } = this.editor, t = e.editorContainer, a = t.clientWidth, r = t.clientHeight, n = Math.max(Math.min(a, D), k), i = Math.max(Math.min(r, C), x);
+    } = this.editor, t = e.editorContainer, a = t.clientWidth, r = t.clientHeight, n = Math.max(Math.min(a, N), k), i = Math.max(Math.min(r, D), x);
     console.log("adaptCanvasToContainer newWidth", n), console.log("adaptCanvasToContainer newHeight", i), e.setDimensions({
       width: n,
       height: i
@@ -1758,12 +1772,12 @@ class Mt {
           message: h
         });
       }
-      var g = Math.min(l, D), v = Math.min(d, C);
+      var g = Math.min(l, N), v = Math.min(d, D);
       if (t) {
         var {
           width: m,
           height: j
-        } = n, f = l / m, b = d / j, y = Math.max(f, b);
+        } = n, f = l / m, p = d / j, y = Math.max(f, p);
         g = m * y, v = j * y;
       }
       this.setResolutionWidth(g, {
@@ -2353,7 +2367,7 @@ class Y {
       e.moveObjectTo(r[i], n - 1);
   }
 }
-var pt = ["id", "left", "top", "width", "height", "fill"], bt = ["id", "left", "top", "radius", "fill"], It = ["id", "left", "top", "width", "height", "fill"];
+var bt = ["id", "left", "top", "width", "height", "fill"], pt = ["id", "left", "top", "radius", "fill"], It = ["id", "left", "top", "width", "height", "fill"];
 function je(o, e) {
   var t = Object.keys(o);
   if (Object.getOwnPropertySymbols) {
@@ -2394,14 +2408,14 @@ function wt(o, e) {
 }
 function F(o, e) {
   if (o == null) return {};
-  var t, a, r = Nt(o, e);
+  var t, a, r = Ct(o, e);
   if (Object.getOwnPropertySymbols) {
     var n = Object.getOwnPropertySymbols(o);
     for (a = 0; a < n.length; a++) t = n[a], e.indexOf(t) === -1 && {}.propertyIsEnumerable.call(o, t) && (r[t] = o[t]);
   }
   return r;
 }
-function Nt(o, e) {
+function Ct(o, e) {
   if (o == null) return {};
   var t = {};
   for (var a in o) if ({}.hasOwnProperty.call(o, a)) {
@@ -2410,7 +2424,7 @@ function Nt(o, e) {
   }
   return t;
 }
-class Dt {
+class Nt {
   /**
    * @param {object} options
    * @param {ImageEditor} options.editor - экземпляр редактора с доступом к canvas
@@ -2444,7 +2458,7 @@ class Dt {
       width: n = 100,
       height: i = 100,
       fill: s = "blue"
-    } = e, c = F(e, pt), {
+    } = e, c = F(e, bt), {
       withoutSelection: u,
       withoutAdding: l
     } = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, {
@@ -2480,7 +2494,7 @@ class Dt {
       top: r,
       radius: n = 50,
       fill: i = "green"
-    } = e, s = F(e, bt), {
+    } = e, s = F(e, pt), {
       withoutSelection: c,
       withoutAdding: u
     } = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, {
@@ -2541,7 +2555,7 @@ function ye(o, e, t, a, r, n, i) {
   }
   s.done ? e(c) : Promise.resolve(c).then(a, r);
 }
-function pe(o) {
+function be(o) {
   return function() {
     var e = this, t = arguments;
     return new Promise(function(a, r) {
@@ -2556,7 +2570,7 @@ function pe(o) {
     });
   };
 }
-class Ct {
+class Dt {
   /**
    * @param {object} options
    * @param {ImageEditor} options.editor - экземпляр редактора с доступом к canvas
@@ -2573,7 +2587,7 @@ class Ct {
    */
   copy() {
     var e = this;
-    return pe(function* () {
+    return be(function* () {
       var {
         canvas: t
       } = e.editor, a = t.getActiveObject();
@@ -2617,7 +2631,7 @@ class Ct {
    */
   paste() {
     var e = this;
-    return pe(function* () {
+    return be(function* () {
       var {
         canvas: t
       } = e.editor;
@@ -2849,7 +2863,7 @@ class Et {
     }), a.discardActiveObject(), a.renderAll(), r.resumeHistory(), t || r.saveState(), a.fire("editor:objects-deleted"));
   }
 }
-function be(o, e, t, a, r, n, i) {
+function pe(o, e, t, a, r, n, i) {
   try {
     var s = o[n](i), c = s.value;
   } catch (u) {
@@ -2863,10 +2877,10 @@ function kt(o) {
     return new Promise(function(a, r) {
       var n = o.apply(e, t);
       function i(c) {
-        be(n, a, r, i, s, "next", c);
+        pe(n, a, r, i, s, "next", c);
       }
       function s(c) {
-        be(n, a, r, i, s, "throw", c);
+        pe(n, a, r, i, s, "throw", c);
       }
       i(void 0);
     });
@@ -2910,11 +2924,11 @@ class te {
         editor: e
       }), e.layerManager = new Y({
         editor: e
-      }), e.shapeManager = new Dt({
+      }), e.shapeManager = new Nt({
         editor: e
       }), e.interactionBlocker = new yt({
         editor: e
-      }), e.clipboardManager = new Ct({
+      }), e.clipboardManager = new Dt({
         editor: e
       }), e.objectLockManager = new Lt({
         editor: e

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anu3ev/fabric-image-editor",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "description": "JavaScript image editor built on FabricJS, allowing you to create instances with an integrated montage area and providing an API to modify and manage state.",
   "module": "dist/main.js",
   "files": [