@univerjs/drawing 0.2.4-alpha.0 → 0.2.5

package/lib/es/index.js

@@ -1,8 +1,8 @@
 var Pt = Object.defineProperty;
-var Ut = (n, e, t) => e in n ? Pt(n, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : n[e] = t;
-var V = (n, e, t) => Ut(n, typeof e != "symbol" ? e + "" : e, t);
+var Mt = (n, e, t) => e in n ? Pt(n, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : n[e] = t;
+var V = (n, e, t) => Mt(n, typeof e != "symbol" ? e + "" : e, t);
 import { Subject as we } from "rxjs";
-import { sortRules as Mt, sortRulesByDesc as Nt, createIdentifier as It, Tools as kt, Inject as Rt, Injector as St, Plugin as jt, mergeOverrideWithDependencies as Tt } from "@univerjs/core";
+import { sortRules as Ut, sortRulesByDesc as Nt, createIdentifier as It, Tools as kt, Inject as Rt, Injector as St, Plugin as Tt, mergeOverrideWithDependencies as jt } from "@univerjs/core";
 const sn = 500, on = 500, ln = 10, $t = 5 * 1024 * 1024, Wt = ["image/png", "image/jpeg", "image/jpg", "image/gif", "image/bmp"];
 var Ce = typeof globalThis < "u" ? globalThis : typeof window < "u" ? window : typeof global < "u" ? global : typeof self < "u" ? self : {}, F = {}, Ct = {}, ct = {};
 Object.defineProperty(ct, "__esModule", { value: !0 });
@@ -52,11 +52,11 @@ var ft = {};
     if (!O)
       throw new Error(o);
   }
-  const t = (O) => O != null && typeof O == "object" && !Array.isArray(O), s = (O, o) => (
+  const t = (O) => O != null && typeof O == "object" && !Array.isArray(O), i = (O, o) => (
     // All the numbers, then all the letters. Just as the gods of ascii intended.
     typeof O == typeof o ? O > o : typeof O == "string" && typeof o == "number"
   );
-  function i(O, o) {
+  function s(O, o) {
     for (let c in O) {
       const h = c;
       o.write(h, O[h]);
@@ -158,7 +158,7 @@ var ft = {};
             const R = this.container.splice(h, this.container.length - h);
             this.container.push(R), this.lcIdx > -1 && (this.lcIdx = h);
           }
-          for (this.indexes.push(this.idx), this.parents.push(this.container), this.lcIdx !== -1 && (e(s(c, this.container[this.lcIdx][0])), h = this.lcIdx + 1, this.lcIdx = -1); h < this.container.length && s(c, this.container[h][0]); )
+          for (this.indexes.push(this.idx), this.parents.push(this.container), this.lcIdx !== -1 && (e(i(c, this.container[this.lcIdx][0])), h = this.lcIdx + 1, this.lcIdx = -1); h < this.container.length && i(c, this.container[h][0]); )
             h++;
           if (this.indexes.push(h), this.idx = 0, h < this.container.length && this.container[h][0] === c)
             this.container = this.container[h];
@@ -204,7 +204,7 @@ var ft = {};
     ascend() {
       this.pendingDescent.length ? this.pendingDescent.pop() : super.ascend();
     }
-    mergeTree(o, c = i) {
+    mergeTree(o, c = s) {
       if (o === null)
         return;
       if (e(Array.isArray(o)), o === this._op)
@@ -248,7 +248,7 @@ var ft = {};
         const Ie = J = O.getKey();
         if (pe != null) {
           let xe = !1;
-          if (o && typeof Ie == "number" && (J = o(Ie, O.getComponent()), J < 0 && (J = ~J, xe = !0)), s(J, pe))
+          if (o && typeof Ie == "number" && (J = o(Ie, O.getComponent()), J < 0 && (J = ~J, xe = !0)), i(J, pe))
             return null;
           if (J === pe && !xe)
             return O;
@@ -266,7 +266,7 @@ var ft = {};
     let h, R, Z, pe;
     for (h = R = O && O.descendFirst(), Z = pe = o && o.descendFirst(); h || Z; ) {
       let J = h ? O.getKey() : null, Ie = Z ? o.getKey() : null;
-      J !== null && Ie !== null && (s(Ie, J) ? Ie = null : J !== Ie && (J = null)), c(J == null ? Ie : J, J != null ? O : null, Ie != null ? o : null), J != null && h && (h = O.nextSibling()), Ie != null && Z && (Z = o.nextSibling());
+      J !== null && Ie !== null && (i(Ie, J) ? Ie = null : J !== Ie && (J = null)), c(J == null ? Ie : J, J != null ? O : null, Ie != null ? o : null), J != null && h && (h = O.nextSibling()), Ie != null && Z && (Z = o.nextSibling());
     }
     R && O.ascend(), pe && o.ascend();
   }
@@ -281,19 +281,19 @@ var ht = {};
 var it = {}, Fe = {}, vt;
 function pt() {
   return vt || (vt = 1, Object.defineProperty(Fe, "__esModule", { value: !0 }), Fe.uniToStrPos = Fe.strPosToUni = void 0, Fe.strPosToUni = (n, e = n.length) => {
-    let t = 0, s = 0;
-    for (; s < e; s++) {
-      const i = n.charCodeAt(s);
-      i >= 55296 && i <= 57343 && (t++, s++);
+    let t = 0, i = 0;
+    for (; i < e; i++) {
+      const s = n.charCodeAt(i);
+      s >= 55296 && s <= 57343 && (t++, i++);
     }
-    if (s !== e)
+    if (i !== e)
       throw Error("Invalid offset - splits unicode bytes");
-    return s - t;
+    return i - t;
   }, Fe.uniToStrPos = (n, e) => {
     let t = 0;
     for (; e > 0; e--) {
-      const s = n.charCodeAt(t);
-      t += s >= 55296 && s <= 57343 ? 2 : 1;
+      const i = n.charCodeAt(t);
+      t += i >= 55296 && i <= 57343 ? 2 : 1;
     }
     return t;
   }), Fe;
@@ -331,7 +331,7 @@ function at() {
       if (typeof _ == "number")
         throw Error("Op has a trailing skip");
     };
-    function s(f, _) {
+    function i(f, _) {
       let w = 0, L = 0;
       for (let z = 0; z < f.length; z++) {
         const H = f[z];
@@ -348,14 +348,14 @@ function at() {
         }
       }
     }
-    n.eachOp = s;
-    function i(f, _) {
+    n.eachOp = i;
+    function s(f, _) {
       const w = [], L = a(w);
-      return s(f, (z, H, De) => {
+      return i(f, (z, H, De) => {
         L(_(z, H, De));
       }), o(w);
     }
-    const d = (f) => f, l = (f) => i(f, d);
+    const d = (f) => f, l = (f) => s(f, d);
     n.dlen = (f) => typeof f == "number" ? f : e.strPosToUni(f);
     const a = (f) => (_) => {
       if (!(!_ || _.d === 0 || _.d === "")) if (f.length === 0)
@@ -492,10 +492,10 @@ function at() {
       return f;
     }, Z = (f, _) => typeof f == "number" ? R(f, _) : f.map((w) => R(w, _));
     function pe(f, _, w) {
-      return i(f, (L, z) => typeof L == "object" && typeof L.d == "number" ? { d: w.slice(_, z, z + L.d) } : L);
+      return s(f, (L, z) => typeof L == "object" && typeof L.d == "number" ? { d: w.slice(_, z, z + L.d) } : L);
     }
     function J(f) {
-      return i(f, (_) => {
+      return s(f, (_) => {
         switch (typeof _) {
           case "object":
             if (typeof _.d == "number")
@@ -509,11 +509,11 @@ function at() {
       });
     }
     function Ie(f) {
-      return i(f, (_) => typeof _ == "object" && typeof _.d == "string" ? { d: e.strPosToUni(_.d) } : _);
+      return s(f, (_) => typeof _ == "object" && typeof _.d == "string" ? { d: e.strPosToUni(_.d) } : _);
     }
     function xe(f) {
       let _ = !0;
-      return s(f, (w) => {
+      return i(f, (w) => {
         typeof w == "object" && typeof w.d == "number" && (_ = !1);
       }), _;
     }
@@ -574,27 +574,27 @@ function at() {
     n.default = ve;
   }(st)), st;
 }
-var Qe = {}, bt;
+var Qe = {}, mt;
 function xt() {
-  if (bt) return Qe;
-  bt = 1, Object.defineProperty(Qe, "__esModule", { value: !0 });
+  if (mt) return Qe;
+  mt = 1, Object.defineProperty(Qe, "__esModule", { value: !0 });
   const n = at(), e = pt();
-  function t(s, i) {
+  function t(i, s) {
     return {
       // Returns the text content of the document
-      get: s,
+      get: i,
       // Returns the number of characters in the string
       getLength() {
-        return s().length;
+        return i().length;
       },
       // Insert the specified text at the given position in the document
       insert(d, l, a) {
-        const E = e.strPosToUni(s(), d);
-        return i([E, l], a);
+        const E = e.strPosToUni(i(), d);
+        return s([E, l], a);
       },
       remove(d, l, a) {
-        const E = e.strPosToUni(s(), d);
-        return i([E, { d: l }], a);
+        const E = e.strPosToUni(i(), d);
+        return s([E, { d: l }], a);
       },
       // When you use this API, you should implement these two methods
       // in your editing context.
@@ -618,9 +618,9 @@ function xt() {
   }
   return Qe.default = t, t.provides = { text: !0 }, Qe;
 }
-var mt;
+var bt;
 function Lt() {
-  return mt || (mt = 1, function(n) {
+  return bt || (bt = 1, function(n) {
     var e = Ce && Ce.__createBinding || (Object.create ? function(c, h, R, Z) {
       Z === void 0 && (Z = R), Object.defineProperty(c, Z, { enumerable: !0, get: function() {
         return h[R];
@@ -631,16 +631,16 @@ function Lt() {
       Object.defineProperty(c, "default", { enumerable: !0, value: h });
     } : function(c, h) {
       c.default = h;
-    }), s = Ce && Ce.__importStar || function(c) {
+    }), i = Ce && Ce.__importStar || function(c) {
       if (c && c.__esModule) return c;
       var h = {};
       if (c != null) for (var R in c) Object.hasOwnProperty.call(c, R) && e(h, c, R);
       return t(h, c), h;
-    }, i = Ce && Ce.__importDefault || function(c) {
+    }, s = Ce && Ce.__importDefault || function(c) {
       return c && c.__esModule ? c : { default: c };
     };
     Object.defineProperty(n, "__esModule", { value: !0 }), n.type = n.remove = n.insert = void 0;
-    const d = pt(), l = s(at()), a = i(xt()), E = {
+    const d = pt(), l = i(at()), a = s(xt()), E = {
       create(c) {
         return c;
       },
@@ -687,15 +687,15 @@ function Lt() {
   Object.defineProperty(n, "__esModule", {
     value: !0
   }), n.editOp = n.replaceOp = n.insertOp = n.moveOp = n.removeOp = n.type = void 0;
-  const t = e(ct), s = e(dt), i = ft, d = ht;
+  const t = e(ct), i = e(dt), s = ft, d = ht;
   function l(r, u) {
     if (!r) throw new Error(u);
   }
   n.type = {
     name: "json1",
     uri: "http://sharejs.org/types/JSONv1",
-    readCursor: i.readCursor,
-    writeCursor: i.writeCursor,
+    readCursor: s.readCursor,
+    writeCursor: s.writeCursor,
     create: (r) => r,
     isNoop: (r) => r == null,
     setDebug(r) {
@@ -730,9 +730,9 @@ function Lt() {
   function h(r, u, y) {
     return typeof u == "number" ? (l(r != null, "Container is missing for key"), l(Array.isArray(r), "Cannot use numerical key for object container"), l(r.length >= u, "Cannot insert into out of bounds index"), r.splice(u, 0, y)) : (l(E(r), "Cannot insert into missing item"), l(r[u] === void 0, "Trying to overwrite value at key. Your op needs to remove it first"), r[u] = y), y;
   }
-  n.removeOp = (r, u = !0) => i.writeCursor().writeAtPath(r, "r", u).get(), n.moveOp = (r, u) => i.writeCursor().writeMove(r, u).get(), n.insertOp = (r, u) => i.writeCursor().writeAtPath(r, "i", u).get(), n.replaceOp = (r, u, y) => i.writeCursor().at(r, (D) => {
+  n.removeOp = (r, u = !0) => s.writeCursor().writeAtPath(r, "r", u).get(), n.moveOp = (r, u) => s.writeCursor().writeMove(r, u).get(), n.insertOp = (r, u) => s.writeCursor().writeAtPath(r, "i", u).get(), n.replaceOp = (r, u, y) => s.writeCursor().at(r, (D) => {
     D.write("r", u), D.write("i", y);
-  }).get(), n.editOp = (r, u, y, D = !1) => i.writeCursor().at(r, (b) => _(b, u, y, D)).get();
+  }).get(), n.editOp = (r, u, y, D = !1) => s.writeCursor().at(r, (m) => _(m, u, y, D)).get();
   const R = (r, u) => r != null && (typeof u == "number" ? Array.isArray(r) : typeof r == "object"), Z = (r, u) => R(r, u) ? r[u] : void 0, pe = {};
   function J(r) {
     let u = r.type ? r.type : r;
@@ -753,8 +753,8 @@ function Lt() {
     transform: (r) => r
   });
   const ve = (r) => r == null ? null : r.et ? Ie(r.et) : r.es ? pe["text-unicode"] : r.ena != null ? pe.number : null, f = (r) => r.es ? r.es : r.ena != null ? r.ena : r.e, _ = (r, u, y, D = !1) => {
-    const [b, C] = typeof u == "string" ? [Ie(u), u] : [u, u.name];
-    !D && b.isNoop && b.isNoop(y) || (C === "number" ? r.write("ena", y) : C === "text-unicode" ? r.write("es", y) : (r.write("et", C), r.write("e", y)));
+    const [m, C] = typeof u == "string" ? [Ie(u), u] : [u, u.name];
+    !D && m.isNoop && m.isNoop(y) || (C === "number" ? r.write("ena", y) : C === "text-unicode" ? r.write("es", y) : (r.write("et", C), r.write("e", y)));
   };
   function w(r) {
     l(typeof r == "number"), l(r >= 0), l(r === (0 | r));
@@ -765,282 +765,282 @@ function Lt() {
   function z(r) {
     if (r === null) return;
     const u = /* @__PURE__ */ new Set(), y = /* @__PURE__ */ new Set(), D = (C) => {
-      let $ = !0, j = !1;
+      let $ = !0, T = !1;
       for (let p in C) {
         const v = C[p];
         if ($ = !1, l(p === "p" || p === "r" || p === "d" || p === "i" || p === "e" || p === "es" || p === "ena" || p === "et", "Invalid component item '" + p + "'"), p === "p") w(v), l(!u.has(v)), u.add(v), l(C.r === void 0);
         else if (p === "d") w(v), l(!y.has(v)), y.add(v), l(C.i === void 0);
         else if (p === "e" || p === "es" || p === "ena") {
-          l(!j), j = !0;
-          const m = ve(C);
-          l(m, "Missing type in edit"), m.checkValidOp && m.checkValidOp(f(C));
+          l(!T), T = !0;
+          const b = ve(C);
+          l(b, "Missing type in edit"), b.checkValidOp && b.checkValidOp(f(C));
         }
       }
       l(!$);
-    }, b = (C, $, j) => {
+    }, m = (C, $, T) => {
       if (!Array.isArray(C)) throw Error("Op must be null or a list");
       if (C.length === 0) throw Error("Empty descent");
       $ || L(C[0]);
-      let p = 1, v = 0, m = 0;
+      let p = 1, v = 0, b = 0;
       for (let I = 0; I < C.length; I++) {
-        const T = C[I];
-        if (l(T != null), Array.isArray(T)) {
-          const G = b(T, !1);
+        const j = C[I];
+        if (l(j != null), Array.isArray(j)) {
+          const G = m(j, !1);
           if (v) {
-            const g = typeof m, N = typeof G;
-            g === N ? l(m < G, "descent keys are not in order") : l(g === "number" && N === "string");
+            const g = typeof b, N = typeof G;
+            g === N ? l(b < G, "descent keys are not in order") : l(g === "number" && N === "string");
           }
-          m = G, v++, p = 3;
-        } else typeof T == "object" ? (l(p === 1, `Prev not scalar - instead ${p}`), D(T), p = 2) : (l(p !== 3), L(T), l(i.isValidPathItem(T), "Invalid path key"), p = 1);
+          b = G, v++, p = 3;
+        } else typeof j == "object" ? (l(p === 1, `Prev not scalar - instead ${p}`), D(j), p = 2) : (l(p !== 3), L(j), l(s.isValidPathItem(j), "Invalid path key"), p = 1);
       }
       return l(v !== 1, "Operation makes multiple descents. Remove some []"), l(p === 2 || p === 3), C[0];
     };
-    b(r, !0), l(u.size === y.size, "Mismatched picks and drops in op");
+    m(r, !0), l(u.size === y.size, "Mismatched picks and drops in op");
     for (let C = 0; C < u.size; C++) l(u.has(C)), l(y.has(C));
   }
   function H(r) {
     let u = 0, y = [];
-    const D = i.writeCursor();
-    return D.mergeTree(r, (b, C) => {
-      const $ = ve(b);
+    const D = s.writeCursor();
+    return D.mergeTree(r, (m, C) => {
+      const $ = ve(m);
       if ($) {
-        const p = f(b);
+        const p = f(m);
         _(C, $, $.normalize ? $.normalize(p) : p);
       }
-      for (const p of ["r", "p", "i", "d"]) if (b[p] !== void 0) {
-        const v = p === "p" || p === "d" ? (j = b[p], y[j] == null && (y[j] = u++), y[j]) : b[p];
+      for (const p of ["r", "p", "i", "d"]) if (m[p] !== void 0) {
+        const v = p === "p" || p === "d" ? (T = m[p], y[T] == null && (y[T] = u++), y[T]) : m[p];
         C.write(p, v);
       }
-      var j;
+      var T;
     }), D.get();
   }
   function De(r, u) {
     if (z(u), u === null) return r;
     const y = [];
-    return function D(b, C) {
-      let $ = b, j = 0, p = {
-        root: b
-      }, v = 0, m = p, I = "root";
-      function T() {
-        for (; v < j; v++) {
+    return function D(m, C) {
+      let $ = m, T = 0, p = {
+        root: m
+      }, v = 0, b = p, I = "root";
+      function j() {
+        for (; v < T; v++) {
           let G = C[v];
-          typeof G != "object" && (l(R(m, I)), m = m[I] = W(m[I]), I = G);
+          typeof G != "object" && (l(R(b, I)), b = b[I] = W(b[I]), I = G);
         }
       }
-      for (; j < C.length; j++) {
-        const G = C[j];
+      for (; T < C.length; T++) {
+        const G = C[T];
         if (Array.isArray(G)) {
           const g = D($, G);
-          g !== $ && g !== void 0 && (T(), $ = m[I] = g);
+          g !== $ && g !== void 0 && (j(), $ = b[I] = g);
         } else if (typeof G == "object") {
-          G.d != null ? (T(), $ = h(m, I, y[G.d])) : G.i !== void 0 && (T(), $ = h(m, I, G.i));
+          G.d != null ? (j(), $ = h(b, I, y[G.d])) : G.i !== void 0 && (j(), $ = h(b, I, G.i));
           const g = ve(G);
-          if (g) T(), $ = m[I] = g.apply($, f(G));
+          if (g) j(), $ = b[I] = g.apply($, f(G));
           else if (G.e !== void 0) throw Error("Subtype " + G.et + " undefined");
         } else $ = Z($, G);
       }
       return p.root;
-    }(r = function D(b, C) {
+    }(r = function D(m, C) {
       const $ = [];
-      let j = 0;
-      for (; j < C.length; j++) {
-        const I = C[j];
+      let T = 0;
+      for (; T < C.length; T++) {
+        const I = C[T];
         if (Array.isArray(I)) break;
-        typeof I != "object" && ($.push(b), b = Z(b, I));
+        typeof I != "object" && ($.push(m), m = Z(m, I));
       }
-      for (let I = C.length - 1; I >= j; I--) b = D(b, C[I]);
-      for (--j; j >= 0; j--) {
-        const I = C[j];
+      for (let I = C.length - 1; I >= T; I--) m = D(m, C[I]);
+      for (--T; T >= 0; T--) {
+        const I = C[T];
         if (typeof I != "object") {
-          const T = $.pop();
-          b = b === Z(T, I) ? T : b === void 0 ? c(T, I) : (v = I, m = b, (p = W(p = T))[v] = m, p);
-        } else O(I) && (l(b !== void 0, "Cannot pick up or remove undefined"), I.p != null && (y[I.p] = b), b = void 0);
+          const j = $.pop();
+          m = m === Z(j, I) ? j : m === void 0 ? c(j, I) : (v = I, b = m, (p = W(p = j))[v] = b, p);
+        } else O(I) && (l(m !== void 0, "Cannot pick up or remove undefined"), I.p != null && (y[I.p] = m), m = void 0);
       }
-      var p, v, m;
-      return b;
+      var p, v, b;
+      return m;
     }(r, u), u);
   }
   function ue(r, u) {
     r = r.slice(), z(u);
-    const y = i.readCursor(u);
-    let D, b, C = !1;
+    const y = s.readCursor(u);
+    let D, m, C = !1;
     const $ = [];
     for (let p = 0; ; p++) {
-      const v = r[p], m = y.getComponent();
-      if (m && (m.r !== void 0 ? C = !0 : m.p != null && (C = !1, D = m.p, b = p)), p >= r.length) break;
+      const v = r[p], b = y.getComponent();
+      if (b && (b.r !== void 0 ? C = !0 : b.p != null && (C = !1, D = b.p, m = p)), p >= r.length) break;
       let I = 0;
-      const T = i.advancer(y, void 0, (g, N) => {
+      const j = s.advancer(y, void 0, (g, N) => {
         O(N) && I++;
       });
-      $.unshift(T);
-      const G = T(v);
+      $.unshift(j);
+      const G = j(v);
       if (typeof v == "number" && (r[p] -= I), !G) break;
     }
     if ($.forEach((p) => p.end()), C) return null;
-    const j = () => {
+    const T = () => {
       let p = 0;
       if (D != null) {
         const v = y.getPath();
-        p = v.length, r = v.concat(r.slice(b));
+        p = v.length, r = v.concat(r.slice(m));
       }
       for (; p < r.length; p++) {
-        const v = r[p], m = a(y), I = ve(m);
+        const v = r[p], b = a(y), I = ve(b);
         if (I) {
-          const g = f(m);
+          const g = f(b);
           I.transformPosition && (r[p] = I.transformPosition(r[p], g));
           break;
         }
-        let T = 0;
-        const G = i.advancer(y, (g, N) => o(N) ? ~(g - T) : g - T, (g, N) => {
-          o(N) && T++;
+        let j = 0;
+        const G = s.advancer(y, (g, N) => o(N) ? ~(g - j) : g - j, (g, N) => {
+          o(N) && j++;
         })(v);
-        if (typeof v == "number" && (r[p] += T), !G) break;
+        if (typeof v == "number" && (r[p] += j), !G) break;
       }
     };
     return D != null ? y.eachDrop(null, (p) => {
-      p === D && j();
-    }) : j(), r;
+      p === D && T();
+    }) : T(), r;
   }
   function ne(r, u) {
     if (z(r), z(u), r == null) return u;
     if (u == null) return r;
     let y = 0;
-    const D = i.readCursor(r), b = i.readCursor(u), C = i.writeCursor(), $ = [], j = [], p = [], v = [], m = [], I = [], T = /* @__PURE__ */ new Set();
+    const D = s.readCursor(r), m = s.readCursor(u), C = s.writeCursor(), $ = [], T = [], p = [], v = [], b = [], I = [], j = /* @__PURE__ */ new Set();
     D.traverse(null, (g) => {
       g.p != null && (p[g.p] = D.clone());
-    }), b.traverse(null, (g) => {
-      g.d != null && (v[g.d] = b.clone());
+    }), m.traverse(null, (g) => {
+      g.d != null && (v[g.d] = m.clone());
     });
-    const G = i.writeCursor();
-    return function g(N, re, te, K, se, Te, be, _e) {
+    const G = s.writeCursor();
+    return function g(N, re, te, K, se, je, me, _e) {
       l(re || te);
-      const oe = a(re), Pe = a(te), Me = !!Pe && Pe.r !== void 0, Le = !!oe && oe.i !== void 0, Ue = oe ? oe.d : null, Ee = Pe ? Pe.p : null, $e = (Te || Me) && Ee == null;
-      if (Ee != null) K = v[Ee], be = j[Ee] = new i.WriteCursor();
+      const oe = a(re), Pe = a(te), Ue = !!Pe && Pe.r !== void 0, Le = !!oe && oe.i !== void 0, Me = oe ? oe.d : null, Ee = Pe ? Pe.p : null, $e = (je || Ue) && Ee == null;
+      if (Ee != null) K = v[Ee], me = T[Ee] = new s.WriteCursor();
       else if (Pe && Pe.r !== void 0) K = null;
       else {
         const P = a(K);
         P && P.d != null && (K = null);
       }
       const Q = a(K);
-      if (Ue != null) if (N = p[Ue], _e = $[Ue] = new i.WriteCursor(), $e) Te && !Me && _e.write("r", !0);
+      if (Me != null) if (N = p[Me], _e = $[Me] = new s.WriteCursor(), $e) je && !Ue && _e.write("r", !0);
       else {
-        const P = m[Ue] = y++;
-        be.write("d", P);
+        const P = b[Me] = y++;
+        me.write("d", P);
       }
       else if (oe && oe.i !== void 0) N = null;
       else {
         const P = a(N);
         P && P.p != null && (N = null);
       }
-      let U;
-      Le ? (l(se === void 0), U = oe.i) : U = se;
-      const B = (Ee == null ? !Le || Te || Me : U === void 0) ? null : be.getComponent();
+      let M;
+      Le ? (l(se === void 0), M = oe.i) : M = se;
+      const B = (Ee == null ? !Le || je || Ue : M === void 0) ? null : me.getComponent();
       if (Ee != null) {
         if (!(se !== void 0 || Le)) {
-          const P = Ue != null ? m[Ue] : y++;
+          const P = Me != null ? b[Me] : y++;
           I[Ee] = P, _e.write("p", P);
         }
-      } else Me && (Le || se !== void 0 || (Pe.r, _e.write("r", Pe.r)));
-      const M = $e ? null : ve(oe), A = ve(Q);
-      if ((M || A) && (M && M.name, A && A.name), M && A) {
-        l(M === A);
-        const P = f(oe), x = f(Q), he = M.compose(P, x);
-        _(be, M, he), T.add(Q);
-      } else M ? _(be, M, f(oe)) : A && (_(be, A, f(Q)), T.add(Q));
-      const k = typeof U == "object" && U != null;
+      } else Ue && (Le || se !== void 0 || (Pe.r, _e.write("r", Pe.r)));
+      const U = $e ? null : ve(oe), A = ve(Q);
+      if ((U || A) && (U && U.name, A && A.name), U && A) {
+        l(U === A);
+        const P = f(oe), x = f(Q), he = U.compose(P, x);
+        _(me, U, he), j.add(Q);
+      } else U ? _(me, U, f(oe)) : A && (_(me, A, f(Q)), j.add(Q));
+      const k = typeof M == "object" && M != null;
       let X = !1, Y = 0, ee = 0, fe = 0, de = 0, le = 0;
-      const ye = i.advancer(K, (P, x) => o(x) ? de - P - 1 : P - de, (P, x) => {
+      const ye = s.advancer(K, (P, x) => o(x) ? de - P - 1 : P - de, (P, x) => {
         o(x) && de++;
-      }), q = i.advancer(N, (P, x) => O(x) ? Y - P - 1 : P - Y, (P, x) => {
+      }), q = s.advancer(N, (P, x) => O(x) ? Y - P - 1 : P - Y, (P, x) => {
         O(x) && Y++;
       });
-      if (i.eachChildOf(re, te, (P, x, he) => {
-        let me, We, He = P, Ne = P, Ye = P;
+      if (s.eachChildOf(re, te, (P, x, he) => {
+        let be, We, He = P, Ne = P, Ye = P;
         if (typeof P == "number") {
           let Oe = P + fe;
           We = ye(Oe), Ne = Oe + de;
           let ce = P + ee;
-          me = q(ce), o(a(We)) && (me = null), He = ce + Y, Ye = P + le, l(He >= 0, "p1PickKey is negative"), l(Ne >= 0, "p2DropKey is negative");
+          be = q(ce), o(a(We)) && (be = null), He = ce + Y, Ye = P + le, l(He >= 0, "p1PickKey is negative"), l(Ne >= 0, "p2DropKey is negative");
           const ke = o(a(x)), Ge = O(a(he));
           (ke || Ge && !$e) && le--, ke && ee--, Ge && fe--;
-        } else me = q(P), We = ye(P);
-        _e.descend(He), be.descend(Ne);
-        const ze = k && !o(a(x)) ? U[Ye] : void 0, Se = g(me, x, he, We, ze, $e, be, _e);
-        var je, S, ie;
-        k && !$e ? ze !== Se && (X || (U = Array.isArray(U) ? U.slice() : Object.assign({}, U), X = !0), je = U, ie = Se, typeof (S = Ye) == "number" ? (l(Array.isArray(je)), l(S < je.length)) : (l(!Array.isArray(je)), l(je[S] !== void 0)), ie === void 0 ? typeof S == "number" ? je.splice(S, 1) : delete je[S] : je[S] = ie) : l(Se === void 0), be.ascend(), _e.ascend();
-      }), q.end(), ye.end(), B != null) B.i = U;
-      else if (!Te && !Me && Ee == null) return U;
-    }(D, D.clone(), b, b.clone(), void 0, !1, C, G), C.reset(), C.mergeTree(G.get()), C.reset(), C.get(), $.map((g) => g.get()), j.map((g) => g.get()), D.traverse(C, (g, N) => {
+        } else be = q(P), We = ye(P);
+        _e.descend(He), me.descend(Ne);
+        const ze = k && !o(a(x)) ? M[Ye] : void 0, Se = g(be, x, he, We, ze, $e, me, _e);
+        var Te, S, ie;
+        k && !$e ? ze !== Se && (X || (M = Array.isArray(M) ? M.slice() : Object.assign({}, M), X = !0), Te = M, ie = Se, typeof (S = Ye) == "number" ? (l(Array.isArray(Te)), l(S < Te.length)) : (l(!Array.isArray(Te)), l(Te[S] !== void 0)), ie === void 0 ? typeof S == "number" ? Te.splice(S, 1) : delete Te[S] : Te[S] = ie) : l(Se === void 0), me.ascend(), _e.ascend();
+      }), q.end(), ye.end(), B != null) B.i = M;
+      else if (!je && !Ue && Ee == null) return M;
+    }(D, D.clone(), m, m.clone(), void 0, !1, C, G), C.reset(), C.mergeTree(G.get()), C.reset(), C.get(), $.map((g) => g.get()), T.map((g) => g.get()), D.traverse(C, (g, N) => {
       const re = g.p;
       if (re != null) {
-        const te = m[re];
+        const te = b[re];
         te != null && N.write("p", te);
         const K = $[re];
         K && K.get(), K && N.mergeTree(K.get());
       } else g.r !== void 0 && N.write("r", g.r);
-    }), C.reset(), C.get(), b.traverse(C, (g, N) => {
+    }), C.reset(), C.get(), m.traverse(C, (g, N) => {
       const re = g.d;
       if (re != null) {
         const K = I[re];
         K != null && N.write("d", K);
-        const se = j[re];
+        const se = T[re];
         se && N.mergeTree(se.get());
       } else g.i !== void 0 && N.write("i", g.i);
       const te = ve(g);
-      te && !T.has(g) && _(N, te, f(g));
+      te && !j.has(g) && _(N, te, f(g));
     }), C.get();
   }
   function ae(r) {
     if (r == null) return null;
-    const u = new i.ReadCursor(r), y = new i.WriteCursor();
+    const u = new s.ReadCursor(r), y = new s.WriteCursor();
     let D;
-    const b = [], C = [];
-    return function $(j, p, v) {
-      const m = j.getComponent();
-      let I, T = !1;
-      if (m) {
-        m.p != null && (p.write("d", m.p), b[m.p] = j.clone()), m.r !== void 0 && p.write("i", m.r), m.d != null && (p.write("p", m.d), v = void 0), m.i !== void 0 && (v = I = m.i);
-        const g = ve(m);
-        g && (v === void 0 ? (D || (D = /* @__PURE__ */ new Set()), D.add(m)) : (f(m), v = g.apply(v, f(m)), T = !0));
+    const m = [], C = [];
+    return function $(T, p, v) {
+      const b = T.getComponent();
+      let I, j = !1;
+      if (b) {
+        b.p != null && (p.write("d", b.p), m[b.p] = T.clone()), b.r !== void 0 && p.write("i", b.r), b.d != null && (p.write("p", b.d), v = void 0), b.i !== void 0 && (v = I = b.i);
+        const g = ve(b);
+        g && (v === void 0 ? (D || (D = /* @__PURE__ */ new Set()), D.add(b)) : (f(b), v = g.apply(v, f(b)), j = !0));
       }
       let G = 0;
-      for (const g of j) {
+      for (const g of T) {
         p.descend(g);
         const N = typeof g == "number" ? g - G : g, re = Z(v, N);
-        o(j.getComponent()) && G++;
-        const te = $(j, p, re);
+        o(T.getComponent()) && G++;
+        const te = $(T, p, re);
         if (v !== void 0 && te !== void 0) {
-          if (T || (T = !0, v = W(v)), !R(v, N)) throw Error("Cannot modify child - invalid operation");
+          if (j || (j = !0, v = W(v)), !R(v, N)) throw Error("Cannot modify child - invalid operation");
           v[N] = te;
         }
         p.ascend();
       }
-      if (I === void 0) return T ? v : void 0;
+      if (I === void 0) return j ? v : void 0;
       p.write("r", v);
-    }(u, y, void 0), D && (y.reset(), function $(j, p, v) {
-      const m = p.getComponent();
-      if (m) {
-        const g = m.d;
-        if (g != null && (j = b[g], v = C[g] = i.writeCursor()), D.has(m)) {
-          const N = ve(m);
+    }(u, y, void 0), D && (y.reset(), function $(T, p, v) {
+      const b = p.getComponent();
+      if (b) {
+        const g = b.d;
+        if (g != null && (T = m[g], v = C[g] = s.writeCursor()), D.has(b)) {
+          const N = ve(b);
           if (!N.invert) throw Error(`Cannot invert subtype ${N.name}`);
-          _(v, N, N.invert(f(m)));
+          _(v, N, N.invert(f(b)));
         }
       }
-      let I = 0, T = 0;
-      const G = i.advancer(j, (g, N) => O(N) ? I - g - 1 : g - I, (g, N) => {
+      let I = 0, j = 0;
+      const G = s.advancer(T, (g, N) => O(N) ? I - g - 1 : g - I, (g, N) => {
         O(N) && I++;
       });
       for (const g of p) if (typeof g == "number") {
-        const N = g - T, re = G(N), te = N + I;
-        v.descend(te), $(re, p, v), o(p.getComponent()) && T++, v.ascend();
+        const N = g - j, re = G(N), te = N + I;
+        v.descend(te), $(re, p, v), o(p.getComponent()) && j++, v.ascend();
       } else v.descend(g), $(G(g), p, v), v.ascend();
       G.end();
-    }(u.clone(), u, y), C.length && (y.reset(), u.traverse(y, ($, j) => {
+    }(u.clone(), u, y), C.length && (y.reset(), u.traverse(y, ($, T) => {
       const p = $.p;
       if (p != null) {
         const v = C[p];
-        v && v.get(), v && j.mergeTree(v.get());
+        v && v.get(), v && T.mergeTree(v.get());
       }
     }))), y.get();
   }
@@ -1050,46 +1050,46 @@ function Lt() {
       var v;
       return p.r !== void 0 || ((v = ve(p)) === null || v === void 0 ? void 0 : v.makeInvertible) != null;
     })) return r;
-    const y = new i.ReadCursor(r), D = new i.WriteCursor();
-    let b = !1;
-    const C = [], $ = [], j = (p, v, m) => {
+    const y = new s.ReadCursor(r), D = new s.WriteCursor();
+    let m = !1;
+    const C = [], $ = [], T = (p, v, b) => {
       const I = p.getComponent();
-      let T = !1;
+      let j = !1;
       if (I) {
         I.d != null && v.write("d", I.d), I.i !== void 0 && v.write("i", I.i);
         const g = I.p;
-        if (g != null && (C[g] = p.clone(), l(m !== void 0, "Operation picks up at an invalid key"), $[g] = m, v.write("p", I.p)), I.r !== void 0 && m === void 0) throw Error("Invalid doc / op in makeInvertible: removed item missing from doc");
+        if (g != null && (C[g] = p.clone(), l(b !== void 0, "Operation picks up at an invalid key"), $[g] = b, v.write("p", I.p)), I.r !== void 0 && b === void 0) throw Error("Invalid doc / op in makeInvertible: removed item missing from doc");
         const N = ve(I);
-        N && (N.makeInvertible ? b = !0 : _(v, N, f(I), !0));
+        N && (N.makeInvertible ? m = !0 : _(v, N, f(I), !0));
       }
       let G = 0;
       for (const g of p) {
         v.descend(g);
-        const N = typeof g == "number" ? g - G : g, re = Z(m, N), te = j(p, v, re);
-        re !== te && (T || (T = !0, m = W(m)), te === void 0 ? (m = c(m, N), typeof g == "number" && G++) : m[N] = te), v.ascend();
+        const N = typeof g == "number" ? g - G : g, re = Z(b, N), te = T(p, v, re);
+        re !== te && (j || (j = !0, b = W(b)), te === void 0 ? (b = c(b, N), typeof g == "number" && G++) : b[N] = te), v.ascend();
       }
-      return I && (I.r !== void 0 ? (v.write("r", s.default(m)), m = void 0) : I.p != null && (m = void 0)), m;
+      return I && (I.r !== void 0 ? (v.write("r", i.default(b)), b = void 0) : I.p != null && (b = void 0)), b;
     };
-    return j(y, D, u), D.get(), b && (D.reset(), function p(v, m, I, T, G) {
-      const g = m.getComponent();
+    return T(y, D, u), D.get(), m && (D.reset(), function p(v, b, I, j, G) {
+      const g = b.getComponent();
       if (g) {
-        g.i !== void 0 ? (T = g.i, G = !0) : g.d != null && (T = $[g.d], v = C[g.d], G = !1, g.d);
+        g.i !== void 0 ? (j = g.i, G = !0) : g.d != null && (j = $[g.d], v = C[g.d], G = !1, g.d);
         let K = ve(g);
         if (K && K.makeInvertible) {
           const se = f(g);
-          _(I, K, K.makeInvertible(se, T), !0);
+          _(I, K, K.makeInvertible(se, j), !0);
         }
       }
       let N = 0, re = 0;
-      const te = i.advancer(v, (K, se) => O(se) ? N - K - 1 : K - N, (K, se) => {
+      const te = s.advancer(v, (K, se) => O(se) ? N - K - 1 : K - N, (K, se) => {
         O(se) && N++;
       });
-      for (const K of m) if (typeof K == "number") {
-        const se = K - re, Te = te(se), be = se + N, _e = Z(T, G ? se : be);
-        I.descend(K), p(Te, m, I, _e, G), o(m.getComponent()) && re++, I.ascend();
+      for (const K of b) if (typeof K == "number") {
+        const se = K - re, je = te(se), me = se + N, _e = Z(j, G ? se : me);
+        I.descend(K), p(je, b, I, _e, G), o(b.getComponent()) && re++, I.ascend();
       } else {
-        const se = Z(T, K);
-        I.descend(K), p(te(K), m, I, se, G), I.ascend();
+        const se = Z(j, K);
+        I.descend(K), p(te(K), b, I, se, G), I.ascend();
       }
       te.end();
     }(y.clone(), y, D, u, !1)), D.get();
@@ -1114,87 +1114,87 @@ function Lt() {
       result: r
     };
     z(r), z(u);
-    let b = null;
-    const C = [], $ = [], j = [], p = [], v = [], m = [], I = [], T = [], G = [], g = [], N = [], re = [], te = [], K = [], se = [];
-    let Te = 0;
-    const be = i.readCursor(r), _e = i.readCursor(u), oe = i.writeCursor();
-    if (function Q(U, B = null, M) {
+    let m = null;
+    const C = [], $ = [], T = [], p = [], v = [], b = [], I = [], j = [], G = [], g = [], N = [], re = [], te = [], K = [], se = [];
+    let je = 0;
+    const me = s.readCursor(r), _e = s.readCursor(u), oe = s.writeCursor();
+    if (function Q(M, B = null, U) {
       const A = a(B);
-      A && (A.r !== void 0 ? M = B.clone() : A.p != null && (M = null, m[A.p] = U.clone()));
-      const k = U.getComponent();
+      A && (A.r !== void 0 ? U = B.clone() : A.p != null && (U = null, b[A.p] = M.clone()));
+      const k = M.getComponent();
       let X;
-      k && (X = k.p) != null && (v[X] = B ? B.clone() : null, j[X] = U.clone(), M && (g[X] = !0, G[X] = M), A && A.p != null && (K[X] = A.p));
-      const Y = i.advancer(B);
-      for (const ee of U) Q(U, Y(ee), M);
+      k && (X = k.p) != null && (v[X] = B ? B.clone() : null, T[X] = M.clone(), U && (g[X] = !0, G[X] = U), A && A.p != null && (K[X] = A.p));
+      const Y = s.advancer(B);
+      for (const ee of M) Q(M, Y(ee), U);
       Y.end();
-    }(_e, be, null), function Q(U, B, M, A, k) {
-      const X = M.getComponent();
+    }(_e, me, null), function Q(M, B, U, A, k) {
+      const X = U.getComponent();
       let Y, ee = !1;
-      X && ((Y = X.d) != null ? (p[Y] = M.clone(), A != null && (se[A] == null && (se[A] = []), se[A].push(Y)), U = v[Y] || null, B = j[Y] || null, g[Y] ? (k && (N[Y] = !0), k = G[Y] || null) : !k || D !== 1 && K[Y] != null || b == null && (b = {
+      X && ((Y = X.d) != null ? (p[Y] = U.clone(), A != null && (se[A] == null && (se[A] = []), se[A].push(Y)), M = v[Y] || null, B = T[Y] || null, g[Y] ? (k && (N[Y] = !0), k = G[Y] || null) : !k || D !== 1 && K[Y] != null || m == null && (m = {
         type: d.ConflictType.RM_UNEXPECTED_CONTENT,
         op1: n.removeOp(k.getPath()),
-        op2: n.moveOp(B.getPath(), M.getPath())
-      }), ee = !0) : X.i !== void 0 && (U = B = null, ee = !0, k && b == null && (b = {
+        op2: n.moveOp(B.getPath(), U.getPath())
+      }), ee = !0) : X.i !== void 0 && (M = B = null, ee = !0, k && m == null && (m = {
         type: d.ConflictType.RM_UNEXPECTED_CONTENT,
         op1: n.removeOp(k.getPath()),
-        op2: n.insertOp(M.getPath(), X.i)
+        op2: n.insertOp(U.getPath(), X.i)
       })));
-      const fe = a(U);
-      fe && (fe.r !== void 0 ? k = U.clone() : fe.p != null && (fe.p, A = fe.p, k = null));
+      const fe = a(M);
+      fe && (fe.r !== void 0 ? k = M.clone() : fe.p != null && (fe.p, A = fe.p, k = null));
       const de = ve(X);
-      de && k && b == null && (b = {
+      de && k && m == null && (m = {
         type: d.ConflictType.RM_UNEXPECTED_CONTENT,
         op1: n.removeOp(k.getPath()),
-        op2: n.editOp(M.getPath(), de, f(X), !0)
+        op2: n.editOp(U.getPath(), de, f(X), !0)
       });
       let le = 0, ye = 0;
-      const q = i.advancer(B, (x, he) => O(he) ? le - x - 1 : x - le, (x, he) => {
+      const q = s.advancer(B, (x, he) => O(he) ? le - x - 1 : x - le, (x, he) => {
         O(he) && le++;
-      }), P = i.advancer(U);
-      for (const x of M) if (typeof x == "number") {
-        const he = x - ye, me = q(he);
-        ye += +Q(P(he + le), me, M, A, k);
+      }), P = s.advancer(M);
+      for (const x of U) if (typeof x == "number") {
+        const he = x - ye, be = q(he);
+        ye += +Q(P(he + le), be, U, A, k);
       } else {
         const he = q(x);
-        Q(P(x), he, M, A, k);
+        Q(P(x), he, U, A, k);
       }
       return q.end(), P.end(), ee;
-    }(be, _e, _e.clone(), null, null), p.map((Q) => Q && Q.get()), b) return {
+    }(me, _e, _e.clone(), null, null), p.map((Q) => Q && Q.get()), m) return {
       ok: !1,
-      conflict: b
+      conflict: m
     };
     N.map((Q) => !!Q);
     const Pe = [];
-    let Me = null;
-    (function Q(U, B, M, A, k) {
+    let Ue = null;
+    (function Q(M, B, U, A, k) {
       let X = !1;
       const Y = a(B);
       if (O(Y)) {
         const q = Y.p;
-        q != null ? (M = p[q], A = re[q] = i.writeCursor(), X = !0, k = null) : (M = null, k = B.clone());
-      } else o(a(M)) && (M = null);
-      const ee = U.getComponent();
+        q != null ? (U = p[q], A = re[q] = s.writeCursor(), X = !0, k = null) : (U = null, k = B.clone());
+      } else o(a(U)) && (U = null);
+      const ee = M.getComponent();
       if (ee) {
         const q = ee.p;
-        q != null ? (k && (T[q] = k), Pe[q] = k || D === 1 && X ? null : A.getComponent(), C[q] = U.clone(), M && (I[q] = M.clone())) : ee.r !== void 0 && (k || A.write("r", !0), (k || X) && (Me == null && (Me = /* @__PURE__ */ new Set()), Me.add(ee)));
+        q != null ? (k && (j[q] = k), Pe[q] = k || D === 1 && X ? null : A.getComponent(), C[q] = M.clone(), U && (I[q] = U.clone())) : ee.r !== void 0 && (k || A.write("r", !0), (k || X) && (Ue == null && (Ue = /* @__PURE__ */ new Set()), Ue.add(ee)));
       }
       let fe = 0, de = 0;
-      const le = i.advancer(B, void 0, (q, P) => {
+      const le = s.advancer(B, void 0, (q, P) => {
         O(P) && fe++;
-      }), ye = i.advancer(M, (q, P) => o(P) ? ~(q - de) : q - de, (q, P) => {
+      }), ye = s.advancer(U, (q, P) => o(P) ? ~(q - de) : q - de, (q, P) => {
         o(P) && de++;
       });
-      if (U) for (const q of U) if (typeof q == "string") {
+      if (M) for (const q of M) if (typeof q == "string") {
         const P = le(q), x = ye(q);
-        A.descend(q), Q(U, P, x, A, k), A.ascend();
+        A.descend(q), Q(M, P, x, A, k), A.ascend();
       } else {
-        const P = le(q), x = q - fe, he = O(a(P)) ? null : ye(x), me = x + de;
-        l(me >= 0), A.descend(me), Q(U, P, he, A, k), A.ascend();
+        const P = le(q), x = q - fe, he = O(a(P)) ? null : ye(x), be = x + de;
+        l(be >= 0), A.descend(be), Q(M, P, he, A, k), A.ascend();
       }
       le.end(), ye.end();
-    })(be, _e, _e.clone(), oe, null), oe.reset();
+    })(me, _e, _e.clone(), oe, null), oe.reset();
     let Le = [];
-    if (function Q(U, B, M, A, k, X) {
+    if (function Q(M, B, U, A, k, X) {
       l(B);
       const Y = B.getComponent();
       let ee = a(A), fe = !1;
@@ -1206,31 +1206,31 @@ function Lt() {
         let Oe = !1;
         if (Y.i !== void 0 || S != null && ie) {
           let ce;
-          ee && (ee.i !== void 0 || (ce = ee.d) != null && !g[ce]) && (Oe = ce != null ? S != null && S === K[ce] : t.default(ee.i, Y.i), Oe || ce != null && D !== 1 && K[ce] != null || b == null && (b = {
+          ee && (ee.i !== void 0 || (ce = ee.d) != null && !g[ce]) && (Oe = ce != null ? S != null && S === K[ce] : t.default(ee.i, Y.i), Oe || ce != null && D !== 1 && K[ce] != null || m == null && (m = {
             type: d.ConflictType.DROP_COLLISION,
             op1: de(S != null ? C[S] : null, B, Y),
-            op2: de(ce != null ? j[ce] : null, A, ee)
-          })), Oe || (X ? b == null && (b = {
+            op2: de(ce != null ? T[ce] : null, A, ee)
+          })), Oe || (X ? m == null && (m = {
             type: d.ConflictType.RM_UNEXPECTED_CONTENT,
             op1: de(S != null ? C[S] : null, B, Y),
             op2: n.removeOp(X.getPath())
-          }) : (S != null ? (Le[Te] = S, k.write("d", ie.p = Te++)) : k.write("i", s.default(Y.i)), fe = !0));
+          }) : (S != null ? (Le[je] = S, k.write("d", ie.p = je++)) : k.write("i", i.default(Y.i)), fe = !0));
         } else if (S != null && !ie) {
-          const ce = T[S];
+          const ce = j[S];
           ce && (X = ce.clone());
         }
-        S != null ? (U = C[S], M = m[S], A = I[S]) : Y.i !== void 0 && (U = M = null, Oe || (A = null));
-      } else O(a(U)) && (U = M = A = null);
-      const le = a(U), ye = a(M);
+        S != null ? (M = C[S], U = b[S], A = I[S]) : Y.i !== void 0 && (M = U = null, Oe || (A = null));
+      } else O(a(M)) && (M = U = A = null);
+      const le = a(M), ye = a(U);
       if (O(ye)) {
         const S = ye.p;
-        ye.r !== void 0 && (!le || le.r === void 0) || g[S] ? (A = null, X = M.clone()) : S != null && (A = p[S], D !== 1 && K[S] != null || ((k = te[S]) || (k = te[S] = i.writeCursor()), k.reset(), X = null));
+        ye.r !== void 0 && (!le || le.r === void 0) || g[S] ? (A = null, X = U.clone()) : S != null && (A = p[S], D !== 1 && K[S] != null || ((k = te[S]) || (k = te[S] = s.writeCursor()), k.reset(), X = null));
       } else !o(Y) && o(ee) && (A = null);
       ee = A != null ? A.getComponent() : null;
       const q = ve(Y);
       if (q) {
         const S = f(Y);
-        if (X) b == null && (b = {
+        if (X) m == null && (m = {
           type: d.ConflictType.RM_UNEXPECTED_CONTENT,
           op1: n.editOp(B.getPath(), q, S, !0),
           op2: n.removeOp(X.getPath())
@@ -1242,32 +1242,32 @@ function Lt() {
             if (q !== ie) throw Error("Transforming incompatible types");
             const ce = f(ee);
             Oe = q.transform(S, ce, y);
-          } else Oe = s.default(S);
+          } else Oe = i.default(S);
           _(k, q, Oe);
         }
       }
-      let P = 0, x = 0, he = 0, me = 0, We = 0, He = 0, Ne = U != null && U.descendFirst(), Ye = Ne;
-      const ze = i.advancer(M, void 0, (S, ie) => {
+      let P = 0, x = 0, he = 0, be = 0, We = 0, He = 0, Ne = M != null && M.descendFirst(), Ye = Ne;
+      const ze = s.advancer(U, void 0, (S, ie) => {
         O(ie) && he++;
       });
-      let Se = A != null && A.descendFirst(), je = Se;
+      let Se = A != null && A.descendFirst(), Te = Se;
       for (const S of B) if (typeof S == "number") {
         let ie;
         const Oe = o(B.getComponent()), ce = S - x;
         {
           let Be;
-          for (; Ne && typeof (Be = U.getKey()) == "number"; ) {
+          for (; Ne && typeof (Be = M.getKey()) == "number"; ) {
             Be += P;
-            const Re = U.getComponent(), Xe = O(Re);
+            const Re = M.getComponent(), Xe = O(Re);
             if (Be > ce || Be === ce && (!Xe || D === 0 && Oe)) break;
             if (Xe) {
               P--;
               const Ke = Re.p;
-              K.includes(Ke), Re.d, a(te[Re.d]), O(a(te[Re.d])), (Re.r === void 0 || Me && Me.has(Re)) && (Ke == null || !Pe[Ke] || D !== 1 && K.includes(Ke)) || We--;
+              K.includes(Ke), Re.d, a(te[Re.d]), O(a(te[Re.d])), (Re.r === void 0 || Ue && Ue.has(Re)) && (Ke == null || !Pe[Ke] || D !== 1 && K.includes(Ke)) || We--;
             }
-            Ne = U.nextSibling();
+            Ne = M.nextSibling();
           }
-          ie = Ne && Be === ce ? U : null;
+          ie = Ne && Be === ce ? M : null;
         }
         const ke = ce - P;
         let Ge = ze(ke);
@@ -1276,7 +1276,7 @@ function Lt() {
         {
           let Be, Re;
           for (; Se && typeof (Be = A.getKey()) == "number"; ) {
-            Re = Be - me;
+            Re = Be - be;
             const Xe = A.getComponent(), Ke = o(Xe);
             if (Re > rt) break;
             if (Re === rt) {
@@ -1295,48 +1295,48 @@ function Lt() {
             }
             if (Ke) {
               const Ve = Xe.d;
-              K[Ve], Xe.i === void 0 && (g[Ve] || K[Ve] != null && D !== 1) ? (g[Ve] || K[Ve] != null && D === 0) && (me++, He--) : me++;
+              K[Ve], Xe.i === void 0 && (g[Ve] || K[Ve] != null && D !== 1) ? (g[Ve] || K[Ve] != null && D === 0) && (be++, He--) : be++;
             }
             Se = A.nextSibling();
           }
         }
-        const Ot = rt + me + We + He;
+        const Ot = rt + be + We + He;
         l(Ot >= 0, "trying to descend to a negative index"), k.descend(Ot), Oe && (ie = Ge = Je = null, x++), Q(ie, B, Ge, Je, k, X) && He++, k.ascend();
       } else {
         let ie;
-        for (; Ne && (ie = U.getKey(), typeof ie != "string" || !(ie > S || ie === S)); ) Ne = U.nextSibling();
-        const Oe = Ne && ie === S ? U : null, ce = ze(S);
+        for (; Ne && (ie = M.getKey(), typeof ie != "string" || !(ie > S || ie === S)); ) Ne = M.nextSibling();
+        const Oe = Ne && ie === S ? M : null, ce = ze(S);
         let ke;
         for (; Se && (ke = A.getKey(), typeof ke != "string" || !(ke > S || ke === S)); ) Se = A.nextSibling();
         const Ge = Se && ke === S ? A : null;
         k.descend(S), Q(Oe, B, ce, Ge, k, X), k.ascend();
       }
-      return ze.end(), Ye && U.ascend(), je && A.ascend(), fe;
-    }(be, be.clone(), _e, _e.clone(), oe, null), b) return {
+      return ze.end(), Ye && M.ascend(), Te && A.ascend(), fe;
+    }(me, me.clone(), _e, _e.clone(), oe, null), m) return {
       ok: !1,
-      conflict: b
+      conflict: m
     };
     oe.reset();
-    const Ue = (Q, U, B) => Q.traverse(U, (M, A) => {
-      M.d != null && B(M.d, Q, A);
+    const Me = (Q, M, B) => Q.traverse(M, (U, A) => {
+      U.d != null && B(U.d, Q, A);
     });
-    (g.length || re.length) && (Ue(_e, oe, (Q, U, B) => {
+    (g.length || re.length) && (Me(_e, oe, (Q, M, B) => {
       g[Q] && !N[Q] && B.write("r", !0), re[Q] && B.mergeTree(re[Q].get());
     }), oe.reset());
     const Ee = [], $e = [];
-    if ((te.length || g.length) && !b) {
-      const Q = i.readCursor(tt(oe.get()));
-      if (Ue(Q, null, (U, B) => {
-        Ee[U] = B.clone();
-      }), te.forEach((U) => {
-        U && Ue(i.readCursor(U.get()), null, (B, M) => {
-          Ee[B] = M.clone();
+    if ((te.length || g.length) && !m) {
+      const Q = s.readCursor(tt(oe.get()));
+      if (Me(Q, null, (M, B) => {
+        Ee[M] = B.clone();
+      }), te.forEach((M) => {
+        M && Me(s.readCursor(M.get()), null, (B, U) => {
+          Ee[B] = U.clone();
         });
-      }), function U(B, M, A, k, X, Y) {
-        const ee = a(M);
+      }), function M(B, U, A, k, X, Y) {
+        const ee = a(U);
         if (ee && O(ee)) if (ee.p != null) {
           const P = ee.p;
-          Ee[P].getPath(), A = Ee[P], k = $e[P] = i.writeCursor();
+          Ee[P].getPath(), A = Ee[P], k = $e[P] = s.writeCursor();
         } else ee.r !== void 0 && (A = null);
         else o(a(A)) && (A = null);
         const fe = B.getComponent();
@@ -1344,52 +1344,52 @@ function Lt() {
           let P;
           if ((P = fe.d) != null) {
             const x = te[P];
-            x && (x.get(), k.mergeTree(x.get()), A = i.readCursor(x.get()));
+            x && (x.get(), k.mergeTree(x.get()), A = s.readCursor(x.get()));
           }
         }
         let de = 0, le = 0;
-        const ye = i.advancer(M, void 0, (P, x) => {
+        const ye = s.advancer(U, void 0, (P, x) => {
           O(x) && de--;
-        }), q = i.advancer(A, (P, x) => o(x) ? -(P - le) - 1 : P - le, (P, x) => {
+        }), q = s.advancer(A, (P, x) => o(x) ? -(P - le) - 1 : P - le, (P, x) => {
           o(x) && le++;
         });
         for (const P of B) if (typeof P == "number") {
-          const x = ye(P), he = P + de, me = q(he), We = he + le;
-          k.descend(We), U(B, x, me, k), k.ascend();
-        } else k.descend(P), U(B, ye(P), q(P), k), k.ascend();
+          const x = ye(P), he = P + de, be = q(he), We = he + le;
+          k.descend(We), M(B, x, be, k), k.ascend();
+        } else k.descend(P), M(B, ye(P), q(P), k), k.ascend();
         ye.end(), q.end();
-      }(_e, Q, Q.clone(), oe), oe.reset(), b) return {
+      }(_e, Q, Q.clone(), oe), oe.reset(), m) return {
         ok: !1,
-        conflict: b
+        conflict: m
       };
       if (oe.get(), $e.length) {
-        const U = $e.map((M) => M ? M.get() : null), B = i.readCursor(tt(oe.get()));
-        if (Ue(B, oe, (M, A, k) => {
-          const X = U[M];
-          X && (k.mergeTree(X), U[M] = null);
-        }), U.find((M) => M)) {
-          const M = i.writeCursor(), A = i.writeCursor();
+        const M = $e.map((U) => U ? U.get() : null), B = s.readCursor(tt(oe.get()));
+        if (Me(B, oe, (U, A, k) => {
+          const X = M[U];
+          X && (k.mergeTree(X), M[U] = null);
+        }), M.find((U) => U)) {
+          const U = s.writeCursor(), A = s.writeCursor();
           let k = 0, X = 0;
-          U.forEach((Y) => {
-            Y != null && Ue(i.readCursor(Y), null, (ee) => {
+          M.forEach((Y) => {
+            Y != null && Me(s.readCursor(Y), null, (ee) => {
               const fe = Le[ee];
-              M.writeMove(C[fe].getPath(), $[fe].getPath(), k++);
+              U.writeMove(C[fe].getPath(), $[fe].getPath(), k++);
               const de = se[fe];
               de && de.forEach((le) => {
-                g[le] || D !== 1 && K[le] != null || A.writeMove(j[le].getPath(), p[le].getPath(), X++);
+                g[le] || D !== 1 && K[le] != null || A.writeMove(T[le].getPath(), p[le].getPath(), X++);
               });
             });
-          }), b = {
+          }), m = {
             type: d.ConflictType.BLACKHOLE,
-            op1: M.get(),
+            op1: U.get(),
             op2: A.get()
           };
         }
       }
     }
-    return b ? {
+    return m ? {
       ok: !1,
-      conflict: b
+      conflict: m
     } : {
       ok: !0,
       result: oe.get()
@@ -1405,36 +1405,36 @@ function Lt() {
     gt(D.conflict);
   }
   const qe = (r) => {
-    const u = i.writeCursor();
-    return i.readCursor(r).traverse(u, (y, D) => {
+    const u = s.writeCursor();
+    return s.readCursor(r).traverse(u, (y, D) => {
       (o(y) || ve(y)) && D.write("r", !0);
     }), u.get();
   }, At = (r, u) => {
-    const { type: y, op1: D, op2: b } = r;
+    const { type: y, op1: D, op2: m } = r;
     switch (y) {
       case d.ConflictType.DROP_COLLISION:
-        return u === "left" ? [null, qe(b)] : [qe(D), null];
+        return u === "left" ? [null, qe(m)] : [qe(D), null];
       case d.ConflictType.RM_UNEXPECTED_CONTENT:
         let C = !1;
-        return i.readCursor(D).traverse(null, ($) => {
+        return s.readCursor(D).traverse(null, ($) => {
           $.r !== void 0 && (C = !0);
-        }), C ? [null, qe(b)] : [qe(D), null];
+        }), C ? [null, qe(m)] : [qe(D), null];
       case d.ConflictType.BLACKHOLE:
-        return [qe(D), qe(b)];
+        return [qe(D), qe(m)];
       default:
         throw Error("Unrecognised conflict: " + y);
     }
   };
   function _t(r, u, y, D) {
-    let b = null;
+    let m = null;
     for (; ; ) {
       const C = nt(u, y, D);
-      if (C.ok) return ne(b, C.result);
+      if (C.ok) return ne(m, C.result);
       {
         const { conflict: $ } = C;
         r($) || gt($);
-        const [j, p] = At($, D);
-        u = ne(H(u), j), y = ne(H(y), p), b = ne(b, p);
+        const [T, p] = At($, D);
+        u = ne(H(u), T), y = ne(H(y), p), m = ne(m, p);
       }
     }
   }
@@ -1450,15 +1450,15 @@ function Lt() {
     for (var a in d) a !== "default" && !l.hasOwnProperty(a) && e(l, d, a);
   };
   Object.defineProperty(n, "__esModule", { value: !0 }), t(Ct, n);
-  var s = ft;
+  var i = ft;
   Object.defineProperty(n, "ReadCursor", { enumerable: !0, get: function() {
-    return s.ReadCursor;
+    return i.ReadCursor;
   } }), Object.defineProperty(n, "WriteCursor", { enumerable: !0, get: function() {
-    return s.WriteCursor;
+    return i.WriteCursor;
   } });
-  var i = ht;
+  var s = ht;
   Object.defineProperty(n, "ConflictType", { enumerable: !0, get: function() {
-    return i.ConflictType;
+    return s.ConflictType;
   } });
 })(F);
 class Ht {
@@ -1509,10 +1509,8 @@ class Ht {
   }
   refreshTransform(e) {
     e.forEach((t) => {
-      if (this.getDrawingByParam(t) == null)
-        return;
       const i = this._getCurrentBySearch(t);
-      i != null && (i.transform = t.transform);
+      i != null && (i.transform = t.transform, i.transforms = t.transforms, i.isMultiTransform = t.isMultiTransform);
     }), this.refreshTransformNotification(e);
   }
   getDrawingDataForUnit(e) {
@@ -1523,25 +1521,25 @@ class Ht {
     if (t == null)
       return;
     delete this.drawingManagerData[e];
-    const s = [];
-    Object.keys(t).forEach((i) => {
-      const d = t[i];
+    const i = [];
+    Object.keys(t).forEach((s) => {
+      const d = t[s];
       (d == null ? void 0 : d.data) != null && Object.keys(d.data).forEach((l) => {
-        s.push({ unitId: e, subUnitId: i, drawingId: l });
+        i.push({ unitId: e, subUnitId: s, drawingId: l });
       });
-    }), s.length > 0 && this.removeNotification(s);
+    }), i.length > 0 && this.removeNotification(i);
   }
   registerDrawingData(e, t) {
     this.drawingManagerData[e] = t;
   }
   initializeNotification(e) {
-    const t = [], s = this.drawingManagerData[e];
-    s != null && (Object.keys(s).forEach((i) => {
-      this._establishDrawingMap(e, i);
-      const d = s[i];
+    const t = [], i = this.drawingManagerData[e];
+    i != null && (Object.keys(i).forEach((s) => {
+      this._establishDrawingMap(e, s);
+      const d = i[s];
       Object.keys(d.data).forEach((l) => {
         const a = d.data[l];
-        a.unitId = e, a.subUnitId = i, t.push(a);
+        a.unitId = e, a.subUnitId = s, t.push(a);
       });
     }), t.length > 0 && this.addNotification(t));
   }
@@ -1549,34 +1547,34 @@ class Ht {
     return this._getDrawingData(e, t);
   }
   // Use in doc only.
-  setDrawingData(e, t, s) {
-    this.drawingManagerData[e][t].data = s;
+  setDrawingData(e, t, i) {
+    this.drawingManagerData[e][t].data = i;
   }
   getBatchAddOp(e) {
-    const t = [], s = [], i = [];
+    const t = [], i = [], s = [];
     e.forEach((W) => {
       const { op: O, invertOp: o } = this._addByParam(W);
-      t.push({ unitId: W.unitId, subUnitId: W.subUnitId, drawingId: W.drawingId }), s.push(O), i.push(o);
+      t.push({ unitId: W.unitId, subUnitId: W.subUnitId, drawingId: W.drawingId }), i.push(O), s.push(o);
     });
-    const d = s.reduce(F.type.compose, null), l = i.reduce(F.type.compose, null), { unitId: a, subUnitId: E } = e[0];
+    const d = i.reduce(F.type.compose, null), l = s.reduce(F.type.compose, null), { unitId: a, subUnitId: E } = e[0];
     return { undo: l, redo: d, unitId: a, subUnitId: E, objects: t };
   }
   getBatchRemoveOp(e) {
-    const t = [], s = [];
+    const t = [], i = [];
     e.forEach((E) => {
       const { op: W, invertOp: O } = this._removeByParam(E);
-      t.push(W), s.push(O);
+      t.push(W), i.push(O);
     });
-    const i = t.reduce(F.type.compose, null), d = s.reduce(F.type.compose, null), { unitId: l, subUnitId: a } = e[0];
-    return { undo: d, redo: i, unitId: l, subUnitId: a, objects: e };
+    const s = t.reduce(F.type.compose, null), d = i.reduce(F.type.compose, null), { unitId: l, subUnitId: a } = e[0];
+    return { undo: d, redo: s, unitId: l, subUnitId: a, objects: e };
   }
   getBatchUpdateOp(e) {
-    const t = [], s = [], i = [];
+    const t = [], i = [], s = [];
     e.forEach((W) => {
       const { op: O, invertOp: o } = this._updateByParam(W);
-      t.push({ unitId: W.unitId, subUnitId: W.subUnitId, drawingId: W.drawingId }), s.push(O), i.push(o);
+      t.push({ unitId: W.unitId, subUnitId: W.subUnitId, drawingId: W.drawingId }), i.push(O), s.push(o);
     });
-    const d = s.reduce(F.type.compose, null), l = i.reduce(F.type.compose, null), { unitId: a, subUnitId: E } = e[0];
+    const d = i.reduce(F.type.compose, null), l = s.reduce(F.type.compose, null), { unitId: a, subUnitId: E } = e[0];
     return { undo: l, redo: d, unitId: a, subUnitId: E, objects: t };
   }
   removeNotification(e) {
@@ -1601,61 +1599,61 @@ class Ht {
     this._refreshTransform$.next(e);
   }
   getGroupDrawingOp(e) {
-    const t = [], { unitId: s, subUnitId: i } = e[0].parent;
+    const t = [], { unitId: i, subUnitId: s } = e[0].parent;
     e.forEach((a) => {
       t.push(this._getGroupDrawingOp(a));
     });
     const d = t.reduce(F.type.compose, null);
-    return { undo: F.type.invertWithDoc(d, this.drawingManagerData), redo: d, unitId: s, subUnitId: i, objects: e };
+    return { undo: F.type.invertWithDoc(d, this.drawingManagerData), redo: d, unitId: i, subUnitId: s, objects: e };
   }
   getUngroupDrawingOp(e) {
-    const t = [], { unitId: s, subUnitId: i } = e[0].parent;
+    const t = [], { unitId: i, subUnitId: s } = e[0].parent;
     e.forEach((a) => {
       t.push(this._getUngroupDrawingOp(a));
     });
     const d = t.reduce(F.type.compose, null);
-    return { undo: F.type.invertWithDoc(d, this.drawingManagerData), redo: d, unitId: s, subUnitId: i, objects: e };
+    return { undo: F.type.invertWithDoc(d, this.drawingManagerData), redo: d, unitId: i, subUnitId: s, objects: e };
   }
   getDrawingsByGroup(e) {
-    const { unitId: t, subUnitId: s, drawingId: i } = e;
-    if (this.getDrawingByParam({ unitId: t, subUnitId: s, drawingId: i }) == null)
+    const { unitId: t, subUnitId: i, drawingId: s } = e;
+    if (this.getDrawingByParam({ unitId: t, subUnitId: i, drawingId: s }) == null)
       return [];
-    const l = this._getDrawingData(t, s), a = [];
+    const l = this._getDrawingData(t, i), a = [];
     return Object.keys(l).forEach((E) => {
       const W = l[E];
-      W.groupId === i && a.push(W);
+      W.groupId === s && a.push(W);
     }), a;
   }
   _getGroupDrawingOp(e) {
-    const { parent: t, children: s } = e, { unitId: i, subUnitId: d, drawingId: l } = t, a = [];
+    const { parent: t, children: i } = e, { unitId: s, subUnitId: d, drawingId: l } = t, a = [];
     a.push(
-      F.insertOp([i, d, "data", l], t)
+      F.insertOp([s, d, "data", l], t)
     );
     let E = Number.NEGATIVE_INFINITY;
-    return s.forEach((W) => {
+    return i.forEach((W) => {
       const { unitId: O, subUnitId: o, drawingId: c } = W, h = this._hasDrawingOrder({ unitId: O, subUnitId: o, drawingId: c });
       E = Math.max(E, h), a.push(
         ...this._getUpdateParamCompareOp(W, this.getDrawingByParam({ unitId: O, subUnitId: o, drawingId: c }))
       );
-    }), E === Number.NEGATIVE_INFINITY && (E = this._getDrawingOrder(i, d).length), a.push(
-      F.insertOp([i, d, "order", E], l)
+    }), E === Number.NEGATIVE_INFINITY && (E = this._getDrawingOrder(s, d).length), a.push(
+      F.insertOp([s, d, "order", E], l)
     ), a.reduce(F.type.compose, null);
   }
   _getUngroupDrawingOp(e) {
-    const { parent: t, children: s } = e, { unitId: i, subUnitId: d, drawingId: l } = t, a = [];
-    return s.forEach((E) => {
+    const { parent: t, children: i } = e, { unitId: s, subUnitId: d, drawingId: l } = t, a = [];
+    return i.forEach((E) => {
       const { unitId: W, subUnitId: O, drawingId: o } = E;
       a.push(
         ...this._getUpdateParamCompareOp(E, this.getDrawingByParam({ unitId: W, subUnitId: O, drawingId: o }))
       );
     }), a.push(
-      F.removeOp([i, d, "data", l], !0)
+      F.removeOp([s, d, "data", l], !0)
     ), a.push(
-      F.removeOp([i, d, "order", this._getDrawingOrder(i, d).indexOf(l)], !0)
+      F.removeOp([s, d, "order", this._getDrawingOrder(s, d).indexOf(l)], !0)
     ), a.reduce(F.type.compose, null);
   }
-  applyJson1(e, t, s) {
-    this._establishDrawingMap(e, t), this._oldDrawingManagerData = { ...this.drawingManagerData }, this.drawingManagerData = F.type.apply(this.drawingManagerData, s);
+  applyJson1(e, t, i) {
+    this._establishDrawingMap(e, t), this._oldDrawingManagerData = { ...this.drawingManagerData }, this.drawingManagerData = F.type.apply(this.drawingManagerData, i);
   }
   // private _fillMissingFields(jsonOp: JSONOp) {
   //     if (jsonOp == null) {
@@ -1702,8 +1700,8 @@ class Ht {
     return this._getOldBySearch(e);
   }
   getDrawingOKey(e) {
-    const [t, s, i] = e.split("#-#");
-    return this._getCurrentBySearch({ unitId: t, subUnitId: s, drawingId: i });
+    const [t, i, s] = e.split("#-#");
+    return this._getCurrentBySearch({ unitId: t, subUnitId: i, drawingId: s });
   }
   focusDrawing(e) {
     if (e == null) {
@@ -1711,9 +1709,9 @@ class Ht {
       return;
     }
     const t = [];
-    e.forEach((s) => {
+    e.forEach((i) => {
       var E;
-      const { unitId: i, subUnitId: d, drawingId: l } = s, a = (E = this._getDrawingData(i, d)) == null ? void 0 : E[l];
+      const { unitId: s, subUnitId: d, drawingId: l } = i, a = (E = this._getDrawingData(s, d)) == null ? void 0 : E[l];
       a != null && t.push(a);
     }), t.length > 0 && (this._focusDrawings = t, this._focus$.next(t));
   }
@@ -1721,7 +1719,7 @@ class Ht {
     const e = [];
     return this._focusDrawings.forEach((t) => {
       var a;
-      const { unitId: s, subUnitId: i, drawingId: d } = t, l = (a = this._getDrawingData(s, i)) == null ? void 0 : a[d];
+      const { unitId: i, subUnitId: s, drawingId: d } = t, l = (a = this._getDrawingData(i, s)) == null ? void 0 : a[d];
       l != null && e.push(l);
     }), e;
   }
@@ -1729,107 +1727,107 @@ class Ht {
     return this._getDrawingOrder(e, t);
   }
   // Use in doc only.
-  setDrawingOrder(e, t, s) {
-    this.drawingManagerData[e][t].order = s;
+  setDrawingOrder(e, t, i) {
+    this.drawingManagerData[e][t].order = i;
   }
   orderUpdateNotification(e) {
     this._order$.next(e);
   }
   getForwardDrawingsOp(e) {
-    const { unitId: t, subUnitId: s, drawingIds: i } = e, d = [], l = this.getDrawingOrder(t, s), a = [...i];
-    i.forEach((O) => {
-      const o = this._hasDrawingOrder({ unitId: t, subUnitId: s, drawingId: O });
+    const { unitId: t, subUnitId: i, drawingIds: s } = e, d = [], l = this.getDrawingOrder(t, i), a = [...s];
+    s.forEach((O) => {
+      const o = this._hasDrawingOrder({ unitId: t, subUnitId: i, drawingId: O });
       if (o === -1 || o === l.length - 1)
         return;
-      const c = F.moveOp([t, s, "order", o], [t, s, "order", o + 1]);
+      const c = F.moveOp([t, i, "order", o], [t, i, "order", o + 1]);
       d.push(c), a.includes(l[o + 1]) || a.push(l[o + 1]);
     });
     const E = d.reduce(F.type.compose, null);
-    return { undo: F.type.invertWithDoc(E, this.drawingManagerData), redo: E, unitId: t, subUnitId: s, objects: { ...e, drawingIds: a } };
+    return { undo: F.type.invertWithDoc(E, this.drawingManagerData), redo: E, unitId: t, subUnitId: i, objects: { ...e, drawingIds: a } };
   }
   getBackwardDrawingOp(e) {
-    const { unitId: t, subUnitId: s, drawingIds: i } = e, d = [], l = this.getDrawingOrder(t, s), a = [...i];
-    i.forEach((O) => {
-      const o = this._hasDrawingOrder({ unitId: t, subUnitId: s, drawingId: O });
+    const { unitId: t, subUnitId: i, drawingIds: s } = e, d = [], l = this.getDrawingOrder(t, i), a = [...s];
+    s.forEach((O) => {
+      const o = this._hasDrawingOrder({ unitId: t, subUnitId: i, drawingId: O });
       if (o === -1 || o === 0)
         return;
-      const c = F.moveOp([t, s, "order", o], [t, s, "order", o - 1]);
+      const c = F.moveOp([t, i, "order", o], [t, i, "order", o - 1]);
       d.push(c), a.includes(l[o - 1]) || a.push(l[o - 1]);
     });
     const E = d.reduce(F.type.compose, null);
-    return { undo: F.type.invertWithDoc(E, this.drawingManagerData), redo: E, unitId: t, subUnitId: s, objects: { ...e, drawingIds: a } };
+    return { undo: F.type.invertWithDoc(E, this.drawingManagerData), redo: E, unitId: t, subUnitId: i, objects: { ...e, drawingIds: a } };
   }
   getFrontDrawingsOp(e) {
-    const { unitId: t, subUnitId: s, drawingIds: i } = e, d = this._getOrderFromSearchParams(t, s, i), l = [...i], a = this.getDrawingOrder(t, s), E = [];
+    const { unitId: t, subUnitId: i, drawingIds: s } = e, d = this._getOrderFromSearchParams(t, i, s), l = [...s], a = this.getDrawingOrder(t, i), E = [];
     d.forEach((o) => {
-      const { drawingId: c } = o, h = this._getDrawingCount(t, s) - 1, R = F.moveOp([t, s, "order", this._getDrawingOrder(t, s).indexOf(c)], [t, s, "order", h]);
+      const { drawingId: c } = o, h = this._getDrawingCount(t, i) - 1, R = F.moveOp([t, i, "order", this._getDrawingOrder(t, i).indexOf(c)], [t, i, "order", h]);
       E.push(R), l.includes(a[h]) || l.push(a[h]);
     });
     const W = E.reduce(F.type.compose, null);
-    return { undo: F.type.invertWithDoc(W, this.drawingManagerData), redo: W, unitId: t, subUnitId: s, objects: { ...e, drawingIds: l } };
+    return { undo: F.type.invertWithDoc(W, this.drawingManagerData), redo: W, unitId: t, subUnitId: i, objects: { ...e, drawingIds: l } };
   }
   getBackDrawingsOp(e) {
-    const { unitId: t, subUnitId: s, drawingIds: i } = e, d = this._getOrderFromSearchParams(t, s, i, !0), l = [...i], a = this.getDrawingOrder(t, s), E = [];
+    const { unitId: t, subUnitId: i, drawingIds: s } = e, d = this._getOrderFromSearchParams(t, i, s, !0), l = [...s], a = this.getDrawingOrder(t, i), E = [];
     d.forEach((o) => {
-      const { drawingId: c } = o, h = F.moveOp([t, s, "order", this._getDrawingOrder(t, s).indexOf(c)], [t, s, "order", 0]);
+      const { drawingId: c } = o, h = F.moveOp([t, i, "order", this._getDrawingOrder(t, i).indexOf(c)], [t, i, "order", 0]);
       E.push(h), l.includes(a[0]) || l.push(a[0]);
     });
     const W = E.reduce(F.type.compose, null);
-    return { undo: F.type.invertWithDoc(W, this.drawingManagerData), redo: W, unitId: t, subUnitId: s, objects: { ...e, drawingIds: l } };
+    return { undo: F.type.invertWithDoc(W, this.drawingManagerData), redo: W, unitId: t, subUnitId: i, objects: { ...e, drawingIds: l } };
   }
   _getDrawingCount(e, t) {
     return this.getDrawingOrder(e, t).length || 0;
   }
-  _getOrderFromSearchParams(e, t, s, i = !1) {
-    return s.map((d) => {
+  _getOrderFromSearchParams(e, t, i, s = !1) {
+    return i.map((d) => {
       const l = this._hasDrawingOrder({ unitId: e, subUnitId: t, drawingId: d });
       return { drawingId: d, zIndex: l };
-    }).sort(i === !1 ? Mt : Nt);
+    }).sort(s === !1 ? Ut : Nt);
   }
   _hasDrawingOrder(e) {
     if (e == null)
       return -1;
-    const { unitId: t, subUnitId: s, drawingId: i } = e;
-    return this._establishDrawingMap(t, s), this._getDrawingOrder(t, s).indexOf(i);
+    const { unitId: t, subUnitId: i, drawingId: s } = e;
+    return this._establishDrawingMap(t, i), this._getDrawingOrder(t, i).indexOf(s);
   }
   _getCurrentBySearch(e) {
     var d, l, a;
     if (e == null)
       return;
-    const { unitId: t, subUnitId: s, drawingId: i } = e;
-    return (a = (l = (d = this.drawingManagerData[t]) == null ? void 0 : d[s]) == null ? void 0 : l.data) == null ? void 0 : a[i];
+    const { unitId: t, subUnitId: i, drawingId: s } = e;
+    return (a = (l = (d = this.drawingManagerData[t]) == null ? void 0 : d[i]) == null ? void 0 : l.data) == null ? void 0 : a[s];
   }
   _getOldBySearch(e) {
     var d, l, a;
     if (e == null)
       return;
-    const { unitId: t, subUnitId: s, drawingId: i } = e;
-    return (a = (l = (d = this._oldDrawingManagerData[t]) == null ? void 0 : d[s]) == null ? void 0 : l.data) == null ? void 0 : a[i];
+    const { unitId: t, subUnitId: i, drawingId: s } = e;
+    return (a = (l = (d = this._oldDrawingManagerData[t]) == null ? void 0 : d[i]) == null ? void 0 : l.data) == null ? void 0 : a[s];
   }
-  _establishDrawingMap(e, t, s) {
-    var i;
+  _establishDrawingMap(e, t, i) {
+    var s;
     return this.drawingManagerData[e] || (this.drawingManagerData[e] = {}), this.drawingManagerData[e][t] || (this.drawingManagerData[e][t] = {
       data: {},
       order: []
-    }), s == null ? null : (i = this.drawingManagerData[e][t].data) == null ? void 0 : i[s];
+    }), i == null ? null : (s = this.drawingManagerData[e][t].data) == null ? void 0 : s[i];
   }
   _addByParam(e) {
-    const { unitId: t, subUnitId: s, drawingId: i } = e;
-    this._establishDrawingMap(t, s, i);
-    const d = F.insertOp([t, s, "data", i], e), l = F.insertOp([t, s, "order", this._getDrawingOrder(t, s).length], i), a = [d, l].reduce(F.type.compose, null), E = F.type.invertWithDoc(a, this.drawingManagerData);
+    const { unitId: t, subUnitId: i, drawingId: s } = e;
+    this._establishDrawingMap(t, i, s);
+    const d = F.insertOp([t, i, "data", s], e), l = F.insertOp([t, i, "order", this._getDrawingOrder(t, i).length], s), a = [d, l].reduce(F.type.compose, null), E = F.type.invertWithDoc(a, this.drawingManagerData);
     return { op: a, invertOp: E };
   }
   _removeByParam(e) {
     if (e == null)
       return { op: [], invertOp: [] };
-    const { unitId: t, subUnitId: s, drawingId: i } = e;
-    if (this._establishDrawingMap(t, s, i) == null)
+    const { unitId: t, subUnitId: i, drawingId: s } = e;
+    if (this._establishDrawingMap(t, i, s) == null)
       return { op: [], invertOp: [] };
-    const l = F.removeOp([t, s, "data", i], !0), a = F.removeOp([t, s, "order", this._getDrawingOrder(t, s).indexOf(i)], !0), E = [l, a].reduce(F.type.compose, null), W = F.type.invertWithDoc(E, this.drawingManagerData);
+    const l = F.removeOp([t, i, "data", s], !0), a = F.removeOp([t, i, "order", this._getDrawingOrder(t, i).indexOf(s)], !0), E = [l, a].reduce(F.type.compose, null), W = F.type.invertWithDoc(E, this.drawingManagerData);
     return { op: E, invertOp: W };
   }
   _updateByParam(e) {
-    const { unitId: t, subUnitId: s, drawingId: i } = e, d = this._establishDrawingMap(t, s, i);
+    const { unitId: t, subUnitId: i, drawingId: s } = e, d = this._establishDrawingMap(t, i, s);
     if (d == null)
       return { op: [], invertOp: [] };
     const a = this._getUpdateParamCompareOp(e, d).reduce(F.type.compose, null), E = F.type.invertWithDoc(a, this.drawingManagerData);
@@ -1843,21 +1841,21 @@ class Ht {
   //     });
   // }
   _getUpdateParamCompareOp(e, t) {
-    const { unitId: s, subUnitId: i, drawingId: d } = e, l = [];
+    const { unitId: i, subUnitId: s, drawingId: d } = e, l = [];
     return Object.keys(e).forEach((a) => {
       const E = e[a], W = t[a];
       W !== E && l.push(
-        F.replaceOp([s, i, "data", d, a], W, E)
+        F.replaceOp([i, s, "data", d, a], W, E)
       );
     }), l;
   }
   _getDrawingData(e, t) {
-    var s, i;
-    return ((i = (s = this.drawingManagerData[e]) == null ? void 0 : s[t]) == null ? void 0 : i.data) || {};
+    var i, s;
+    return ((s = (i = this.drawingManagerData[e]) == null ? void 0 : i[t]) == null ? void 0 : s.data) || {};
   }
   _getDrawingOrder(e, t) {
-    var s, i;
-    return ((i = (s = this.drawingManagerData[e]) == null ? void 0 : s[t]) == null ? void 0 : i.order) || [];
+    var i, s;
+    return ((s = (i = this.drawingManagerData[e]) == null ? void 0 : i[t]) == null ? void 0 : s.order) || [];
   }
   getDrawingVisible() {
     return this._visible;
@@ -1874,20 +1872,19 @@ class Ht {
 }
 class Kt extends Ht {
 }
-function an(n) {
-  const { unitId: e, subUnitId: t, drawingId: s } = n;
-  return `${e}#-#${t}#-#${s}`;
+function an({ unitId: n, subUnitId: e, drawingId: t }, i) {
+  return typeof i == "number" ? `${n}#-#${e}#-#${t}#-#${i}` : `${n}#-#${e}#-#${t}`;
 }
 const cn = async (n) => new Promise((e, t) => {
-  const s = new Image();
-  s.src = n, s.onload = () => {
+  const i = new Image();
+  i.src = n, i.onload = () => {
     e({
-      width: s.width,
-      height: s.height,
-      image: s
+      width: i.width,
+      height: i.height,
+      image: i
     });
-  }, s.onerror = (i) => {
-    t(i);
+  }, i.onerror = (s) => {
+    t(s);
   };
 });
 var et = /* @__PURE__ */ ((n) => (n.URL = "URL", n.UUID = "UUID", n.BASE64 = "BASE64", n))(et || {}), Ze = /* @__PURE__ */ ((n) => (n.SUCCUSS = "0", n.ERROR_EXCEED_SIZE = "1", n.ERROR_IMAGE_TYPE = "2", n.ERROR_UPLOAD_COUNT_LIMIT = "3", n.ERROR_IMAGE = "4", n))(Ze || {});
@@ -1904,33 +1901,33 @@ class Ft {
   }
   getImageSourceCache(e, t) {
     if (t === et.BASE64) {
-      const s = new Image();
-      return s.src = e, s;
+      const i = new Image();
+      return i.src = e, i;
     }
     return this._imageSourceCache.get(e);
   }
-  addImageSourceCache(e, t, s) {
-    t === et.BASE64 || s == null || this._imageSourceCache.set(e, s);
+  addImageSourceCache(e, t, i) {
+    t === et.BASE64 || i == null || this._imageSourceCache.set(e, i);
   }
   async getImage(e) {
     return Promise.resolve(e);
   }
   async saveImage(e) {
-    return new Promise((t, s) => {
+    return new Promise((t, i) => {
       if (!Wt.includes(e.type)) {
-        s(new Error(Ze.ERROR_IMAGE_TYPE)), this._decreaseWaiting();
+        i(new Error(Ze.ERROR_IMAGE_TYPE)), this._decreaseWaiting();
         return;
       }
       if (e.size > $t) {
-        s(new Error(Ze.ERROR_EXCEED_SIZE)), this._decreaseWaiting();
+        i(new Error(Ze.ERROR_EXCEED_SIZE)), this._decreaseWaiting();
         return;
       }
-      const i = new FileReader();
-      i.readAsDataURL(e), i.onload = (d) => {
+      const s = new FileReader();
+      s.readAsDataURL(e), s.onload = (d) => {
         var E;
         const l = (E = d.target) == null ? void 0 : E.result;
         if (l == null) {
-          s(new Error(Ze.ERROR_IMAGE)), this._decreaseWaiting();
+          i(new Error(Ze.ERROR_IMAGE)), this._decreaseWaiting();
           return;
         }
         const a = kt.generateRandomId(6);
@@ -1951,14 +1948,14 @@ class Ft {
 const un = "__default_document_sub_component_id20231101__";
 var qt = /* @__PURE__ */ ((n) => (n[n.forward = 0] = "forward", n[n.backward = 1] = "backward", n[n.front = 2] = "front", n[n.back = 3] = "back", n))(qt || {}), zt = /* @__PURE__ */ ((n) => (n[n.UNRECOGNIZED = -1] = "UNRECOGNIZED", n[n.DRAWING_IMAGE = 0] = "DRAWING_IMAGE", n[n.DRAWING_SHAPE = 1] = "DRAWING_SHAPE", n[n.DRAWING_CHART = 2] = "DRAWING_CHART", n[n.DRAWING_TABLE = 3] = "DRAWING_TABLE", n[n.DRAWING_SMART_ART = 4] = "DRAWING_SMART_ART", n[n.DRAWING_VIDEO = 5] = "DRAWING_VIDEO", n[n.DRAWING_GROUP = 6] = "DRAWING_GROUP", n[n.DRAWING_UNIT = 7] = "DRAWING_UNIT", n[n.DRAWING_DOM = 8] = "DRAWING_DOM", n))(zt || {});
 const Xt = It("univer.drawing-manager.service");
-var Yt = Object.defineProperty, Zt = Object.getOwnPropertyDescriptor, Jt = (n, e, t, s) => {
-  for (var i = s > 1 ? void 0 : s ? Zt(e, t) : e, d = n.length - 1, l; d >= 0; d--)
-    (l = n[d]) && (i = (s ? l(e, t, i) : l(i)) || i);
-  return s && i && Yt(e, t, i), i;
-}, Qt = (n, e) => (t, s) => e(t, s, n);
+var Yt = Object.defineProperty, Zt = Object.getOwnPropertyDescriptor, Jt = (n, e, t, i) => {
+  for (var s = i > 1 ? void 0 : i ? Zt(e, t) : e, d = n.length - 1, l; d >= 0; d--)
+    (l = n[d]) && (s = (i ? l(e, t, s) : l(s)) || s);
+  return i && s && Yt(e, t, s), s;
+}, Qt = (n, e) => (t, i) => e(t, i, n);
 const en = "DRAWING_PLUGIN";
 var ot;
-let wt = (ot = class extends jt {
+let wt = (ot = class extends Tt {
   constructor(n, e) {
     super(), this._config = n, this._injector = e;
   }
@@ -1966,11 +1963,11 @@ let wt = (ot = class extends jt {
     this._initDependencies(n);
   }
   _initDependencies(n) {
-    var s;
-    Tt([
+    var i;
+    jt([
       [Vt, { useClass: Ft }],
       [Xt, { useClass: Kt }]
-    ], (s = this._config) == null ? void 0 : s.override).forEach((i) => n.add(i));
+    ], (i = this._config) == null ? void 0 : i.override).forEach((s) => n.add(s));
   }
 }, V(ot, "pluginName", en), ot);
 wt = Jt([