@seafile/sdoc-editor 0.1.147 → 0.1.148-beta

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

@@ -58,6 +58,16 @@ 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,9 +48,11 @@ var SeafileAPI = /*#__PURE__*/function () {
     }
   }, {
     key: "sdocPublishRevision",
-    value: function sdocPublishRevision(docUuid) {
+    value: function sdocPublishRevision(docUuid, replace) {
       var url = '/api/v2.1/seadoc/publish-revision/' + docUuid + '/';
-      return this.req.post(url);
+      var form = new FormData();
+      form.append('replace', replace);
+      return this._sendPostRequest(url, form);
     }
   }, {
     key: "startRevise",
@@ -63,9 +65,9 @@ var SeafileAPI = /*#__PURE__*/function () {
       return this._sendPostRequest(url, form);
     }
   }, {
-    key: "getSeadocRevisionDownloadLinks",
-    value: function getSeadocRevisionDownloadLinks(docUuid) {
-      var url = '/api/v2.1/seadoc/revision/download-links/' + docUuid + '/';
+    key: "getSeadocOriginFileDownloadLink",
+    value: function getSeadocOriginFileDownloadLink(docUuid) {
+      var url = '/api/v2.1/seadoc/origin-file-download-link/' + docUuid + '/';
       return this.req.get(url);
     }
   }, {
@@ -81,6 +83,26 @@ 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/constants/index.js

@@ -5,4 +5,17 @@ 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 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'];

package/dist/basic-sdk/editor/common-editor.js

@@ -0,0 +1,50 @@
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import React, { useEffect } from 'react';
+import { Editor } from '@seafile/slate';
+import { focusEditor } from '../extension/core';
+import { EditorContainer, EditorContent } from '../layout';
+import SlateEditor from './slate-editor';
+import InsertElementDialog from '../extension/commons/insert-element-dialog';
+var CommonEditor = function CommonEditor(_ref) {
+  var slateValue = _ref.slateValue,
+    updateSlateValue = _ref.updateSlateValue,
+    editor = _ref.editor,
+    renderElement = _ref.renderElement;
+  // 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
+  }, []);
+  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: updateSlateValue,
+    renderElement: renderElement
+  }))), /*#__PURE__*/React.createElement(InsertElementDialog, {
+    editor: editor
+  }));
+};
+export default CommonEditor;

package/dist/basic-sdk/editor/index.css

@@ -0,0 +1,29 @@
+.sdoc-rebase-btn-group {
+  color: #aaa;
+}
+
+.sdoc-rebase-btn-group .sdoc-rebase-btn {
+  cursor: pointer;
+}
+
+.sdoc-rebase-current-changes-start {
+  background-color: rgb(202, 232, 254);
+}
+
+.sdoc-rebase-current-changes {
+  background-color: rgba(202, 232, 254, .8);
+}
+
+.sdoc-rebase-incoming-changes {
+  background-color: rgb(222, 232, 254);
+}
+
+.sdoc-rebase-incoming-changes > *:first-child,
+.sdoc-rebase-current-changes > *:first-child {
+  margin: 0;
+  padding: 0.8em 0 0.8em 0.2em;
+}
+
+.sdoc-rebase-incoming-changes-end {
+  background-color: rgb(212, 212, 254);
+}

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

