@seafile/sdoc-editor 3.0.122 → 3.0.124

package/dist/extension/plugins/file-view/render-elem/index.css

@@ -27,13 +27,13 @@
   border-radius: 4px;
 }
 
-.sdoc-file-view-container .sdoc-file-view-content {
+/* .sdoc-file-view-container .sdoc-file-view-content {
   height: 400px;
 }
 
 .sdoc-file-view-container .sdoc-file-view-content .sea-metadata {
   height: 396px;
-}
+} */
 
 .sdoc-file-view-container .sdoc-file-view-content .sea-metadata .sea-metadata-table-main-container {
   border: 1px solid #eee;
@@ -48,4 +48,5 @@
   background-color: #007bff;
   border: 1px solid #fff;
   cursor: se-resize;
+  display: none;
 }

package/dist/extension/plugins/file-view/render-elem/index.js

@@ -49,13 +49,13 @@ var FileViewPlugin = function FileViewPlugin(_ref) {
     var viewSettings = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, settings), {}, {
       view_data: {
         wiki_id: data.wiki_id,
-        file_view_id: data.file_view_id,
-        height: data.height
+        file_view_id: data.file_view_id
+        // height: data.height,
         // width: data.width,
       }
     });
     return viewSettings;
-  }, [data.file_view_id, data.height, data.wiki_id]);
+  }, [data.file_view_id, data.wiki_id]);
   (0, _react.useEffect)(function () {
     var copyContent = _localStorageUtils["default"].getItem(_constants.RECENT_COPY_CONTENT);
     var wikiId = _context["default"].getSetting('wikiId');
@@ -144,16 +144,7 @@ var FileViewPlugin = function FileViewPlugin(_ref) {
       'event': onResizeEnd
     }]);
   }, [onMouseMove, onResizeEnd, registerEvent]);
-  var style = (0, _react.useMemo)(function () {
-    var height = data.height;
-    if (height) {
-      return {
-        // width,
-        height: height
-      };
-    }
-    return null;
-  }, [data]);
+  console.log(viewSettings);
   return /*#__PURE__*/_react["default"].createElement("div", Object.assign({
     "data-id": element.id
   }, attributes, {
@@ -164,8 +155,7 @@ var FileViewPlugin = function FileViewPlugin(_ref) {
     className: (0, _classnames["default"])('sdoc-file-view-content', {
       'is-selected': isSelected
     }),
-    ref: wrapperRef,
-    style: style
+    ref: wrapperRef
   }, /*#__PURE__*/_react["default"].createElement(_seafileDatabase.FileView, {
     settings: viewSettings,
     ref: databaseRef,

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.122",
+  "version": "3.0.124",
   "main": "dist/index.js",
   "scripts": {
     "test": "jest",
@@ -20,7 +20,7 @@
     "@seafile/comment-editor": "1.0.19",
     "@seafile/print-js": "1.6.6",
     "@seafile/react-image-lightbox": "5.0.4",
-    "@seafile/seafile-database": "0.0.41",
+    "@seafile/seafile-database": "0.0.43",
     "@seafile/slate": "0.91.8",
     "@seafile/slate-history": "0.86.2",
     "@seafile/slate-hyperscript": "0.81.7",
@@ -72,5 +72,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8f442dff1b427f5f867707b43cc9c50917d34b6a"
+  "gitHead": "cac597b945276ad424c9014d4e8647062d984f6b"
 }