@seafile/sdoc-editor 0.1.148-beta → 0.1.149-beta

package/dist/basic-sdk/comment/comment/comment-item-content.js

@@ -106,17 +106,22 @@ var CommentItem = function CommentItem(_ref) {
   }, /*#__PURE__*/React.createElement("i", {
     className: "sdocfont sdoc-more-options"
   })), /*#__PURE__*/React.createElement(DropdownMenu, {
+    className: "sdoc-dropdown-menu",
     container: container
   }, /*#__PURE__*/React.createElement(DropdownItem, {
+    className: "sdoc-dropdown-menu-item",
     tag: "div",
     onClick: onEditToggle
   }, t('Edit')), /*#__PURE__*/React.createElement(DropdownItem, {
+    className: "sdoc-dropdown-menu-item",
     tag: "div",
     onClick: onDeleteToggle
   }, t('Delete')), !comment.resolved && /*#__PURE__*/React.createElement(DropdownItem, {
+    className: "sdoc-dropdown-menu-item",
     tag: "div",
     onClick: markAsResolved
   }, t('Mark_as_Resolved')), comment.resolved && /*#__PURE__*/React.createElement(DropdownItem, {
+    className: "sdoc-dropdown-menu-item",
     tag: "div",
     onClick: resubmit
   }, t('Resubmit')))))), /*#__PURE__*/React.createElement("div", {

package/dist/basic-sdk/comment/comment/comment-item-reply.js

@@ -77,11 +77,14 @@ var CommentItemReply = function CommentItemReply(_ref) {
   }, /*#__PURE__*/React.createElement("i", {
     className: "sdocfont sdoc-more-options"
   })), /*#__PURE__*/React.createElement(DropdownMenu, {
+    className: "sdoc-dropdown-menu",
     container: container
   }, /*#__PURE__*/React.createElement(DropdownItem, {
+    className: "sdoc-dropdown-menu-item",
     tag: "div",
     onClick: onEditToggle
   }, t('Edit')), /*#__PURE__*/React.createElement(DropdownItem, {
+    className: "sdoc-dropdown-menu-item",
     tag: "div",
     onClick: onDeleteToggle
   }, t('Delete')))))), /*#__PURE__*/React.createElement("div", {

package/dist/basic-sdk/comment/comment/global-comment-header.js

@@ -42,19 +42,22 @@ function GlobalCommentHeader(_ref) {
   }, /*#__PURE__*/React.createElement("div", {
     id: id
   }, t(commentType))), /*#__PURE__*/React.createElement(DropdownMenu, {
-    container: "comment-types",
-    className: "sdoc-comment-list-menu"
+    className: "sdoc-dropdown-menu",
+    container: "comment-types"
   }, /*#__PURE__*/React.createElement(DropdownItem, {
+    className: "sdoc-dropdown-menu-item",
     tag: 'div',
     onClick: function onClick() {
       return onCommentTypeChanged(COMMENT_TYPES.all);
     }
   }, t(COMMENT_TYPES.all)), /*#__PURE__*/React.createElement(DropdownItem, {
+    className: "sdoc-dropdown-menu-item",
     tag: 'div',
     onClick: function onClick() {
       return onCommentTypeChanged(COMMENT_TYPES.resolved);
     }
   }, t(COMMENT_TYPES.resolved)), /*#__PURE__*/React.createElement(DropdownItem, {
+    className: "sdoc-dropdown-menu-item",
     tag: 'div',
     onClick: function onClick() {
       return onCommentTypeChanged(COMMENT_TYPES.unresolved);

package/dist/basic-sdk/comment/comment/global-comment.js

@@ -67,7 +67,7 @@ var GlobalComment = function GlobalComment(_ref) {
       return setShowCommentList(false);
     }
   }, /*#__PURE__*/React.createElement("i", {
-    className: "sdocfont sdoc-close"
+    className: "sdocfont sdoc-sm-close"
   }))), /*#__PURE__*/React.createElement("div", {
     className: "comments-panel-body"
   }, /*#__PURE__*/React.createElement(GlobalCommentHeader, {

package/dist/basic-sdk/comment/comment/style.css

@@ -73,17 +73,17 @@
   font-weight: 500;
 }
 
-.global-comments-popover .comments-panel-header .sdoc-close {
+.global-comments-popover .comments-panel-header .sdoc-sm-close {
   display: flex;
   align-items: center;
   justify-content: center;
-  font-size: 14px;
+  font-size: 16px;
   font-weight: 700;
   color: #999;
   cursor: pointer;
 }
 
-.global-comments-popover .comments-panel-header .sdoc-close:hover {
+.global-comments-popover .comments-panel-header .sdoc-sm-close:hover {
   color: #5a5a5a;
 }
 
@@ -145,6 +145,7 @@
   background: #f5f5f5;
 }
 
-.sdoc-comment-list-menu .dropdown-item {
-  font-size: 12px;
+.sdoc-dropdown-menu .dropdown-item {
+  font-size: 14px;
+  color: #212529;
 }

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

@@ -18,4 +18,10 @@ export var REBASE_TYPE = {
   DELETE_MODIFY: 'delete-modify',
   CHILDREN_MODIFY: 'children-modify'
 };
-export var REBASE_MARKS = ['origin', 'rebaseType', 'oldElement'];
+export var REBASE_MARK_KEY = {
+  ORIGIN: 'origin',
+  REBASE_TYPE: 'rebase_type',
+  MODIFY_TYPE: 'modify_type',
+  OLD_ELEMENT: 'old_element'
+};
+export var REBASE_MARKS = ['origin', 'rebase_type', 'old_element'];

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

@@ -9,7 +9,7 @@ import { useTranslation } from 'react-i18next';
 import { BLOCKQUOTE, LINK, CHECK_LIST_ITEM, HEADER1, HEADER2, HEADER3, HEADER4, HEADER5, HEADER6, LIST_ITEM, LIST_LIC, ORDERED_LIST, PARAGRAPH, UNORDERED_LIST, CODE_BLOCK, CODE_LINE, IMAGE, ELEMENT_TYPE, SDOC_LINK, TITLE, SUBTITLE } from '../constants';
 import { BlockquotePlugin, LinkPlugin, CheckListPlugin, HeaderPlugin, ListPlugin, CodeBlockPlugin, ImagePlugin, TablePlugin, SdocLinkPlugin, ParagraphPlugin } from '../plugins';
 import EventBus from '../../utils/event-bus';
-import { INTERNAL_EVENT, REBASE_TYPE, REBASE_MARKS } from '../../constants';
+import { INTERNAL_EVENT, REBASE_TYPE, REBASE_MARKS, REBASE_MARK_KEY } from '../../constants';
 import { findPath, getNode, replaceNode, generateEmptyElement, deleteNodeMark } from '../../extension/core';
 var CustomElement = function CustomElement(props) {
   var editor = useSlateStatic();
@@ -153,16 +153,16 @@ var RenderElement = function RenderElement(props) {
     var parentPath = path.slice(0, -1);
     var parentNode = getNode(editor, parentPath);
     if (parentNode.children.filter(function (item) {
-      return item.rebaseType;
+      return item[REBASE_MARK_KEY.REBASE_TYPE];
     }).length === 0) {
       var newParentElement = _objectSpread({}, parentNode);
-      newParentElement['rebaseType'] && delete newParentElement['rebaseType'];
-      newParentElement['oldElement'] && delete newParentElement['oldElement'];
-      newParentElement['origin'] && delete newParentElement['origin'];
+      newParentElement[REBASE_MARK_KEY.REBASE_TYPE] && delete newParentElement[REBASE_MARK_KEY.REBASE_TYPE];
+      newParentElement[REBASE_MARK_KEY.OLD_ELEMENT] && delete newParentElement[REBASE_MARK_KEY.OLD_ELEMENT];
+      newParentElement[REBASE_MARK_KEY.ORIGIN] && delete newParentElement[REBASE_MARK_KEY.ORIGIN];
       newParentElement['children'] = newParentElement['children'].map(function (item) {
-        item['rebaseType'] && delete item['rebaseType'];
-        item['oldElement'] && delete item['oldElement'];
-        item['origin'] && delete item['origin'];
+        item[REBASE_MARK_KEY.REBASE_TYPE] && delete item[REBASE_MARK_KEY.REBASE_TYPE];
+        item[REBASE_MARK_KEY.OLD_ELEMENT] && delete item[REBASE_MARK_KEY.OLD_ELEMENT];
+        item[REBASE_MARK_KEY.ORIGIN] && delete item[REBASE_MARK_KEY.ORIGIN];
         return item;
       });
       replaceNode(editor, {
@@ -268,10 +268,11 @@ var RenderElement = function RenderElement(props) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [editor]);
   var element = props.element;
-  if (!element.rebaseType) {
+  var rebaseType = element[REBASE_MARK_KEY.REBASE_TYPE];
+  if (!rebaseType) {
     return /*#__PURE__*/React.createElement(CustomElement, props);
   }
-  if (element.rebaseType === REBASE_TYPE.DELETE_MODIFY) {
+  if (rebaseType === REBASE_TYPE.DELETE_MODIFY) {
     return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
       className: "w-100 d-flex sdoc-rebase-btn-group",
       contentEditable: false
@@ -301,14 +302,15 @@ var RenderElement = function RenderElement(props) {
       className: "w-100",
       contentEditable: false
     }, '======='), /*#__PURE__*/React.createElement("div", {
-      className: "w-100 sdoc-rebase-incoming-changes"
+      className: "w-100 sdoc-rebase-incoming-changes",
+      contentEditable: false
     }, /*#__PURE__*/React.createElement(CustomElement, props)), /*#__PURE__*/React.createElement("div", {
       className: "w-100 sdoc-rebase-incoming-changes-end",
       contentEditable: false
     }, '>>>>>>>'));
   }
-  if (element.rebaseType === REBASE_TYPE.MODIFY_MODIFY) {
-    if (element.origin === 'master') {
+  if (rebaseType === REBASE_TYPE.MODIFY_MODIFY) {
+    if (element[REBASE_MARK_KEY.ORIGIN] === 'master') {
       return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
         className: "w-100 d-flex sdoc-rebase-btn-group",
         contentEditable: false
@@ -335,14 +337,16 @@ var RenderElement = function RenderElement(props) {
         className: "w-100 sdoc-rebase-current-changes-start",
         contentEditable: false
       }, '<<<<<<<'), /*#__PURE__*/React.createElement("div", {
-        className: "w-100 sdoc-rebase-current-changes"
+        className: "w-100 sdoc-rebase-current-changes",
+        contentEditable: false
       }, /*#__PURE__*/React.createElement(CustomElement, props)));
     }
     return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
       className: "w-100",
       contentEditable: false
     }, '======='), /*#__PURE__*/React.createElement("div", {
-      className: "w-100 sdoc-rebase-incoming-changes"
+      className: "w-100 sdoc-rebase-incoming-changes",
+      contentEditable: false
     }, /*#__PURE__*/React.createElement(CustomElement, props)), /*#__PURE__*/React.createElement("div", {
       className: "w-100 sdoc-rebase-incoming-changes-end",
       contentEditable: false

package/dist/basic-sdk/socket/socket-client.js

@@ -137,7 +137,7 @@ var SocketClient = /*#__PURE__*/_createClass(function SocketClient(config) {
     socketManager.receivePublishDocumentError();
   };
   this.sendReplaceDocument = function (document, callback) {
-    _this.socket.emit('replace-doc', _this.getParams({
+    _this.socket.emit('replace-document', _this.getParams({
       document: document
     }), function (result) {
       callback && callback(result);

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

@@ -1,8 +1,9 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { generateIdMapAndIds, getIdDiffs } from './diff';
 import ObjectUtils from './object-utils';
-import { MODIFY_TYPE, REBASE_TYPE } from '../constants';
+import { MODIFY_TYPE, REBASE_TYPE, REBASE_MARK_KEY } from '../constants';
 import { ELEMENT_TYPE } from '../extension/constants';
 import { replaceNodeId } from '../node-id/helpers';
 var getRevisionChanges = function getRevisionChanges(masterContent, currentContent) {
@@ -20,16 +21,12 @@ var getRevisionChanges = function getRevisionChanges(masterContent, currentConte
       removed = idDiff.removed;
     if (added) {
       var addedList = value.map(function (item) {
-        return _objectSpread(_objectSpread({}, currentContentMap[item]), {}, {
-          modifyType: MODIFY_TYPE.ADD
-        });
+        return _objectSpread(_objectSpread({}, currentContentMap[item]), {}, _defineProperty({}, REBASE_MARK_KEY.MODIFY_TYPE, MODIFY_TYPE.ADD));
       });
       content.push.apply(content, _toConsumableArray(addedList));
     } else if (removed) {
       var deletedList = value.map(function (item) {
-        return _objectSpread(_objectSpread({}, masterContentMap[item]), {}, {
-          modifyType: MODIFY_TYPE.DELETE
-        });
+        return _objectSpread(_objectSpread({}, masterContentMap[item]), {}, _defineProperty({}, REBASE_MARK_KEY.MODIFY_TYPE, MODIFY_TYPE.DELETE));
       });
       content.push.apply(content, _toConsumableArray(deletedList));
     } else {
@@ -37,17 +34,15 @@ var getRevisionChanges = function getRevisionChanges(masterContent, currentConte
         if (ObjectUtils.isSameObject(masterContentMap[elementId], currentContentMap[elementId])) {
           content.push(currentContentMap[elementId]);
         } else {
+          var _objectSpread4;
           var oldElement = masterContentMap[elementId];
           var currentElement = currentContentMap[elementId];
-          var newElement = _objectSpread(_objectSpread({}, currentElement), {}, {
-            modifyType: MODIFY_TYPE.MODIFY,
-            oldElement: oldElement
-          });
+          var newElement = _objectSpread(_objectSpread({}, currentElement), {}, (_objectSpread4 = {}, _defineProperty(_objectSpread4, REBASE_MARK_KEY.MODIFY_TYPE, MODIFY_TYPE.MODIFY), _defineProperty(_objectSpread4, REBASE_MARK_KEY.OLD_ELEMENT, oldElement), _objectSpread4));
           if (currentElement.type === oldElement.type) {
             var elementType = currentElement.type;
             if ([ELEMENT_TYPE.UNORDERED_LIST, ELEMENT_TYPE.ORDERED_LIST].includes(elementType)) {
               var listContent = getRevisionChanges(oldElement, currentElement);
-              newElement['modifyType'] = MODIFY_TYPE.CHILDREN_MODIFY;
+              newElement[REBASE_MARK_KEY.MODIFY_TYPE] = MODIFY_TYPE.CHILDREN_MODIFY;
               newElement['children'] = listContent;
             }
           }
@@ -82,8 +77,8 @@ var getMasterChanges = function getMasterChanges(masterContent, revisionChanges)
         };
         // The content has been deleted from the master, but this branch has been modified. At this time, rebase is required, and the user needs to confirm the selected content
         // ==> delete ｜ use modification
-        if (element.modifyType === MODIFY_TYPE.MODIFY) {
-          newElement['rebaseType'] = REBASE_TYPE.DELETE_MODIFY;
+        if (element[REBASE_MARK_KEY.MODIFY_TYPE] === MODIFY_TYPE.MODIFY) {
+          newElement[REBASE_MARK_KEY.REBASE_TYPE] = REBASE_TYPE.DELETE_MODIFY;
           content.push(newElement);
           canMerge = false;
         } else {
@@ -106,54 +101,43 @@ var getMasterChanges = function getMasterChanges(masterContent, revisionChanges)
           content.push(currentElement);
 
           // The content of the master branch is modified in the current branch, but the content of the master branch is the same as that of origin
-        } else if (ObjectUtils.isSameObject(masterElement, currentElement.oldElement)) {
+        } else if (ObjectUtils.isSameObject(masterElement, currentElement[REBASE_MARK_KEY.OLD_ELEMENT])) {
           var newElement = _objectSpread({}, currentElement);
-          newElement['oldElement'] && delete newElement['oldElement'];
-          newElement['modifyType'] && delete newElement['modifyType'];
+          newElement[REBASE_MARK_KEY.OLD_ELEMENT] && delete newElement[REBASE_MARK_KEY.OLD_ELEMENT];
+          newElement[REBASE_MARK_KEY.MODIFY_TYPE] && delete newElement[REBASE_MARK_KEY.MODIFY_TYPE];
           content.push(newElement);
 
           // Modify at the same time
-        } else if (currentElement.modifyType === MODIFY_TYPE.MODIFY) {
-          var oldMasterElement = replaceNodeId(_objectSpread(_objectSpread({}, masterElement), {}, {
-            rebaseType: REBASE_TYPE.MODIFY_MODIFY,
-            origin: 'master'
-          }));
+        } else if (currentElement[REBASE_MARK_KEY.MODIFY_TYPE] === MODIFY_TYPE.MODIFY) {
+          var _objectSpread5, _objectSpread6;
+          var oldMasterElement = replaceNodeId(_objectSpread(_objectSpread({}, masterElement), {}, (_objectSpread5 = {}, _defineProperty(_objectSpread5, REBASE_MARK_KEY.REBASE_TYPE, REBASE_TYPE.MODIFY_MODIFY), _defineProperty(_objectSpread5, REBASE_MARK_KEY.ORIGIN, 'master'), _objectSpread5)));
           content.push(oldMasterElement);
-          var _newElement = _objectSpread(_objectSpread({}, currentElement), {}, {
-            rebaseType: REBASE_TYPE.MODIFY_MODIFY,
-            origin: 'current'
-          });
-          _newElement['modifyType'] && delete _newElement['modifyType'];
-          _newElement['oldElement'] && delete _newElement['oldElement'];
+          var _newElement = _objectSpread(_objectSpread({}, currentElement), {}, (_objectSpread6 = {}, _defineProperty(_objectSpread6, REBASE_MARK_KEY.REBASE_TYPE, REBASE_TYPE.MODIFY_MODIFY), _defineProperty(_objectSpread6, REBASE_MARK_KEY.ORIGIN, 'current'), _objectSpread6));
+          _newElement[REBASE_MARK_KEY.MODIFY_TYPE] && delete _newElement[REBASE_MARK_KEY.MODIFY_TYPE];
+          _newElement[REBASE_MARK_KEY.OLD_ELEMENT] && delete _newElement[REBASE_MARK_KEY.OLD_ELEMENT];
           content.push(_newElement);
           canMerge = false;
 
           // children modify
-        } else if (currentElement.modifyType === MODIFY_TYPE.CHILDREN_MODIFY) {
+        } else if (currentElement[REBASE_MARK_KEY.MODIFY_TYPE] === MODIFY_TYPE.CHILDREN_MODIFY) {
           canMerge = false;
           if (currentElement.type === masterElement.type) {
             var _getMasterChanges = getMasterChanges(masterElement, currentElement.children),
               childrenContent = _getMasterChanges.content;
-            content.push(_objectSpread(_objectSpread({}, masterElement), {}, {
-              children: childrenContent,
-              rebaseType: REBASE_TYPE.CHILDREN_MODIFY
-            }));
+            content.push(_objectSpread(_objectSpread({}, masterElement), {}, _defineProperty({
+              children: childrenContent
+            }, REBASE_MARK_KEY.REBASE_TYPE, REBASE_TYPE.CHILDREN_MODIFY)));
           } else {
-            var _oldMasterElement = replaceNodeId(_objectSpread(_objectSpread({}, masterElement), {}, {
-              rebaseType: REBASE_TYPE.MODIFY_MODIFY,
-              origin: 'master'
-            }));
+            var _objectSpread8, _objectSpread9;
+            var _oldMasterElement = replaceNodeId(_objectSpread(_objectSpread({}, masterElement), {}, (_objectSpread8 = {}, _defineProperty(_objectSpread8, REBASE_MARK_KEY.REBASE_TYPE, REBASE_TYPE.MODIFY_MODIFY), _defineProperty(_objectSpread8, REBASE_MARK_KEY.ORIGIN, 'master'), _objectSpread8)));
             content.push(_oldMasterElement);
-            var _newElement2 = _objectSpread(_objectSpread({}, currentElement.oldElement), {}, {
-              rebaseType: REBASE_TYPE.MODIFY_MODIFY,
-              origin: 'current'
-            });
+            var _newElement2 = _objectSpread(_objectSpread({}, currentElement[REBASE_MARK_KEY.OLD_ELEMENT]), {}, (_objectSpread9 = {}, _defineProperty(_objectSpread9, REBASE_MARK_KEY.REBASE_TYPE, REBASE_TYPE.MODIFY_MODIFY), _defineProperty(_objectSpread9, REBASE_MARK_KEY.ORIGIN, 'current'), _objectSpread9));
             content.push(_newElement2);
           }
         } else {
           var _newElement3 = _objectSpread({}, currentElement);
-          _newElement3['oldElement'] && delete _newElement3['oldElement'];
-          _newElement3['modifyType'] && delete _newElement3['modifyType'];
+          _newElement3[REBASE_MARK_KEY.OLD_ELEMENT] && delete _newElement3[REBASE_MARK_KEY.OLD_ELEMENT];
+          _newElement3[REBASE_MARK_KEY.MODIFY_TYPE] && delete _newElement3[REBASE_MARK_KEY.MODIFY_TYPE];
           content.push(_newElement3);
         }
       });

package/dist/basic-sdk/views/viewer.js

@@ -16,7 +16,7 @@ var SDocViewer = function SDocViewer(_ref) {
     showOutline = _ref.showOutline;
   var validEditor = editor || withNodeId(createDefaultEditor());
   var slateValue = (document || generateDefaultDocContent()).children;
-  var decorate = usePipDecorate(editor);
+  var decorate = usePipDecorate(validEditor);
   return /*#__PURE__*/React.createElement(EditorContainer, {
     editor: editor,
     showToolbar: showToolbar,

package/dist/components/tip-dialog/index.js

@@ -4,7 +4,6 @@ import { Modal, ModalHeader, ModalBody, ModalFooter, Button } from 'reactstrap';
 import classnames from 'classnames';
 import { TIP_TYPE, TIP_TITLE } from '../../constants';
 import TipContent from './tip-content';
-import './index.css';
 var TipDialog = function TipDialog(_ref) {
   var className = _ref.className,
     tipType = _ref.tipType,

package/dist/components/tip-dialog/tip-content.js

@@ -37,18 +37,12 @@ var TipContent = function TipContent(_ref) {
   }, [time]);
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
-  switch (tipType) {
-    case TIP_TYPE.HAS_BEEN_PUBLISHED:
-      {
-        return /*#__PURE__*/React.createElement(React.Fragment, null, t(TIP_CONTENT[tipType], {
-          time: time
-        }));
-      }
-    default:
-      {
-        return /*#__PURE__*/React.createElement(React.Fragment, null, t(TIP_CONTENT[tipType]));
-      }
+  if (tipType === TIP_TYPE.HAS_BEEN_PUBLISHED) {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, t(TIP_CONTENT[tipType], {
+      time: time
+    }));
   }
+  return /*#__PURE__*/React.createElement(React.Fragment, null, t(TIP_CONTENT[tipType]));
 };
 TipContent.propTypes = {
   tipType: PropTypes.string

package/dist/pages/simple-editor.js

@@ -102,19 +102,27 @@ var SimpleEditor = function SimpleEditor(_ref) {
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [editorRef]);
-  var onDocumentReplacedError = useCallback(function () {}, []);
-  var publishDocumentError = useCallback(function () {}, []);
+  var onDocumentReplacedError = useCallback(function () {
+    toaster.danger(t('Error'));
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+  var publishDocumentError = useCallback(function () {
+    toaster.danger(t('Error'));
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
   useEffect(function () {
     var eventBus = EventBus.getInstance();
-    var mergeDocumentSubscribe = eventBus.subscribe(EXTERNAL_EVENT.DOCUMENT_REPLACED, onDocumentReplaced);
-    var publishDocumentSubscribe = eventBus.subscribe(EXTERNAL_EVENT.PUBLISH_DOCUMENT, hasPublishRevision);
-    var mergeDocumentErrorSubscribe = eventBus.subscribe(EXTERNAL_EVENT.DOCUMENT_REPLACED_ERROR, onDocumentReplacedError);
-    var publishDocumentErrorSubscribe = eventBus.subscribe(EXTERNAL_EVENT.PUBLISH_DOCUMENT_ERROR, publishDocumentError);
+    var unsubscribeMergeDocument = eventBus.subscribe(EXTERNAL_EVENT.DOCUMENT_REPLACED, onDocumentReplaced);
+    var unsubscribePublishDocument = eventBus.subscribe(EXTERNAL_EVENT.PUBLISH_DOCUMENT, hasPublishRevision);
+    var unsubscribeMergeDocumentError = eventBus.subscribe(EXTERNAL_EVENT.DOCUMENT_REPLACED_ERROR, onDocumentReplacedError);
+    var unsubscribePublishDocumentError = eventBus.subscribe(EXTERNAL_EVENT.PUBLISH_DOCUMENT_ERROR, publishDocumentError);
     return function () {
-      mergeDocumentSubscribe();
-      publishDocumentSubscribe();
-      mergeDocumentErrorSubscribe();
-      publishDocumentErrorSubscribe();
+      unsubscribeMergeDocument();
+      unsubscribePublishDocument();
+      unsubscribeMergeDocumentError();
+      unsubscribePublishDocumentError();
     };
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -161,7 +169,7 @@ var SimpleEditor = function SimpleEditor(_ref) {
   var toggleViewChanges = useCallback(function (isShowChanges) {
     var revisionCurrentContent = editorRef.current.getSlateValue();
     if (isShowChanges && revisionCurrentContent.children.filter(function (item) {
-      return item.rebaseType;
+      return item.rebase_type;
     }).length !== 0) {
       setTipType(TIP_TYPE.HAS_CONFLICT_BEFORE_VIEW_CHANGES);
       setShowTip(true);
@@ -194,7 +202,7 @@ var SimpleEditor = function SimpleEditor(_ref) {
           loadDocument(function (document) {
             var revisionCurrentContent = document;
             if (revisionCurrentContent.children.filter(function (item) {
-              return item.rebaseType;
+              return item.rebase_type;
             }).length !== 0) {
               setTipType(TIP_TYPE.HAS_CONFLICT_BEFORE_PUBLISH);
               setShowTip(true);

package/package.json

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

package/public/media/sdoc-editor-font/iconfont.svg

@@ -14,6 +14,10 @@
     />
       <missing-glyph />
       
+      <glyph glyph-name="sdoc-sm-close" unicode="&#58965;" d="M512 439.466667L230.4 721.066667l-25.6 25.6-55.466667-55.466667 25.6-25.6 281.6-281.6-281.6-281.6-25.6-25.6 55.466667-55.466667 25.6 25.6 281.6 281.6 281.6-281.6 25.6-25.6 55.466667 55.466667-25.6 25.6-281.6 281.6 281.6 281.6 25.6 25.6-55.466667 55.466667-25.6-25.6z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="sdoc-merge-cell" unicode="&#58963;" d="M480 896v-288h-96V800H96v-832h288v192h96v-288H0V896h480zM313.6 528L480 384l-166.4-144v96H160v92.8h153.6v99.2zM1024 896v-1024H544v288h96v-192h288V800h-288v-192h-96V896h480z m-313.6-368v-99.2H864v-92.8h-153.6v-96L544 384l166.4 144z"  horiz-adv-x="1024" />
+      
       <glyph glyph-name="sdoc-download" unicode="&#58962;" d="M582.4 326.4V793.6c0 41.6-32 70.4-70.4 70.4s-70.4-28.8-70.4-70.4v-467.2l-172.8 172.8c-25.6 25.6-70.4 25.6-96-3.2-25.6-25.6-25.6-70.4 0-96l291.2-291.2c25.6-25.6 70.4-25.6 96 0l291.2 291.2c25.6 25.6 25.6 70.4 3.2 96-25.6 25.6-70.4 25.6-96 3.2l-3.2-3.2-172.8-169.6z m-480-284.8h822.4c38.4 0 70.4-28.8 70.4-70.4s-32-67.2-73.6-67.2H102.4C60.8-96 32-67.2 32-25.6c0 35.2 28.8 67.2 70.4 67.2z"  horiz-adv-x="1024" />
       
       <glyph glyph-name="sdoc-next-page" unicode="&#58918;" d="M342.4 768c12.8 0 28.8-6.4 38.4-16l329.6-329.6c22.4-22.4 22.4-57.6 0-76.8L380.8 16c-22.4-22.4-57.6-22.4-76.8 0-22.4 22.4-22.4 57.6 0 76.8L595.2 384 304 675.2c-22.4 22.4-22.4 57.6 0 76.8 9.6 9.6 25.6 16 38.4 16z"  horiz-adv-x="1024" />

package/public/media/sdoc-editor-font.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: "sdocfont"; /* Project id 4097705 */
-  src: url('./sdoc-editor-font/iconfont.eot?t=1693362307040'); /* IE9 */
-  src: url('./sdoc-editor-font/iconfont.eot?t=1693362307040#iefix') format('embedded-opentype'), /* IE6-IE8 */
-       url('./sdoc-editor-font/iconfont.woff2?t=1693362307040') format('woff2'),
-       url('./sdoc-editor-font/iconfont.woff?t=1693362307040') format('woff'),
-       url('./sdoc-editor-font/iconfont.ttf?t=1693362307040') format('truetype'),
-       url('./sdoc-editor-font/iconfont.svg?t=1693362307040#sdocfont') format('svg');
+  src: url('./sdoc-editor-font/iconfont.eot?t=1694758459474'); /* IE9 */
+  src: url('./sdoc-editor-font/iconfont.eot?t=1694758459474#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('./sdoc-editor-font/iconfont.woff2?t=1694758459474') format('woff2'),
+       url('./sdoc-editor-font/iconfont.woff?t=1694758459474') format('woff'),
+       url('./sdoc-editor-font/iconfont.ttf?t=1694758459474') format('truetype'),
+       url('./sdoc-editor-font/iconfont.svg?t=1694758459474#sdocfont') format('svg');
 }
 
 .sdocfont {
@@ -16,6 +16,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.sdoc-sm-close:before {
+  content: "\e655";
+}
+
+.sdoc-merge-cell:before {
+  content: "\e653";
+}
+
 .sdoc-download:before {
   content: "\e652";
 }