@@ -0,0 +1,129 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import React, { useMemo, useEffect, useState, useCallback, useImperativeHandle, forwardRef } from 'react';
+import deepCopy from 'deep-copy';
+import { createDefaultEditor, renderElement } from '../extension';
+import { withSocketIO } from '../socket';
+import withNodeId from '../node-id';
+import { PAGE_EDIT_AREA_WIDTH } from '../constants';
+import { MODE } from '../../constants';
+import DiffViewer from '../views/diff-viewer';
+import SDocEditor from './common-editor';
+import CommonLoading from '../../components/common-loading';
+import context from '../../context';
+import './index.css';
+var Editor = forwardRef(function (_ref, ref) {
+  var mode = _ref.mode,
+    document = _ref.document,
+    setDiffChanges = _ref.setDiffChanges;
+  var editor = useMemo(function () {
+    var defaultEditor = createDefaultEditor();
+    var editorConfig = context.getEditorConfig();
+    defaultEditor.mode = MODE.EDITOR;
+    var newEditor = withNodeId(withSocketIO(defaultEditor, {
+      document: document,
+      config: editorConfig
+    }));
+    var cursors = document.cursors;
+    newEditor.cursors = cursors || {};
+    newEditor.width = PAGE_EDIT_AREA_WIDTH; // default width
+    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];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    isLoading = _useState4[0],
+    _setLoading = _useState4[1];
+  var _useState5 = useState(null),
+    _useState6 = _slicedToArray(_useState5, 2),
+    diffContent = _useState6[0],
+    _setDiffContent = _useState6[1];
+  var _useState7 = useState(null),
+    _useState8 = _slicedToArray(_useState7, 2),
+    currentContent = _useState8[0],
+    setCurrentContent = _useState8[1];
+
+  // useMount: init socket connection
+  useEffect(function () {
+    editor.openConnection();
+    return function () {
+      editor.closeConnection();
+    };
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+  var updateSlateValue = useCallback(function (value) {
+    _setSlateValue(value);
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  // The parent component can call the method of this component through ref
+  useImperativeHandle(ref, function () {
+    return {
+      // set value
+      setLoading: function setLoading(isLoading) {
+        _setLoading(isLoading);
+      },
+      setDiffContent: function setDiffContent(content) {
+        setCurrentContent(deepCopy(_objectSpread(_objectSpread({}, document), {}, {
+          children: slateValue
+        })));
+        _setDiffContent(content);
+      },
+      setEditorMode: function setEditorMode(mode) {
+        editor.cursors = {};
+        editor.selection = null;
+        if (mode === MODE.EDITOR) {
+          editor.operations = [];
+        }
+        editor.mode = mode;
+      },
+      setSlateValue: function setSlateValue(document) {
+        _setSlateValue(document.children);
+      },
+      // get value
+      getSlateValue: function getSlateValue() {
+        return deepCopy(_objectSpread(_objectSpread({}, document), {}, {
+          children: slateValue
+        }));
+      },
+      // send message
+      publishDocument: function publishDocument(originDocUuid, originDocName, isNeedUpdateOriginDoc) {
+        editor.publishDocument(originDocUuid, originDocName, isNeedUpdateOriginDoc);
+      },
+      replaceDocument: function replaceDocument(value, originFileVersion) {
+        editor.replaceDocument(value, originFileVersion);
+      }
+
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+    };
+  }, [document, editor, slateValue]);
+  if (isLoading) {
+    return /*#__PURE__*/React.createElement("div", {
+      className: "h-100 w-100 d-flex align-items-center justify-content-center"
+    }, /*#__PURE__*/React.createElement(CommonLoading, null));
+  }
+  if (mode === MODE.DIFF_VIEWER) {
+    return /*#__PURE__*/React.createElement(DiffViewer, {
+      showToolbar: true,
+      showOutline: true,
+      editor: editor,
+      currentContent: currentContent,
+      lastContent: diffContent,
+      didMountCallback: setDiffChanges
+    });
+  }
+  return /*#__PURE__*/React.createElement(SDocEditor, {
+    slateValue: slateValue,
+    editor: editor,
+    updateSlateValue: updateSlateValue,
+    renderElement: renderElement
+  });
+});
+export default Editor;

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

@@ -1,22 +1,24 @@
 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;
+    slateValue = _ref.slateValue,
+    customRenderElement = _ref.renderElement,
+    isShowComment = _ref.isShowComment;
   var _useCursors = useCursors(editor),
     cursors = _useCursors.cursors;
   var decorate = usePipDecorate(editor);
@@ -138,12 +140,15 @@ 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: renderElement,
+    renderElement: customRenderElement || renderElement,
     renderLeaf: renderLeaf,
     onKeyDown: onKeyDown,
     onMouseDown: onMouseDown,
     decorate: decorate,
     onCut: eventProxy.onCut
-  })), /*#__PURE__*/React.createElement(SideToolbar, null), /*#__PURE__*/React.createElement(CommentContextProvider, null, /*#__PURE__*/React.createElement(CommentWrapper, null))));
+  })), /*#__PURE__*/React.createElement(SideToolbar, null), isShowComment && /*#__PURE__*/React.createElement(CommentContextProvider, null, /*#__PURE__*/React.createElement(CommentWrapper, null))));
+};
+SlateEditor.defaultProps = {
+  isShowComment: true
 };
 export default SlateEditor;

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

@@ -46,4 +46,7 @@ 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';
+export var FONT_SIZE_REDUCE = 'font-size-reduce';
+
+// rebase
+export var REBASE_ELEMENT = 'rebase-element';

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

@@ -12,4 +12,30 @@ 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/plugins/font/helpers.js

@@ -131,7 +131,7 @@ export var loadFont = function loadFont() {
 };
 export var generatorFontFamily = function generatorFontFamily(fontName, fontWeight, leaf) {
   var isCodeBlock = leaf && Object.keys(leaf).includes('token');
-  if (isCodeBlock) return {};
+  if (isCodeBlock) return '';
   var lang = context.getSetting('lang') || 'zh-cn';
   if (fontName === DEFAULT_FONT) {
     return "'Arial', ".concat(lang === 'zh-cn' ? "\u5B8B\u4F53" : 'Arial', ", 'sans-serif'");

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

@@ -1,10 +1,16 @@
+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 } from '../../constants';
+import { INTERNAL_EVENT, REBASE_TYPE, REBASE_MARKS } from '../../constants';
+import { findPath, getNode, replaceNode, generateEmptyElement, deleteNodeMark } from '../../extension/core';
 var CustomElement = function CustomElement(props) {
   var editor = useSlateStatic();
   var element = props.element,
@@ -140,6 +146,208 @@ 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/socket/helpers.js

@@ -4,6 +4,7 @@ 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;
@@ -252,6 +253,7 @@ 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++) {