@seafile/sdoc-editor 1.0.212 → 1.0.214

package/dist/basic-sdk/extension/constants/element-type.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.WIKI_LINK = exports.VIDEO_LINK = exports.VIDEO = exports.UNORDERED_LIST = exports.TWO_COLUMN = exports.TOP_LEVEL_TYPES = exports.TITLE = exports.THREE_COLUMN = exports.TABLE_ROW = exports.TABLE_CELL = exports.TABLE = exports.SUBTITLE = exports.SEATABLE_TABLE = exports.SEATABLE_COLUMN = exports.SDOC_LINK = exports.QUICK_INSERT = exports.PARAGRAPH = exports.ORDERED_LIST = exports.MULTI_COLUMN = exports.MENTION_TEMP = exports.MENTION = exports.LIST_ITEM = exports.LINK = exports.INLINE_LEVEL_TYPES = exports.IMAGE_BLOCK = exports.IMAGE = exports.HEADER6 = exports.HEADER5 = exports.HEADER4 = exports.HEADER3 = exports.HEADER2 = exports.HEADER1 = exports.HEADER = exports.FOUR_COLUMN = exports.FONT_SIZE_REDUCE = exports.FONT_SIZE_INCREASE = exports.FONT_SIZE = exports.FIVE_COLUMN = exports.FILE_LINK_INSET_INPUT_TEMP = exports.FILE_LINK = exports.COLUMN = exports.CODE_LINE = exports.CODE_BLOCK = exports.CHECK_LIST_ITEM = exports.CALL_OUT = exports.BLOCKQUOTE = exports.ASK_AI = void 0;
+exports.WIKI_LINK = exports.VIDEO_LINK = exports.VIDEO = exports.UNORDERED_LIST = exports.TWO_COLUMN = exports.TOP_LEVEL_TYPES = exports.TITLE = exports.THREE_COLUMN = exports.TABLE_ROW = exports.TABLE_CELL = exports.TABLE = exports.SUBTITLE = exports.SEATABLE_TABLE = exports.SEATABLE_COLUMN = exports.SDOC_LINK = exports.QUICK_INSERT = exports.PARAGRAPH = exports.ORDERED_LIST = exports.MULTI_COLUMN = exports.MENTION_TEMP = exports.MENTION = exports.LIST_ITEM = exports.LINK = exports.INLINE_LEVEL_TYPES = exports.IMAGE_BLOCK = exports.IMAGE = exports.HEADER6 = exports.HEADER5 = exports.HEADER4 = exports.HEADER3 = exports.HEADER2 = exports.HEADER1 = exports.HEADER = exports.GROUP = exports.FOUR_COLUMN = exports.FONT_SIZE_REDUCE = exports.FONT_SIZE_INCREASE = exports.FONT_SIZE = exports.FIVE_COLUMN = exports.FILE_LINK_INSET_INPUT_TEMP = exports.FILE_LINK = exports.COLUMN = exports.CODE_LINE = exports.CODE_BLOCK = exports.CHECK_LIST_ITEM = exports.CALL_OUT = exports.BLOCKQUOTE = exports.ASK_AI = void 0;
 const BLOCKQUOTE = exports.BLOCKQUOTE = 'blockquote';
 const TITLE = exports.TITLE = 'title';
 const SUBTITLE = exports.SUBTITLE = 'subtitle';
@@ -51,5 +51,8 @@ const ASK_AI = exports.ASK_AI = 'ask_ai';
 const FONT_SIZE = exports.FONT_SIZE = 'font-size';
 const FONT_SIZE_INCREASE = exports.FONT_SIZE_INCREASE = 'font-size-increase';
 const FONT_SIZE_REDUCE = exports.FONT_SIZE_REDUCE = 'font-size-reduce';
+
+// group
+const GROUP = exports.GROUP = 'group';
 const TOP_LEVEL_TYPES = exports.TOP_LEVEL_TYPES = [BLOCKQUOTE, HEADER1, HEADER2, HEADER3, HEADER4, HEADER5, HEADER6, ORDERED_LIST, UNORDERED_LIST, CHECK_LIST_ITEM, PARAGRAPH, CODE_BLOCK, TABLE];
 const INLINE_LEVEL_TYPES = exports.INLINE_LEVEL_TYPES = [IMAGE, LINK, MENTION, MENTION_TEMP];

package/dist/basic-sdk/extension/constants/index.js

@@ -158,6 +158,12 @@ Object.defineProperty(exports, "GOOGLE_FONT_CLASS", {
     return _font.GOOGLE_FONT_CLASS;
   }
 });
