y-mxgraph 0.1.3 → 0.1.5

package/y-mxgraph.es.js

@@ -66,12 +66,24 @@ function parse$3(object) {
   return xmlElement;
 }
 function serialize$2(xmlElement) {
-  const attributes = {
+  const rawAttributes = {
     ...xmlElement.getAttributes()
   };
   let mxGeometry = null;
-  if (mxGeometryAttributeKey in attributes) {
-    const mxGeometryString = attributes[mxGeometryAttributeKey];
+  let mxGeometryString;
+  if (mxGeometryAttributeKey in rawAttributes) {
+    mxGeometryString = rawAttributes[mxGeometryAttributeKey];
+    delete rawAttributes[mxGeometryAttributeKey];
+  }
+  const attributes = {};
+  for (const [key2, value] of Object.entries(rawAttributes)) {
+    if (typeof value === "string") {
+      attributes[key2] = value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&apos;");
+    } else if (value != null) {
+      attributes[key2] = String(value);
+    }
+  }
+  if (mxGeometryString) {
     try {
       const parsed = xml2js(mxGeometryString, { compact: true });
       mxGeometry = parsed[mxGeometryKey] ?? null;
@@ -81,7 +93,6 @@ function serialize$2(xmlElement) {
     } catch (e) {
       console.warn("[y-mxgraph] Failed to parse mxGeometry:", e);
     }
-    delete attributes[mxGeometryAttributeKey];
   }
   const obj = {
     _attributes: attributes
@@ -170,11 +181,13 @@ function serializer(yMxFile) {
   const diagramOrder = yMxFile.get(
     diagramOrderKey
   );
+  const orderIds = diagramOrder ? diagramOrder.toArray() : [];
+  const ids = orderIds.length > 0 ? orderIds : diagrams ? Array.from(diagrams.keys()) : [];
   const obj = {
     _attributes: {
       pages: yMxFile.get("pages") || "1"
     },
-    [key$1]: diagramOrder.map((id) => diagrams.get(id)).map((diagramElement) => serialize(diagramElement))
+    [key$1]: ids.map((id) => diagrams.get(id)).filter((d) => !!d).map((diagramElement) => serialize(diagramElement))
   };
   return obj;
 }
@@ -240,6 +253,12 @@ function applyFilePatch(doc, patch, options) {
         diagramOrderKey
       );
       ensureUniqueOrder(orderArr);
+      const currentOrder = orderArr.toArray();
+      if (currentOrder.length === 0 && diagramsMap && diagramsMap.size > 0) {
+        const allIds = Array.from(diagramsMap.keys());
+        orderArr.push(allIds);
+      }
+      ensureUniqueOrder(orderArr);
       const existingIds = orderArr.toArray();
       const existingIndex = /* @__PURE__ */ new Map();
       existingIds.forEach((id, idx) => existingIndex.set(id, idx));
@@ -459,7 +478,9 @@ function initDocSnapshot(doc, resetSnapshot = false) {
     const mxfile = doc.getMap(key);
     const diagramsMap = mxfile.get(key$1);
     const orderArr = mxfile.get(diagramOrderKey);
-    const diagramOrder = resetSnapshot ? [] : orderArr ? orderArr.toArray().slice() : [];
+    const orderIds = orderArr ? orderArr.toArray() : [];
+    const allDiagramIds = orderIds.length > 0 ? orderIds : diagramsMap ? Array.from(diagramsMap.keys()) : [];
+    const diagramOrder = resetSnapshot ? [] : allDiagramIds.slice();
     const snap = {
       diagramOrder,
       cellsOrder: /* @__PURE__ */ new Map(),
@@ -532,7 +553,8 @@ function generatePatch(events, explicitDoc) {
     u.cells = u.cells || {};
     return u.cells;
   };
-  const currDiagramOrder = orderArr.toArray();
+  const orderIds = orderArr.toArray();
+  const currDiagramOrder = orderIds.length > 0 ? orderIds : diagramsMap ? Array.from(diagramsMap.keys()) : [];
   const diagramsList = currDiagramOrder.map((id) => diagramsMap.get(id)).filter((d) => !!d);
   const currCellsOrder = /* @__PURE__ */ new Map();
   const cellAttrMap = /* @__PURE__ */ new Map();
@@ -1417,16 +1439,29 @@ function bindCollaborator(file, options) {
 class Binding {
   constructor(file, options) {
     this.suppressLocalApply = false;
+    this.docInitialized = false;
     const { doc, awareness, undoManager, mouseMoveThrottle, cursor } = options;
     this.doc = doc;
     const ui = file.getUi();
     const graph = ui.editor.graph;
     this.mxGraphModel = graph.model;
-    const docHasData = doc.share.has(key);
-    if (!docHasData) {
-      xml2doc(file.data, doc);
+    const mxfileMap = doc.getMap(key);
+    const docHasData = mxfileMap.size > 0;
+    this.docInitialized = docHasData;
+    file.setShadowPages(file.ui.clonePages(file.ui.pages));
+    if (docHasData) {
+      initDocSnapshot(doc, false);
+      const fullPatch = generatePatch([], doc);
+      if (Object.keys(fullPatch).length > 0) {
+        this.suppressLocalApply = true;
+        try {
+          file.patch([fullPatch]);
+        } finally {
+          this.suppressLocalApply = false;
+        }
+      }
+      file.setShadowPages(file.ui.clonePages(file.ui.pages));
     }
-    initDocSnapshot(doc, docHasData);
     this.mxListener = () => {
       if (this.suppressLocalApply)
         return;
@@ -1434,16 +1469,31 @@ class Binding {
         file.shadowPages,
         file.ui.pages
       );
+      const patchKeys = Object.keys(patch);
+      if (patchKeys.length === 0)
+        return;
+      if (!this.docInitialized) {
+        doc.transact(() => {
+          xml2doc(file.data, doc);
+          initDocSnapshot(doc, false);
+        });
+        this.docInitialized = true;
+      }
       file.setShadowPages(file.ui.clonePages(file.ui.pages));
       applyFilePatch(doc, patch, { origin: LOCAL_ORIGIN });
     };
     this.mxGraphModel.addListener("change", this.mxListener);
     this.docObserver = (events, transaction) => {
+      if (!this.docInitialized) {
+        this.docInitialized = true;
+      }
       if (transaction.local && transaction.origin === LOCAL_ORIGIN) {
         generatePatch(events);
         return;
       }
       const patch = generatePatch(events);
+      if (Object.keys(patch).length === 0)
+        return;
       this.suppressLocalApply = true;
       try {
         file.patch([patch]);
@@ -1452,19 +1502,7 @@ class Binding {
         this.suppressLocalApply = false;
       }
     };
-    doc.getMap(key).observeDeep(this.docObserver);
-    if (docHasData) {
-      const fullPatch = generatePatch([], doc);
-      if (Object.keys(fullPatch).length > 0) {
-        this.suppressLocalApply = true;
-        try {
-          file.patch([fullPatch]);
-          file.setShadowPages(file.ui.clonePages(file.ui.pages));
-        } finally {
-          this.suppressLocalApply = false;
-        }
-      }
-    }
+    mxfileMap.observeDeep(this.docObserver);
     if (awareness) {
       this.cleanupCollaborator = bindCollaborator(file, {
         awareness,