@seafile/sdoc-editor 3.0.123 → 3.0.124

package/dist/utils/diff.js

@@ -27,24 +27,23 @@ var generatorDiffTextElement = function generatorDiffTextElement(textElement, di
 var getTopLevelChanges = exports.getTopLevelChanges = function getTopLevelChanges() {
   var changes = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var topLevelChanges = [];
-  var articleEl = document.getElementById('sdoc-scroll-container');
-  changes.forEach(function (item) {
+  var articleEl = document.getElementById('sdoc-editor');
+  for (var i = 0; i < changes.length; i++) {
+    var item = changes[i];
     var dom = document.querySelectorAll("[data-id=\"".concat(item, "\"]"))[0];
-    if (!dom) return [];
-    while (((_dom = dom) === null || _dom === void 0 ? void 0 : (_dom$dataset = _dom.dataset) === null || _dom$dataset === void 0 ? void 0 : _dom$dataset.root) !== 'true' || ((_dom2 = dom) === null || _dom2 === void 0 ? void 0 : _dom2.parentNode) !== articleEl) {
-      var _dom, _dom$dataset, _dom2, _dom3;
-      if (!((_dom3 = dom) !== null && _dom3 !== void 0 && _dom3.parentNode) || dom instanceof Document) break;
+    if (!dom) continue;
+    while (((_dom = dom) === null || _dom === void 0 ? void 0 : _dom.parentNode) !== articleEl) {
+      var _dom, _dom2;
+      if (!((_dom2 = dom) !== null && _dom2 !== void 0 && _dom2.parentNode) || dom instanceof Document) break;
       var parentNode = dom.parentNode;
       if (parentNode instanceof Document) {
         break;
-      } else {
-        var _dom4, _dom4$dataset;
-        dom = parentNode;
-        if ((_dom4 = dom) !== null && _dom4 !== void 0 && (_dom4$dataset = _dom4.dataset) !== null && _dom4$dataset !== void 0 && _dom4$dataset.id && !dom.classList.contains('table-cell')) break;
       }
+      dom = parentNode;
     }
+    if (!dom.dataset.id) continue;
     topLevelChanges.push(dom.dataset.id);
-  });
+  }
   return Array.from(new Set(topLevelChanges));
 };
 
@@ -53,23 +52,38 @@ var getMergedChanges = exports.getMergedChanges = function getMergedChanges(topL
   var diffValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   var topLevelChangesValue = [];
   var changes = [];
-  diffValue.forEach(function (item) {
+  diffValue.forEach(function (item, index) {
     if (topLevelChanges.includes(item.id)) {
       var obj = {
         id: item.id,
-        value: item
+        value: item,
+        index: index
       };
       topLevelChangesValue.push(obj);
     }
   });
-  topLevelChangesValue.forEach(function (item) {
-    var _changes;
-    var preChange = (_changes = changes[changes.length - 1]) === null || _changes === void 0 ? void 0 : _changes.value;
-    var curChange = item.value;
-    if (curChange !== null && curChange !== void 0 && curChange.add && preChange !== null && preChange !== void 0 && preChange.add) return;
-    if (curChange !== null && curChange !== void 0 && curChange["delete"] && preChange !== null && preChange !== void 0 && preChange["delete"]) return;
-    changes.push(item);
-  });
+  for (var i = topLevelChangesValue.length - 1; i >= 0; i--) {
+    var curItem = topLevelChangesValue[i];
+    if (changes.length === 0) {
+      changes.push(curItem);
+      continue;
+    }
+    var nextItem = changes[0];
+    var curChange = curItem === null || curItem === void 0 ? void 0 : curItem.value;
+    var nextChange = nextItem === null || nextItem === void 0 ? void 0 : nextItem.value;
+    var isAdjacent = nextItem && nextItem.index === curItem.index + 1;
+    if (isAdjacent && curChange !== null && curChange !== void 0 && curChange.add && nextChange !== null && nextChange !== void 0 && nextChange.add) {
+      changes.shift();
+      changes.unshift(curItem);
+      continue;
+    }
+    if (isAdjacent && curChange !== null && curChange !== void 0 && curChange["delete"] && nextChange !== null && nextChange !== void 0 && nextChange["delete"]) {
+      changes.shift();
+      changes.unshift(curItem);
+      continue;
+    }
+    changes.unshift(curItem);
+  }
   return changes.map(function (item) {
     return item.id;
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "3.0.123",
+  "version": "3.0.124",
   "main": "dist/index.js",
   "scripts": {
     "test": "jest",
@@ -72,5 +72,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a9e3b6f309ad176cd1ec83997229670e75af81fc"
+  "gitHead": "cac597b945276ad424c9014d4e8647062d984f6b"
 }