+Object.defineProperty(exports, "GROUP", {
+  enumerable: true,
+  get: function () {
+    return _elementType.GROUP;
+  }
+});
 Object.defineProperty(exports, "HEADER", {
   enumerable: true,
   get: function () {

package/dist/basic-sdk/extension/core/transforms/index.js

@@ -47,7 +47,7 @@ Object.keys(_replaceNode).forEach(function (key) {
     }
   });
 });
-var _updateParentNode = require("./update-parent-node.js");
+var _updateParentNode = require("./update-parent-node");
 Object.keys(_updateParentNode).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _updateParentNode[key]) return;
@@ -57,4 +57,15 @@ Object.keys(_updateParentNode).forEach(function (key) {
       return _updateParentNode[key];
     }
   });
+});
+var _rebase = require("./rebase");
+Object.keys(_rebase).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _rebase[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _rebase[key];
+    }
+  });
 });

package/dist/basic-sdk/extension/core/transforms/rebase.js

@@ -0,0 +1,75 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.replaceRebaseNodeChildren = exports.replaceRebaseNode = exports.rebaseNode = exports.deleteRebaseNodeMark = void 0;
+var _slate = require("@seafile/slate");
+var _removeNodeChildren = require("./remove-node-children");
+var _queries = require("../queries");
+var _constants = require("../../constants");
+const replaceRebaseNodeChildren = (editor, _ref) => {
+  let {
+    at,
+    nodes,
+    insertOptions,
+    removeOptions
+  } = _ref;
+  (0, _removeNodeChildren.removeNodeChildren)(editor, at, removeOptions);
+  _slate.Transforms.insertNodes(editor, nodes, {
+    ...insertOptions,
+    at: at.concat([0])
+  });
+};
+exports.replaceRebaseNodeChildren = replaceRebaseNodeChildren;
+const replaceRebaseNode = function (editor) {
+  let {
+    at,
+    nodes,
+    insertOptions,
+    removeOptions
+  } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  const parentPath = at.slice(0, -1);
+  const parentNode = at.length > 1 ? (0, _queries.getNode)(editor, parentPath) : {};
+  if ([_constants.ELEMENT_TYPE.ORDERED_LIST, _constants.ELEMENT_TYPE.UNORDERED_LIST].includes(parentNode.type)) {
+    const newChildren = parentNode.children.slice(0);
+    newChildren.splice(at[at.length - 1], 1, ...nodes);
+    replaceRebaseNodeChildren(editor, {
+      at: parentPath,
+      nodes: newChildren
+    });
+    return;
+  }
+  _slate.Transforms.removeNodes(editor, {
+    at,
+    ...removeOptions
+  });
+  _slate.Transforms.insertNodes(editor, nodes, {
+    ...insertOptions,
+    at
+  });
+};
+exports.replaceRebaseNode = replaceRebaseNode;
+const deleteRebaseNodeMark = function (editor, path, element) {
+  let marks = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
+  const newElement = {
+    ...element
+  };
+  marks.forEach(markItem => {
+    newElement[markItem] && delete newElement[markItem];
+  });
+  _slate.Transforms.removeNodes(editor, {
+    at: path
+  });
+  _slate.Transforms.insertNodes(editor, newElement, {
+    at: path
+  });
+};
+exports.deleteRebaseNodeMark = deleteRebaseNodeMark;
+const rebaseNode = (editor, callback) => {
+  if (!callback) return;
+  _slate.Editor.withoutNormalizing(editor, () => {
+    callback && callback();
+  });
+};
+exports.rebaseNode = rebaseNode;

package/dist/basic-sdk/extension/core/transforms/replace-node.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.replaceNodeChildren = exports.replaceNode = exports.deleteNodeMark = void 0;
+exports.replaceNodeChildren = exports.replaceNode = void 0;
 var _slate = require("@seafile/slate");
 var _removeNodeChildren = require("./remove-node-children");
 const replaceNodeChildren = (editor, _ref) => {
@@ -40,18 +40,4 @@ const replaceNode = function (editor) {
     });
   });
 };
-exports.replaceNode = replaceNode;
-const deleteNodeMark = function (editor, path, element) {
-  let marks = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
-  const newElement = {
-    ...element
-  };
-  marks.forEach(markItem => {
-    newElement[markItem] && delete newElement[markItem];
-  });
-  replaceNode(editor, {
-    at: path,
-    nodes: newElement
-  });
-};
-exports.deleteNodeMark = deleteNodeMark;
+exports.replaceNode = replaceNode;

