@seafile/sdoc-editor 0.1.148-beta → 0.1.149

package/dist/api/sdoc-server-api.js

@@ -58,16 +58,6 @@ var SDocServerApi = /*#__PURE__*/function () {
         }
       });
     }
-
-    // saveDocContentByRebase(content) {
-    //   const { server, docUuid, accessToken } = this;
-    //   const url = `${server}/api/v1/docs/${docUuid}/rebase/`;
-
-    //   const formData = new FormData();
-    //   formData.append('doc_content', JSON.stringify(content));
-
-    //   return axios.post(url, formData, {headers: {Authorization: `Token ${accessToken}`}});
-    // }
   }, {
     key: "getCollaborators",
     value: function getCollaborators() {

package/dist/api/seafile-api.js

@@ -48,11 +48,9 @@ var SeafileAPI = /*#__PURE__*/function () {
     }
   }, {
     key: "sdocPublishRevision",
-    value: function sdocPublishRevision(docUuid, replace) {
+    value: function sdocPublishRevision(docUuid) {
       var url = '/api/v2.1/seadoc/publish-revision/' + docUuid + '/';
-      var form = new FormData();
-      form.append('replace', replace);
-      return this._sendPostRequest(url, form);
+      return this.req.post(url);
     }
   }, {
     key: "startRevise",
@@ -65,9 +63,9 @@ var SeafileAPI = /*#__PURE__*/function () {
       return this._sendPostRequest(url, form);
     }
   }, {
-    key: "getSeadocOriginFileDownloadLink",
-    value: function getSeadocOriginFileDownloadLink(docUuid) {
-      var url = '/api/v2.1/seadoc/origin-file-download-link/' + docUuid + '/';
+    key: "getSeadocRevisionDownloadLinks",
+    value: function getSeadocRevisionDownloadLinks(docUuid) {
+      var url = '/api/v2.1/seadoc/revision/download-links/' + docUuid + '/';
       return this.req.get(url);
     }
   }, {
@@ -83,26 +81,6 @@ var SeafileAPI = /*#__PURE__*/function () {
       var url = 'api/v2.1/seadoc/revisions/' + docUuid + '/?page=' + page + '&per_page=' + perPage;
       return this.req.get(url);
     }
-  }, {
-    key: "deleteSdocRevision",
-    value: function deleteSdocRevision(docUuid) {
-      var url = 'api/v2.1/seadoc/revision/' + docUuid + '/';
-      return this.req.delete(url);
-    }
-  }, {
-    key: "updateSdocRevision",
-    value: function updateSdocRevision(docUuid) {
-      var url = 'api/v2.1/seadoc/revision/' + docUuid + '/';
-      return this.req.put(url);
-    }
-  }, {
-    key: "getFileHistoryVersion",
-    value: function getFileHistoryVersion(docUuid, fileVersion, docPath) {
-      var url = 'api/v2.1/seadoc/history-content/' + docUuid + '/?p=' + encodeURIComponent(docPath) + '&file_version=' + fileVersion;
-      return this.req.get(url);
-    }
-
-    // local files
   }, {
     key: "getSdocFiles",
     value: function getSdocFiles(docUuid, p) {

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

@@ -5,17 +5,4 @@ export var INTERNAL_EVENT = {
   ON_MOUSE_ENTER_BLOCK: 'on_mouse_enter_block',
   INSERT_ELEMENT: 'insert_element'
 };
-export var PAGE_EDIT_AREA_WIDTH = 672; // 672 = 794 - 2[borderLeft + borderRight] - 120[paddingLeft + paddingRight]
-
-export var MODIFY_TYPE = {
-  ADD: 'add',
-  DELETE: 'delete',
-  MODIFY: 'modify',
-  CHILDREN_MODIFY: 'children-modify'
-};
-export var REBASE_TYPE = {
-  MODIFY_MODIFY: 'modify-modify',
-  DELETE_MODIFY: 'delete-modify',
-  CHILDREN_MODIFY: 'children-modify'
-};
-export var REBASE_MARKS = ['origin', 'rebaseType', 'oldElement'];
+export var PAGE_EDIT_AREA_WIDTH = 672; // 672 = 794 - 2[borderLeft + borderRight] - 120[paddingLeft + paddingRight]

package/dist/basic-sdk/editor.js

@@ -0,0 +1,105 @@
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import React, { useEffect, useMemo, useState, forwardRef, useImperativeHandle } from 'react';
+import { Editor } from '@seafile/slate';
+import { useTranslation } from 'react-i18next';
+import { createDefaultEditor } from './extension';
+import { focusEditor } from './extension/core';
+import { withSocketIO } from './socket';
+import withNodeId from './node-id';
+import { PAGE_EDIT_AREA_WIDTH } from './constants';
+import context from '../context';
+import { EditorContainer, EditorContent } from './layout';
+import SlateEditor from './slate-editor';
+import InsertElementDialog from './extension/commons/insert-element-dialog';
+var SDocEditor = forwardRef(function (_ref, ref) {
+  var document = _ref.document,
+    config = _ref.config;
+  var _useTranslation = useTranslation(),
+    t = _useTranslation.t;
+
+  // init editor
+  var editor = useMemo(function () {
+    var defaultEditor = createDefaultEditor();
+    var newEditor = withNodeId(withSocketIO(defaultEditor, {
+      document: document,
+      config: config
+    }));
+    var cursors = document.cursors;
+    newEditor.cursors = cursors || {};
+    newEditor.width = PAGE_EDIT_AREA_WIDTH; // default width
+    newEditor.readonly = false;
+    return newEditor;
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+  var _useState = useState(document.children),
+    _useState2 = _slicedToArray(_useState, 2),
+    slateValue = _useState2[0],
+    setSlateValue = _useState2[1];
+
+  // The parent component can call the method of this component through ref
+  useImperativeHandle(ref, function () {
+    return {
+      // get latest value
+      getValue: function getValue() {
+        return slateValue;
+      }
+    };
+  }, [slateValue]);
+
+  // useMount: init socket connection
+  useEffect(function () {
+    editor.openConnection();
+    return function () {
+      editor.closeConnection();
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  // useMount: focus editor
+  useEffect(function () {
+    var timer = setTimeout(function () {
+      var _editor$children = _slicedToArray(editor.children, 1),
+        firstNode = _editor$children[0];
+      if (firstNode) {
+        var _firstNode$children = _slicedToArray(firstNode.children, 1),
+          firstNodeFirstChild = _firstNode$children[0];
+        if (firstNodeFirstChild) {
+          var endOfFirstNode = Editor.end(editor, [0, 0]);
+          var range = {
+            anchor: endOfFirstNode,
+            focus: endOfFirstNode
+          };
+          focusEditor(editor, range);
+        }
+      }
+    }, 300);
+    return function () {
+      clearTimeout(timer);
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  // useMount: reset title
+  useEffect(function () {
+    var isSdocRevision = context.getSetting('isSdocRevision');
+    var originFilename = context.getSetting('originFilename');
+    if (isSdocRevision) {
+      window.document.getElementsByTagName('title')[0].innerText = "".concat(t('Revision'), " - ").concat(originFilename);
+    }
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(EditorContainer, {
+    editor: editor
+  }, /*#__PURE__*/React.createElement(EditorContent, {
+    docValue: slateValue,
+    showOutline: true
+  }, /*#__PURE__*/React.createElement(SlateEditor, {
+    editor: editor,
+    slateValue: slateValue,
+    setSlateValue: setSlateValue
+  }))), /*#__PURE__*/React.createElement(InsertElementDialog, {
+    editor: editor
+  }));
+});
+export default SDocEditor;

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

@@ -46,7 +46,4 @@ export var SDOC_LINK = 'sdoc-link';
 // font
 export var FONT_SIZE = 'font-size';
 export var FONT_SIZE_INCREASE = 'font-size-increase';
-export var FONT_SIZE_REDUCE = 'font-size-reduce';
-
-// rebase
-export var REBASE_ELEMENT = 'rebase-element';
+export var FONT_SIZE_REDUCE = 'font-size-reduce';

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

@@ -12,30 +12,4 @@ export var replaceNodeChildren = function replaceNodeChildren(editor, _ref) {
       at: at.concat([0])
     }));
   });
-};
-export var replaceNode = function replaceNode(editor) {
-  var _ref2 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-    at = _ref2.at,
-    nodes = _ref2.nodes,
-    insertOptions = _ref2.insertOptions,
-    removeOptions = _ref2.removeOptions;
-  Editor.withoutNormalizing(editor, function () {
-    Transforms.removeNodes(editor, _objectSpread({
-      at: at
-    }, removeOptions));
-    Transforms.insertNodes(editor, nodes, _objectSpread(_objectSpread({}, insertOptions), {}, {
-      at: at
-    }));
-  });
-};
-export var deleteNodeMark = function deleteNodeMark(editor, path, element) {
-  var marks = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
-  var newElement = _objectSpread({}, element);
-  marks.forEach(function (markItem) {
-    newElement[markItem] && delete newElement[markItem];
-  });
-  replaceNode(editor, {
-    at: path,
-    nodes: newElement
-  });
 };

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

@@ -1,16 +1,10 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useCallback } from 'react';
 import { useSlateStatic } from '@seafile/slate-react';
-import { Transforms } from '@seafile/slate';
-import deepCopy from 'deep-copy';
-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 { findPath, getNode, replaceNode, generateEmptyElement, deleteNodeMark } from '../../extension/core';
+import { INTERNAL_EVENT } from '../../constants';
 var CustomElement = function CustomElement(props) {
   var editor = useSlateStatic();
   var element = props.element,
@@ -146,208 +140,6 @@ var CustomElement = function CustomElement(props) {
   }
 };
 var RenderElement = function RenderElement(props) {
-  var editor = useSlateStatic();
-  var _useTranslation = useTranslation(),
-    t = _useTranslation.t;
-  var updateParentNodeByPath = useCallback(function (path) {
-    var parentPath = path.slice(0, -1);
-    var parentNode = getNode(editor, parentPath);
-    if (parentNode.children.filter(function (item) {
-      return item.rebaseType;
-    }).length === 0) {
-      var newParentElement = _objectSpread({}, parentNode);
-      newParentElement['rebaseType'] && delete newParentElement['rebaseType'];
-      newParentElement['oldElement'] && delete newParentElement['oldElement'];
-      newParentElement['origin'] && delete newParentElement['origin'];
-      newParentElement['children'] = newParentElement['children'].map(function (item) {
-        item['rebaseType'] && delete item['rebaseType'];
-        item['oldElement'] && delete item['oldElement'];
-        item['origin'] && delete item['origin'];
-        return item;
-      });
-      replaceNode(editor, {
-        at: parentPath,
-        nodes: newParentElement
-      });
-    }
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [editor]);
-  var deleteElement = useCallback(function (element) {
-    var path = findPath(editor, element);
-    Transforms.removeNodes(editor, {
-      at: path
-    });
-    if (element.type === ELEMENT_TYPE.LIST_ITEM) {
-      updateParentNodeByPath(path);
-    }
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [editor]);
-  var deleteMark = useCallback(function (element) {
-    var path = findPath(editor, element);
-    deleteNodeMark(editor, path, element, REBASE_MARKS);
-    if (element.type === ELEMENT_TYPE.LIST_ITEM) {
-      updateParentNodeByPath(path);
-    }
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [editor]);
-  var addDeletedElement = useCallback(function (element) {
-    var path = findPath(editor, element);
-    deleteNodeMark(editor, path, element, REBASE_MARKS);
-    if (element.type !== ELEMENT_TYPE.LIST_ITEM) {
-      var emptyNode = generateEmptyElement(ELEMENT_TYPE.PARAGRAPH);
-      Transforms.insertNodes(editor, emptyNode, {
-        at: [path[0]]
-      });
-    } else {
-      var _emptyNode = generateEmptyElement(ELEMENT_TYPE.LIST_ITEM);
-      _emptyNode.children[0] = generateEmptyElement(ELEMENT_TYPE.LIST_LIC);
-      var parentPath = path.slice(0, -1);
-      var parentNode = getNode(editor, parentPath);
-      var newChildren = _toConsumableArray(parentNode.children);
-      var index = path[path.length - 1];
-      newChildren.splice(index, 0, _emptyNode);
-      replaceNode(editor, {
-        at: parentPath,
-        nodes: _objectSpread(_objectSpread({}, parentNode), {}, {
-          children: newChildren
-        })
-      });
-    }
-    if (element.type === ELEMENT_TYPE.LIST_ITEM) {
-      updateParentNodeByPath(path);
-    }
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [editor]);
-  var useMasterChanges = useCallback(function (element) {
-    var path = findPath(editor, element);
-    deleteNodeMark(editor, path, element, REBASE_MARKS);
-    var nextElementPath = _toConsumableArray(path);
-    nextElementPath[path.length - 1] = path[path.length - 1] + 1;
-    Transforms.removeNodes(editor, {
-      at: nextElementPath
-    });
-    if (element.type === ELEMENT_TYPE.LIST_ITEM) {
-      updateParentNodeByPath(path);
-    }
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [editor]);
-  var useCurrentChanges = useCallback(function (element) {
-    var path = findPath(editor, element);
-    var currentElementPath = _toConsumableArray(path);
-    currentElementPath[path.length - 1] = path[path.length - 1] + 1;
-    var currentElement = getNode(editor, currentElementPath);
-    var newCurrentElement = deepCopy(currentElement);
-    deleteNodeMark(editor, currentElementPath, newCurrentElement, REBASE_MARKS);
-    Transforms.removeNodes(editor, {
-      at: path
-    });
-    if (element.type === ELEMENT_TYPE.LIST_ITEM) {
-      updateParentNodeByPath(path);
-    }
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [editor]);
-  var useBothChanges = useCallback(function (element) {
-    // delete element marks
-    var path = findPath(editor, element);
-    deleteNodeMark(editor, path, element, REBASE_MARKS);
-
-    // delete next element marks
-    var nextElementPath = [].concat(_toConsumableArray(path.slice(0, -1)), [path[path.length - 1] + 1]);
-    var nextElement = getNode(editor, nextElementPath);
-    deleteNodeMark(editor, nextElementPath, nextElement, REBASE_MARKS);
-    if (element.type === ELEMENT_TYPE.LIST_ITEM) {
-      updateParentNodeByPath(path);
-    }
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [editor]);
-  var element = props.element;
-  if (!element.rebaseType) {
-    return /*#__PURE__*/React.createElement(CustomElement, props);
-  }
-  if (element.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
-    }, /*#__PURE__*/React.createElement("div", {
-      className: "sdoc-rebase-btn",
-      onClick: function onClick() {
-        return deleteElement(element);
-      }
-    }, t('Keep_other_modification')), /*#__PURE__*/React.createElement("div", {
-      className: "mr-2 ml-2"
-    }, '|'), /*#__PURE__*/React.createElement("div", {
-      className: "sdoc-rebase-btn",
-      onClick: function onClick() {
-        return deleteMark(element);
-      }
-    }, t('Keep_my_modification')), /*#__PURE__*/React.createElement("div", {
-      className: "mr-2 ml-2"
-    }, '|'), /*#__PURE__*/React.createElement("div", {
-      className: "sdoc-rebase-btn",
-      onClick: function onClick() {
-        return addDeletedElement(element);
-      }
-    }, t('Keep_both_modification'))), /*#__PURE__*/React.createElement("div", {
-      className: "w-100 sdoc-rebase-current-changes-start",
-      contentEditable: false
-    }, '<<<<<<<'), /*#__PURE__*/React.createElement("div", {
-      className: "w-100",
-      contentEditable: false
-    }, '======='), /*#__PURE__*/React.createElement("div", {
-      className: "w-100 sdoc-rebase-incoming-changes"
-    }, /*#__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') {
-      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-        className: "w-100 d-flex sdoc-rebase-btn-group",
-        contentEditable: false
-      }, /*#__PURE__*/React.createElement("div", {
-        className: "sdoc-rebase-btn",
-        onClick: function onClick() {
-          return useMasterChanges(element);
-        }
-      }, t('Keep_other_modification')), /*#__PURE__*/React.createElement("div", {
-        className: "mr-2 ml-2"
-      }, '|'), /*#__PURE__*/React.createElement("div", {
-        className: "sdoc-rebase-btn",
-        onClick: function onClick() {
-          return useCurrentChanges(element);
-        }
-      }, t('Keep_my_modification')), /*#__PURE__*/React.createElement("div", {
-        className: "mr-2 ml-2"
-      }, '|'), /*#__PURE__*/React.createElement("div", {
-        className: "sdoc-rebase-btn",
-        onClick: function onClick() {
-          return useBothChanges(element);
-        }
-      }, t('Keep_both_modification'))), /*#__PURE__*/React.createElement("div", {
-        className: "w-100 sdoc-rebase-current-changes-start",
-        contentEditable: false
-      }, '<<<<<<<'), /*#__PURE__*/React.createElement("div", {
-        className: "w-100 sdoc-rebase-current-changes"
-      }, /*#__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"
-    }, /*#__PURE__*/React.createElement(CustomElement, props)), /*#__PURE__*/React.createElement("div", {
-      className: "w-100 sdoc-rebase-incoming-changes-end",
-      contentEditable: false
-    }, '>>>>>>>'));
-  }
   return /*#__PURE__*/React.createElement(CustomElement, props);
 
   // const { element } = props;

package/dist/basic-sdk/{editor/slate-editor.js → slate-editor.js}

@@ -1,24 +1,22 @@
 import React, { useCallback, useMemo, Fragment } from 'react';
 import { Editable, ReactEditor, Slate } from '@seafile/slate-react';
-import { renderLeaf, renderElement, ContextToolbar, SideToolbar } from '../extension';
-import { getAboveBlockNode, getNextNode, getPrevNode, isSelectionAtBlockEnd, isSelectionAtBlockStart } from '../extension/core';
-import EventProxy from '../utils/event-handler';
-import { useCursors } from '../cursor/use-cursors';
-import { INTERNAL_EVENT } from '../constants';
-import { SetNodeToDecorations } from '../highlight-decorate/setNodeToDecorations';
-import CommentContextProvider from '../comment/comment-context-provider';
-import CommentWrapper from '../comment';
-import { usePipDecorate } from '../decorates';
-import { getCursorPosition, getDomHeight, getDomMarginTop } from '../utils/dom-utils';
-import EventBus from '../utils/event-bus';
-import { ArticleContainer } from '../layout';
-import { useScrollContext } from '../hooks/use-scroll-context';
+import { renderLeaf, renderElement, ContextToolbar, SideToolbar } from './extension';
+import { getAboveBlockNode, getNextNode, getPrevNode, isSelectionAtBlockEnd, isSelectionAtBlockStart } from './extension/core';
+import EventProxy from './utils/event-handler';
+import { useCursors } from './cursor/use-cursors';
+import { INTERNAL_EVENT } from './constants';
+import { SetNodeToDecorations } from './highlight-decorate/setNodeToDecorations';
+import CommentContextProvider from './comment/comment-context-provider';
+import CommentWrapper from './comment';
+import { usePipDecorate } from './decorates';
+import { getCursorPosition, getDomHeight, getDomMarginTop } from './utils/dom-utils';
+import EventBus from './utils/event-bus';
+import { ArticleContainer } from './layout';
+import { useScrollContext } from './hooks/use-scroll-context';
 var SlateEditor = function SlateEditor(_ref) {
   var editor = _ref.editor,
     setSlateValue = _ref.setSlateValue,
-    slateValue = _ref.slateValue,
-    customRenderElement = _ref.renderElement,
-    isShowComment = _ref.isShowComment;
+    slateValue = _ref.slateValue;
   var _useCursors = useCursors(editor),
     cursors = _useCursors.cursors;
   var decorate = usePipDecorate(editor);
@@ -140,15 +138,12 @@ var SlateEditor = function SlateEditor(_ref) {
     editor: editor
   }, /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(ContextToolbar, null), /*#__PURE__*/React.createElement(SetNodeToDecorations, null), /*#__PURE__*/React.createElement(Editable, {
     cursors: cursors,
-    renderElement: customRenderElement || renderElement,
+    renderElement: renderElement,
     renderLeaf: renderLeaf,
     onKeyDown: onKeyDown,
     onMouseDown: onMouseDown,
     decorate: decorate,
     onCut: eventProxy.onCut
-  })), /*#__PURE__*/React.createElement(SideToolbar, null), isShowComment && /*#__PURE__*/React.createElement(CommentContextProvider, null, /*#__PURE__*/React.createElement(CommentWrapper, null))));
-};
-SlateEditor.defaultProps = {
-  isShowComment: true
+  })), /*#__PURE__*/React.createElement(SideToolbar, null), /*#__PURE__*/React.createElement(CommentContextProvider, null, /*#__PURE__*/React.createElement(CommentWrapper, null))));
 };
 export default SlateEditor;

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

@@ -4,7 +4,6 @@ import { Editor, Operation } from '@seafile/slate';
 import { getNode } from '../extension/core';
 import * as OPERATION from '../node-id/constants';
 import { setCursor } from '../cursor/helper';
-import { MODE } from '../../constants';
 export var getNodePathById = function getNodePathById(rootNode, nodeId) {
   var path = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
   if (rootNode.id === nodeId) return path;
@@ -253,7 +252,6 @@ export var reExecRevertOperationList = function reExecRevertOperationList(editor
   }
 };
 export var syncRemoteOperations = function syncRemoteOperations(editor, remoteOperations) {
-  if (editor.mode !== MODE.EDITOR) return;
   if (remoteOperations.length === 0) return;
   Editor.withoutNormalizing(editor, function () {
     for (var i = 0; i < remoteOperations.length; i++) {