package/dist/basic-sdk/extension/core/transforms/update-parent-node.js

@@ -4,13 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.updateRebaseParentNodeByPath = void 0;
+var _slate = require("@seafile/slate");
 var _constants = require("../../../constants");
+var _constants2 = require("../../constants");
 var _queries = require("../queries");
-var _replaceNode = require("./replace-node");
 const updateRebaseParentNodeByPath = (editor, path) => {
   const parentPath = path.slice(0, -1);
   const parentNode = (0, _queries.getNode)(editor, parentPath);
-  if (parentNode.children.filter(item => item[_constants.REBASE_MARK_KEY.REBASE_TYPE]).length !== 0) return;
+  if (![_constants2.ELEMENT_TYPE.ORDERED_LIST, _constants2.ELEMENT_TYPE.UNORDERED_LIST].includes(parentNode.type)) return;
   const newParentElement = {
     ...parentNode
   };
@@ -23,9 +24,11 @@ const updateRebaseParentNodeByPath = (editor, path) => {
     item[_constants.REBASE_MARK_KEY.ORIGIN] && delete item[_constants.REBASE_MARK_KEY.ORIGIN];
     return item;
   });
-  (0, _replaceNode.replaceNode)(editor, {
-    at: parentPath,
-    nodes: newParentElement
+  _slate.Transforms.removeNodes(editor, {
+    at: parentPath
+  });
+  _slate.Transforms.insertNodes(editor, newParentElement, {
+    at: parentPath
   });
 };
 exports.updateRebaseParentNodeByPath = updateRebaseParentNodeByPath;

package/dist/basic-sdk/extension/plugins/group/index.js

@@ -0,0 +1,13 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _constants = require("../../constants");
+var _renderElem = require("./render-elem");
+const GroupPlugin = {
+  type: _constants.ELEMENT_TYPE.GROUP,
+  renderElements: [_renderElem.renderGroup]
+};
+var _default = exports.default = GroupPlugin;

package/dist/basic-sdk/extension/plugins/group/render-elem.js

@@ -0,0 +1,25 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.renderGroup = void 0;
+var _react = _interopRequireDefault(require("react"));
+const Group = _ref => {
+  let {
+    element,
+    attributes,
+    children,
+    className
+  } = _ref;
+  return /*#__PURE__*/_react.default.createElement("div", Object.assign({
+    "data-id": element.id
+  }, attributes, {
+    className: className
+  }), children);
+};
+const renderGroup = props => {
+  return /*#__PURE__*/_react.default.createElement(Group, props);
+};
+exports.renderGroup = renderGroup;

package/dist/basic-sdk/extension/plugins/index.js

@@ -41,6 +41,12 @@ Object.defineProperty(exports, "FontPlugin", {
     return _font.default;
   }
 });
+Object.defineProperty(exports, "GroupPlugin", {
+  enumerable: true,
+  get: function () {
+    return _group.default;
+  }
+});
 Object.defineProperty(exports, "HeaderPlugin", {
   enumerable: true,
   get: function () {
@@ -181,7 +187,8 @@ var _quickInsert = _interopRequireDefault(require("./quick-insert"));
 var _wikiLink = _interopRequireDefault(require("./wiki-link"));
 var _seatableColumn = _interopRequireDefault(require("./seatable-column"));
 var _seatableTables = _interopRequireDefault(require("./seatable-tables"));
-const Plugins = [_markdown.default, _html.default, _header.default, _link.default, _blockquote.default, _list.default, _checkList.default, _codeBlock.default, _image.default, _video.default, _table.default, _multiColumn.default, _textStyle.default, _textAlign.default, _font.default, _sdocLink.default, _paragraph.default, _fileLink.default, _callout.default, _searchReplace.default, _quickInsert.default];
+var _group = _interopRequireDefault(require("./group"));
+const Plugins = [_markdown.default, _html.default, _header.default, _link.default, _blockquote.default, _list.default, _checkList.default, _codeBlock.default, _image.default, _video.default, _table.default, _multiColumn.default, _textStyle.default, _textAlign.default, _font.default, _sdocLink.default, _paragraph.default, _fileLink.default, _callout.default, _searchReplace.default, _quickInsert.default, _group.default];
 const WikiPlugins = exports.WikiPlugins = [...Plugins, _wikiLink.default];
 const CommentPlugins = exports.CommentPlugins = [_markdown.default, _html.default, _paragraph.default, _textStyle.default, _list.default, _image.default, _link.default, _mention.default, _blockquote.default];
 var _default = exports.default = Plugins;

package/dist/basic-sdk/extension/plugins/list/plugin/normalize-list.js

@@ -10,6 +10,7 @@ var _core = require("../../../core");
 var _queries = require("../queries");
 var _transforms = require("../transforms");
 var _model = require("../model");
+const validChildrenTypes = [_constants.GROUP, _constants.LIST_ITEM];
 const normalizeList = editor => {
   const {
     normalizeNode
@@ -26,7 +27,7 @@ const normalizeList = editor => {
       const children = (0, _core.getChildren)([node, path]);
       const nonLiChild = children.find(_ref2 => {
         let [child] = _ref2;
-        return child.type !== _constants.LIST_ITEM;
+        return !validChildrenTypes.includes(child.type);
       });
       if (nonLiChild) {
         const listItem = (0, _model.generateEmptyListItem)();
@@ -39,7 +40,7 @@ const normalizeList = editor => {
     if ((0, _core.match)(node, [], {
       type: listTypes
     })) {
-      if (!node.children.length || !node.children.find(item => item.type === _constants.LIST_ITEM)) {
+      if (!node.children.length || !node.children.find(child => validChildrenTypes.includes(child.type))) {
         _slate.Transforms.removeNodes(editor, {
           at: path
         });

package/dist/basic-sdk/extension/plugins/list/transforms/normalize-list-item.js

@@ -15,7 +15,7 @@ const normalizeListItem = (editor, _ref) => {
     listItem
   } = _ref;
   let changed = false;
-  const validLiChildrenTypes = [...(0, _queries.getListTypes)(), _constants.PARAGRAPH];
+  const validLiChildrenTypes = [...(0, _queries.getListTypes)(), _constants.PARAGRAPH, _constants.GROUP];
   const [, liPath] = listItem;
   const liChildren = (0, _core.getChildren)(listItem);
   const invalidLiChildrenPathRefs = liChildren.filter(_ref2 => {

package/dist/basic-sdk/extension/plugins/seatable-tables/render-element/index.css

@@ -7,7 +7,8 @@
 }
 
 .seatable-view-container.selected {
-  border: 2px solid #007BFF;
+  box-shadow: 0 0 0 2px #0aba45;
+  ;
 }
 
 .seatable-view-container .seatable-view-records {

package/dist/basic-sdk/extension/plugins/seatable-tables/render-element/record-item.js

@@ -22,7 +22,7 @@ function RecordItem(_ref) {
   } = element;
   return /*#__PURE__*/_react.default.createElement("tr", {
     className: "seatable-view-body-column-row"
-  }, element.show_record_numbers && /*#__PURE__*/_react.default.createElement("th", {
+  }, element.show_record_numbers && /*#__PURE__*/_react.default.createElement("td", {
     className: "seatable-view-body-column-cell first-cell"
   }, index), columns.map(column => {
     const width = column_width[column.key];

package/dist/basic-sdk/extension/render/custom-element.js

@@ -210,6 +210,11 @@ const CustomRenderElement = props => {
         const [renderSeaTableTable] = _plugins.SeaTableViewsPlugin.renderElements;
         return renderSeaTableTable(props, editor);
       }
+    case _constants.ELEMENT_TYPE.GROUP:
+      {
+        const [renderGroup] = _plugins.GroupPlugin.renderElements;
+        return renderGroup(props);
+      }
     default:
       {
         const [renderParagraph] = _plugins.ParagraphPlugin.renderElements;

package/dist/basic-sdk/extension/render/element-decorate/rebase-decorate/index.css

@@ -41,6 +41,7 @@
 
 .sdoc-rebase-my-changes > *:first-child,
 .sdoc-rebase-other-changes > *:first-child {
-  margin: 0;
+  margin-top: 0 !important;
+  margin-bottom: 0 !important;
   padding: 0.8em 0 0.8em 0.2em;
 }

package/dist/basic-sdk/extension/render/element-decorate/rebase-decorate/rebase-delete-modify-decorate.js

@@ -34,7 +34,7 @@ const RebaseDeleteModifyDecorate = _ref => {
   }, [editor, element]);
   const deleteMark = (0, _react.useCallback)(() => {
     const path = (0, _core.findPath)(editor, element);
-    (0, _core.deleteNodeMark)(editor, path, element, _constants2.REBASE_MARKS);
+    (0, _core.deleteRebaseNodeMark)(editor, path, element, _constants2.REBASE_MARKS);
     if (element.type === _constants.ELEMENT_TYPE.LIST_ITEM) {
       (0, _core.updateRebaseParentNodeByPath)(editor, path);
     }

package/dist/basic-sdk/extension/render/element-decorate/rebase-decorate/rebase-modify-delete-decorate.js

@@ -34,7 +34,7 @@ const RebaseModifyDeleteDecorate = _ref => {
   }, [editor, element]);
   const deleteMark = (0, _react.useCallback)(() => {
     const path = (0, _core.findPath)(editor, element);
-    (0, _core.deleteNodeMark)(editor, path, element, _constants2.REBASE_MARKS);
+    (0, _core.deleteRebaseNodeMark)(editor, path, element, _constants2.REBASE_MARKS);
     if (element.type === _constants.ELEMENT_TYPE.LIST_ITEM) {
       (0, _core.updateRebaseParentNodeByPath)(editor, path);
     }

package/dist/basic-sdk/extension/render/element-decorate/rebase-decorate/rebase-modify-modify-decorate.js

@@ -24,47 +24,79 @@ const RebaseModifyModifyDecorate = _ref => {
   } = (0, _reactI18next.useTranslation)('sdoc-editor');
   const editor = (0, _slateReact.useSlateStatic)();
   const useMasterChanges = (0, _react.useCallback)(() => {
-    const path = (0, _core.findPath)(editor, element);
-    (0, _core.deleteNodeMark)(editor, path, element[_constants2.REBASE_MARK_KEY.OLD_ELEMENT], _constants2.REBASE_MARKS);
-    const nextElementPath = [...path];
-    nextElementPath[path.length - 1] = path[path.length - 1] + 1;
-    _slate.Transforms.removeNodes(editor, {
-      at: nextElementPath
-    });
-    if (element.type === _constants.ELEMENT_TYPE.LIST_ITEM) {
+    (0, _core.rebaseNode)(editor, () => {
+      const path = (0, _core.findPath)(editor, element);
+
+      // delete my changes
+      const nextElementPath = [...path];
+      nextElementPath[path.length - 1] = path[path.length - 1] + 1;
+      _slate.Transforms.removeNodes(editor, {
+        at: nextElementPath
+      });
+
+      // update master changes
+      if (element.type === _constants.ELEMENT_TYPE.GROUP) {
+        (0, _core.replaceRebaseNode)(editor, {
+          at: path,
+          nodes: element.children
+        });
+      } else {
+        (0, _core.deleteRebaseNodeMark)(editor, path, element[_constants2.REBASE_MARK_KEY.OLD_ELEMENT], _constants2.REBASE_MARKS);
+      }
       (0, _core.updateRebaseParentNodeByPath)(editor, path);
-    }
+    });
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [editor, element]);
-  const useCurrentChanges = (0, _react.useCallback)(() => {
-    const path = (0, _core.findPath)(editor, element);
-    const currentElementPath = [...path];
-    currentElementPath[path.length - 1] = path[path.length - 1] + 1;
-    const currentElement = (0, _core.getNode)(editor, currentElementPath);
-    const newCurrentElement = (0, _deepCopy.default)(currentElement);
-    (0, _core.deleteNodeMark)(editor, currentElementPath, newCurrentElement, _constants2.REBASE_MARKS);
-    _slate.Transforms.removeNodes(editor, {
-      at: path
-    });
-    if (element.type === _constants.ELEMENT_TYPE.LIST_ITEM) {
+  const useMyChanges = (0, _react.useCallback)(() => {
+    (0, _core.rebaseNode)(editor, () => {
+      const path = (0, _core.findPath)(editor, element);
+      const currentElementPath = [...path];
+      currentElementPath[path.length - 1] = path[path.length - 1] + 1;
+      const currentElement = (0, _core.getNode)(editor, currentElementPath);
+      const newCurrentElement = (0, _deepCopy.default)(currentElement);
+      if (element.type === _constants.ELEMENT_TYPE.GROUP) {
+        (0, _core.replaceRebaseNode)(editor, {
+          at: currentElementPath,
+          nodes: newCurrentElement.children
+        });
+      } else {
+        (0, _core.deleteRebaseNodeMark)(editor, currentElementPath, newCurrentElement, _constants2.REBASE_MARKS);
+      }
+      _slate.Transforms.removeNodes(editor, {
+        at: path
+      });
       (0, _core.updateRebaseParentNodeByPath)(editor, path);
-    }
+    });
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [editor, element]);
   const useBothChanges = (0, _react.useCallback)(() => {
-    // delete element marks
-    const path = (0, _core.findPath)(editor, element);
-    (0, _core.deleteNodeMark)(editor, path, element, _constants2.REBASE_MARKS);
+    (0, _core.rebaseNode)(editor, () => {
+      const path = (0, _core.findPath)(editor, element);
+      const nextElementPath = [...path.slice(0, -1), path[path.length - 1] + 1];
+      const nextElement = (0, _core.getNode)(editor, nextElementPath);
+      if (element.type === _constants.ELEMENT_TYPE.GROUP) {
+        // replace next element
+        (0, _core.replaceRebaseNode)(editor, {
+          at: nextElementPath,
+          nodes: nextElement.children
+        });
 
-    // delete next element marks
-    const nextElementPath = [...path.slice(0, -1), path[path.length - 1] + 1];
-    const nextElement = (0, _core.getNode)(editor, nextElementPath);
-    (0, _core.deleteNodeMark)(editor, nextElementPath, nextElement, _constants2.REBASE_MARKS);
-    if (element.type === _constants.ELEMENT_TYPE.LIST_ITEM) {
+        // replace current element
+        (0, _core.replaceRebaseNode)(editor, {
+          at: path,
+          nodes: element.children
+        });
+      } else {
+        // delete element marks
+        (0, _core.deleteRebaseNodeMark)(editor, path, element, _constants2.REBASE_MARKS);
+
+        // delete next element marks
+        (0, _core.deleteRebaseNodeMark)(editor, nextElementPath, nextElement, _constants2.REBASE_MARKS);
+      }
       (0, _core.updateRebaseParentNodeByPath)(editor, path);
-    }
+    });
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [editor, element]);
@@ -79,7 +111,7 @@ const RebaseModifyModifyDecorate = _ref => {
       className: "mr-2 ml-2"
     }, '|'), /*#__PURE__*/_react.default.createElement("div", {
       className: "sdoc-rebase-btn",
-      onClick: useCurrentChanges
+      onClick: useMyChanges
     }, t('Keep_my_modification')), /*#__PURE__*/_react.default.createElement("div", {
       className: "mr-2 ml-2"
     }, '|'), /*#__PURE__*/_react.default.createElement("div", {

package/dist/basic-sdk/outline/index.js

@@ -13,6 +13,7 @@ var _constants = require("../constants");
 var _eventBus = _interopRequireDefault(require("../utils/event-bus"));
 var _outlineItem = _interopRequireDefault(require("./outline-item"));
 var _tooltip = _interopRequireDefault(require("../../components/tooltip"));
+var _context = _interopRequireDefault(require("../../context"));
 require("./style.css");
 const getOutlineSetting = () => {
   const currentValue = localStorage.getItem(_constants.SDOC_STORAGE);
@@ -37,6 +38,7 @@ const SDocOutline = _ref => {
     t
   } = _ref;
   const [isShown, setIsShown] = (0, _react.useState)(false);
+  const isSdocRevision = _context.default.getSetting('isSdocRevision');
   const updateOutlineState = (0, _react.useCallback)(state => {
     setIsShown(state);
     setOutlineSetting(state);
@@ -73,12 +75,11 @@ const SDocOutline = _ref => {
     className: "mt-4 text-secondary"
   }, t('Headings_you_add_to_the_document_will_appear_here')), list.length > 0 && /*#__PURE__*/_react.default.createElement("div", {
     className: "sdoc-outline-list-container"
-  }, list.map((item, index) => {
-    return /*#__PURE__*/_react.default.createElement(_outlineItem.default, {
-      key: index,
-      item: item
-    });
-  })))), !isShown && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", {
+  }, list.map((item, index) => /*#__PURE__*/_react.default.createElement(_outlineItem.default, {
+    key: index,
+    item: item,
+    isSdocRevision: isSdocRevision
+  }))))), !isShown && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", {
     id: "sdoc-outline-menu",
     className: "sdoc-outline-menu sdocfont sdoc-table-of-content-outline",
     onClick: toggleShow

package/dist/basic-sdk/outline/outline-item.js

@@ -9,6 +9,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/es
 var _classnames = _interopRequireDefault(require("classnames"));
 var _react = _interopRequireDefault(require("react"));
 var _constants = require("../constants");
+var _constants2 = require("../extension/constants");
 class OutlineItem extends _react.default.PureComponent {
   constructor(props) {
     super(props);
@@ -66,7 +67,8 @@ class OutlineItem extends _react.default.PureComponent {
   render() {
     const {
       item,
-      isDisplayHorizontalBar
+      isDisplayHorizontalBar,
+      isSdocRevision
     } = this.props;
     const {
       type,
@@ -91,7 +93,22 @@ class OutlineItem extends _react.default.PureComponent {
       onClick: this.onItemClick,
       onMouseOver: this.onMouseOver,
       onMouseOut: this.onMouseOut
-    }, children.map(child => child.text || child.title).join(''));
+    }, !isSdocRevision && children.map(child => child.text || child.title).join(''), isSdocRevision && children.map(child => {
+      const text = child.text || child.title;
+      const style = {
+        ...(child.add && _constants2.ADDED_STYLE),
+        ...(child.delete && _constants2.DELETED_STYLE),
+        backgroundColor: child.computed_background_color || undefined
+      };
+      const key = child.id;
+      const content = /*#__PURE__*/_react.default.createElement("span", {
+        style: style,
+        key: key
+      }, text);
+      return child.delete ? /*#__PURE__*/_react.default.createElement("del", {
+        key: key
+      }, content) : content;
+    }));
   }
 }
 var _default = exports.default = OutlineItem;

package/dist/basic-sdk/utils/diff.js

@@ -37,7 +37,9 @@ const getTopLevelChanges = changes => {
       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;
       }
     }
     topLevelChanges.push(dom.dataset.id);

package/dist/basic-sdk/utils/rebase.js

@@ -32,6 +32,49 @@ const hasConflict = content => {
   return flag;
 };
 exports.hasConflict = hasConflict;
+const expandGroup = content => {
+  if ([_constants2.ELEMENT_TYPE.UNORDERED_LIST, _constants2.ELEMENT_TYPE.ORDERED_LIST].includes(content.type)) {
+    return [{
+      ...content,
+      children: content.children.map(item => {
+        if (item.type === _constants2.ELEMENT_TYPE.GROUP) {
+          return expandGroup(item);
+        }
+        return item;
+      }).flat(1)
+    }];
+  }
+  return content.type === _constants2.ELEMENT_TYPE.GROUP ? content.children : [content];
+};
+const mergeChanges = changes => {
+  if (!Array.isArray(changes) || changes.length === 0) return changes;
+  let value = [];
+  let i = 0;
+  while (i < changes.length) {
+    const change = changes[i];
+    const lastChange = value[value.length - 1];
+    if (change && lastChange && change[_constants.REBASE_MARK_KEY.MODIFY_TYPE] === _constants.MODIFY_TYPE.ADD && lastChange[_constants.REBASE_MARK_KEY.MODIFY_TYPE] === _constants.MODIFY_TYPE.DELETE) {
+      value = value.slice(0, value.length - 1);
+      lastChange[_constants.REBASE_MARK_KEY.MODIFY_TYPE] && delete lastChange[_constants.REBASE_MARK_KEY.MODIFY_TYPE];
+      change[_constants.REBASE_MARK_KEY.MODIFY_TYPE] && delete change[_constants.REBASE_MARK_KEY.MODIFY_TYPE];
+      value.push({
+        id: change.id.endsWith('_group') ? change.id : change.id + '_group',
+        type: _constants2.ELEMENT_TYPE.GROUP,
+        [_constants.REBASE_MARK_KEY.MODIFY_TYPE]: _constants.MODIFY_TYPE.MODIFY,
+        children: expandGroup(change),
+        [_constants.REBASE_MARK_KEY.OLD_ELEMENT]: {
+          id: lastChange.id.endsWith('_group') ? lastChange.id : lastChange.id + '_group',
+          type: _constants2.ELEMENT_TYPE.GROUP,
+          children: expandGroup(lastChange)
+        }
+      });
+    } else {
+      value.push(change);
+    }
+    i++;
+  }
+  return value;
+};
 const getChanges = function (masterContent, revisionContent) {
   let childrenName = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'children';
   const {
@@ -51,17 +94,21 @@ const getChanges = function (masterContent, revisionContent) {
       removed
     } = idDiff;
     if (added) {
-      const addedList = value.map(item => ({
-        ...currentContentMap[item],
-        [_constants.REBASE_MARK_KEY.MODIFY_TYPE]: _constants.MODIFY_TYPE.ADD
-      }));
-      content.push(...addedList);
+      // merge consecutive identical operations
+      content.push({
+        id: value[0] + '_group',
+        type: _constants2.ELEMENT_TYPE.GROUP,
+        [_constants.REBASE_MARK_KEY.MODIFY_TYPE]: _constants.MODIFY_TYPE.ADD,
+        children: value.map(item => currentContentMap[item])
+      });
     } else if (removed) {
-      const deletedList = value.map(item => ({
-        ...masterContentMap[item],
-        [_constants.REBASE_MARK_KEY.MODIFY_TYPE]: _constants.MODIFY_TYPE.DELETE
-      }));
-      content.push(...deletedList);
+      // merge consecutive identical operations
+      content.push({
+        id: value[0] + '_group',
+        type: _constants2.ELEMENT_TYPE.GROUP,
+        [_constants.REBASE_MARK_KEY.MODIFY_TYPE]: _constants.MODIFY_TYPE.DELETE,
+        children: value.map(item => masterContentMap[item])
+      });
     } else {
       value.forEach(elementId => {
         if (_objectUtils.default.isSameObject(masterContentMap[elementId], currentContentMap[elementId])) {
@@ -87,7 +134,7 @@ const getChanges = function (masterContent, revisionContent) {
       });
     }
   });
-  return content;
+  return mergeChanges(content);
 };
 const getMergeElement = (diffElement, baseElement) => {
   const modifyType = diffElement[_constants.REBASE_MARK_KEY.MODIFY_TYPE];
@@ -99,7 +146,7 @@ const getMergeElement = (diffElement, baseElement) => {
   // revision does not have this element, master has this element
   if (modifyType === _constants.MODIFY_TYPE.DELETE) {
     // base content does not have this element, indicating that it is newly added by master and needs to be retained, and will not be counted as a conflict.
-    if (!baseElement) return [newElement];
+    if (!baseElement) return expandGroup(newElement);
 
     // base content has this element, master modified it, indicating that revision deleted it, and the user manually selected the conflict
     if (!_objectUtils.default.isSameObject(baseElement, diffElement, [_constants.REBASE_MARK_KEY.MODIFY_TYPE])) {
@@ -114,7 +161,7 @@ const getMergeElement = (diffElement, baseElement) => {
   // revision has this element, master does not have this element
   if (modifyType === _constants.MODIFY_TYPE.ADD) {
     // base content does not have this element, indicating that it is newly added by revision and needs to be retained, and will not be counted as a conflict.
-    if (!baseElement) return [newElement];
+    if (!baseElement) return expandGroup(newElement);
 
     // master deleted it, revision modified it, and the user manually selected the conflict
     if (!_objectUtils.default.isSameObject(baseElement, diffElement, [_constants.REBASE_MARK_KEY.MODIFY_TYPE])) {
@@ -184,10 +231,10 @@ const getMergeElement = (diffElement, baseElement) => {
         [_constants.REBASE_MARK_KEY.ORIGIN]: _constants.REBASE_ORIGIN.MY
       }];
     }
-    if (_objectUtils.default.isSameObject(masterElement, baseElement)) return [newElement];
+    if (_objectUtils.default.isSameObject(masterElement, baseElement)) return expandGroup(newElement);
     if (_objectUtils.default.isSameObject(newElement, baseElement)) return [masterElement];
     if (_objectUtils.default.isSameObject(masterElement, newElement, ['type'])) {
-      if (_objectUtils.default.isSameObject(masterElement, baseElement, ['type'])) return [newElement];
+      if (_objectUtils.default.isSameObject(masterElement, baseElement, ['type'])) return expandGroup(newElement);
       if (_objectUtils.default.isSameObject(newElement, baseElement, ['type'])) return [masterElement];
     }
 
@@ -199,7 +246,7 @@ const getMergeElement = (diffElement, baseElement) => {
     }];
   }
   newElement[_constants.REBASE_MARK_KEY.OLD_ELEMENT] && delete newElement[_constants.REBASE_MARK_KEY.OLD_ELEMENT];
-  return [newElement];
+  return expandGroup(newElement);
 };
 const getMergeContent = function (baseContent, diffChanges) {
   let childrenName = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'children';

package/dist/components/doc-operations/revision-operations/revisions/index.css

@@ -3,7 +3,7 @@
   width: fit-content;
   border: 1px solid #E5E5E5;
   border-radius: 3px;
-  line-height: 28px;
+  line-height: 26px;
   text-align: center;
   padding: 0 16px;
   margin-left: 1rem;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "1.0.212",
+  "version": "1.0.214",
   "private": false,
   "description": "This is a sdoc editor",
   "main": "dist/index.js",