@seafile/sdoc-editor 0.1.152 → 0.1.154-beta

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++) {

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

@@ -119,6 +119,45 @@ var SocketClient = /*#__PURE__*/_createClass(function SocketClient(config) {
   this.disconnectWithServer = function () {
     _this.socket.disconnect();
   };
+  this.sendPublishDocument = function (originDocUuid, originDocName, isNeedUpdateOriginDoc, callback) {
+    _this.socket.emit('publish-document', _this.getParams({
+      origin_doc_uuid: originDocUuid,
+      origin_doc_name: originDocName,
+      update_origin_doc: isNeedUpdateOriginDoc
+    }), function (success) {
+      callback && callback(success);
+    });
+  };
+  this.receivePublishDocument = function () {
+    var socketManager = SocketManager.getInstance();
+    socketManager.receivePublishDocument();
+  };
+  this.receivePublishDocumentError = function () {
+    var socketManager = SocketManager.getInstance();
+    socketManager.receivePublishDocumentError();
+  };
+  this.sendReplaceDocument = function (document, callback) {
+    _this.socket.emit('replace-document', _this.getParams({
+      document: document
+    }), function (result) {
+      callback && callback(result);
+    });
+  };
+  this.receiveDocumentReplaced = function () {
+    var socketManager = SocketManager.getInstance();
+    socketManager.receiveDocumentReplaced();
+  };
+  this.receiveDocumentReplacedError = function () {
+    var socketManager = SocketManager.getInstance();
+    socketManager.receiveDocumentReplacedError();
+  };
+  this.sendSaveDocument = function (callback) {
+    _this.socket.emit('save-document', _this.getParams({
+      document: document
+    }), function (saveFlag) {
+      callback && callback(saveFlag);
+    });
+  };
   this.config = config;
   this.isReconnect = false;
   this.socket = io(config.sdocServer, {
@@ -133,6 +172,12 @@ var SocketClient = /*#__PURE__*/_createClass(function SocketClient(config) {
   this.socket.on('join-room', this.onJoinRoom);
   this.socket.on('leave-room', this.onLeaveRoom);
   this.socket.on('update-document', this.onReceiveRemoteOperations);
+
+  // doc-replaced
+  this.socket.on('doc-replaced', this.receiveDocumentReplaced);
+  this.socket.on('doc-replaced-error', this.receiveDocumentReplacedError);
+  this.socket.on('publish-document', this.receivePublishDocument);
+  this.socket.on('publish-document-error', this.receivePublishDocumentError);
   this.socket.on('update-cursor', this.receiveCursorLocation);
   this.socket.io.on('reconnect', this.onReconnect);
   this.socket.io.on('reconnect_attempt', this.onReconnectAttempt);

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

@@ -7,6 +7,7 @@ import { syncRemoteOperations, reExecRevertOperationList, revertOperationList, s
 import SocketClient from './socket-client';
 import { clientDebug, conflictDebug, serverDebug, stateDebug } from '../utils/debug';
 import { deleteCursor } from '../cursor/helper';
+import { EXTERNAL_EVENT, MODE } from '../../constants';
 
 //  idle --> sending --> conflict --> idle
 //       --> conflict --> idle
@@ -19,13 +20,37 @@ var STATE = {
   DISCONNECT: 'disconnect',
   NEED_RELOAD: 'need_reload'
 };
-var SocketManager = /*#__PURE__*/_createClass(function SocketManager(editor, document, config) {
+var SocketManager = /*#__PURE__*/_createClass(function SocketManager(editor, _document, config) {
   var _this = this;
   _classCallCheck(this, SocketManager);
   this.getDocumentVersion = function () {
     var version = _this.document.version;
     return version;
   };
+  this.sendPublishDocument = function (originDocUuid, originDocName, isNeedUpdateOriginDoc, callback) {
+    _this.socketClient.sendPublishDocument(originDocUuid, originDocName, isNeedUpdateOriginDoc, callback);
+  };
+  this.receivePublishDocument = function () {
+    _this.eventBus.dispatch(EXTERNAL_EVENT.PUBLISH_DOCUMENT);
+  };
+  this.receivePublishDocumentError = function () {
+    _this.eventBus.dispatch(EXTERNAL_EVENT.PUBLISH_DOCUMENT_ERROR);
+  };
+  this.sendReplaceDocument = function (document) {
+    _this.socketClient.sendReplaceDocument(document, function (result) {
+      var serverVersion = result.version;
+      _this.document['version'] = serverVersion;
+    });
+  };
+  this.receiveDocumentReplaced = function () {
+    _this.eventBus.dispatch(EXTERNAL_EVENT.DOCUMENT_REPLACED);
+  };
+  this.receiveDocumentReplacedError = function () {
+    _this.eventBus.dispatch(EXTERNAL_EVENT.DOCUMENT_REPLACED_ERROR);
+  };
+  this.sendSaveDocument = function (callback) {
+    _this.socketClient.sendSaveDocument(callback);
+  };
   this.onReceiveLocalOperations = function (operations) {
     _this.pendingOperationList.push(operations);
     if (_this.pendingOperationList.length > 5) {
@@ -34,6 +59,7 @@ var SocketManager = /*#__PURE__*/_createClass(function SocketManager(editor, doc
     _this.sendOperations();
   };
   this.sendOperations = function () {
+    if (_this.editor.mode !== MODE.EDITOR) return;
     if (_this.state !== STATE.IDLE) return;
     stateDebug("State changed: ".concat(_this.state, " -> ").concat(STATE.SENDING));
     _this.state = STATE.SENDING;
@@ -292,7 +318,7 @@ var SocketManager = /*#__PURE__*/_createClass(function SocketManager(editor, doc
     _this.socketClient.disconnectWithServer();
   };
   this.editor = editor;
-  this.document = document;
+  this.document = _document;
   this.socketClient = new SocketClient(config);
   this.pendingOperationList = []; // Two-dimensional arrays： [operations, operations, ...]
   this.remoteOperationsList = []; // Same with pending operations

package/dist/basic-sdk/socket/with-socket-io.js

@@ -1,3 +1,4 @@
+import { MODE } from '../../constants';
 import { generateCursorData } from '../cursor/helper';
 import EventBus from '../utils/event-bus';
 import SocketManager from './socket-manager';
@@ -19,28 +20,50 @@ var withSocketIO = function withSocketIO(editor, options) {
     SocketManager.destroy();
   };
   newEditor.onChange = function () {
-    if (newEditor.readonly) return;
+    var document = options.document,
+      config = options.config;
+    if (newEditor.mode === MODE.DIFF_VIEWER) return;
     var operations = newEditor.operations;
     if (!newEditor.isRemote && operations.length > 0) {
       var isAllSetSelection = operations.every(function (operation) {
         return operation.type === 'set_selection';
       });
-      var _socketManager = SocketManager.getInstance();
+      var _socketManager = SocketManager.getInstance(newEditor, document, config);
       if (!isAllSetSelection) {
-        // get update content value operations
-        var updateOperations = operations.filter(function (operation) {
-          return operation.type !== 'set_selection';
-        });
-        _socketManager.onReceiveLocalOperations(updateOperations);
+        if (newEditor.mode === MODE.EDITOR) {
+          // get update content value operations
+          var updateOperations = operations.filter(function (operation) {
+            return operation.type !== 'set_selection';
+          });
+          _socketManager.onReceiveLocalOperations(updateOperations);
+        }
       }
-      _socketManager.sendCursorLocation(editor.selection);
+      if (newEditor.mode === MODE.EDITOR) {
+        _socketManager.sendCursorLocation(editor.selection);
+      }
+    }
+    if (newEditor.mode === MODE.EDITOR) {
+      // dispatch editor change event
+      var eventBus = EventBus.getInstance(newEditor, document, config);
+      eventBus.dispatch('change');
     }
-
-    // dispatch editor change event
-    var eventBus = EventBus.getInstance();
-    eventBus.dispatch('change');
     onChange();
   };
+  newEditor.rebaseContent = function (document, originFileVersion) {
+    var config = options.config;
+    var socketManager = SocketManager.getInstance(newEditor, document, config);
+    socketManager.sendRebaseContent(document, originFileVersion);
+  };
+  newEditor.publishDocument = function (originDocUuid, originDocName, isNeedUpdateOriginDoc, callback) {
+    var config = options.config;
+    var socketManager = SocketManager.getInstance(newEditor, document, config);
+    socketManager.sendPublishDocument(originDocUuid, originDocName, isNeedUpdateOriginDoc, callback);
+  };
+  newEditor.replaceDocument = function (document) {
+    var config = options.config;
+    var socketManager = SocketManager.getInstance(newEditor, document, config);
+    socketManager.sendReplaceDocument(document);
+  };
   return newEditor;
 };
 export default withSocketIO;

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

@@ -31,7 +31,7 @@ var generatorDiffElement = function generatorDiffElement(element, diffType) {
     return generatorDiffElement(item, diffType, style);
   })), _objectSpread3));
 };
-var generateIdMapAndIds = function generateIdMapAndIds(elements) {
+export var generateIdMapAndIds = function generateIdMapAndIds(elements) {
   var map = {};
   var ids = [];
   if (!Array.isArray(elements) || elements.length === 0) return {
@@ -54,7 +54,7 @@ var hasChildren = function hasChildren(element) {
 };
 
 // id diffs
-var getIdDiffs = function getIdDiffs(oldIds, newIds) {
+export var getIdDiffs = function getIdDiffs(oldIds, newIds) {
   var diff = new DiffText(oldIds, newIds);
   return diff.getDiffs();
 };
@@ -288,4 +288,5 @@ export var getDiff = function getDiff() {
     changes: []
   };
   return getElementDiffValue(currentContent, oldContent);
-};
+};
+window.getIdDiffs = getIdDiffs;

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

@@ -0,0 +1,228 @@
+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, REBASE_MARK_KEY, REBASE_ORIGIN } from '../constants';
+import { ELEMENT_TYPE } from '../extension/constants';
+import { replaceNodeId } from '../node-id/helpers';
+export var hasConflict = function hasConflict(content) {
+  if (!Array.isArray(content) || content.length === 0) return false;
+  return content.filter(function (item) {
+    return item.rebase_type;
+  }).length !== 0;
+};
+var getChanges = function getChanges(masterContent, revisionContent) {
+  var _generateIdMapAndIds = generateIdMapAndIds(masterContent.children),
+    masterContentMap = _generateIdMapAndIds.map,
+    masterIds = _generateIdMapAndIds.ids;
+  var _generateIdMapAndIds2 = generateIdMapAndIds(revisionContent.children),
+    currentContentMap = _generateIdMapAndIds2.map,
+    currentIds = _generateIdMapAndIds2.ids;
+  var idDiffs = getIdDiffs(masterIds, currentIds);
+  var content = [];
+  idDiffs.forEach(function (idDiff) {
+    var value = idDiff.value,
+      added = idDiff.added,
+      removed = idDiff.removed;
+    if (added) {
+      var addedList = value.map(function (item) {
+        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]), {}, _defineProperty({}, REBASE_MARK_KEY.MODIFY_TYPE, MODIFY_TYPE.DELETE));
+      });
+      content.push.apply(content, _toConsumableArray(deletedList));
+    } else {
+      value.forEach(function (elementId) {
+        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), {}, (_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 = getChanges(oldElement, currentElement);
+              newElement[REBASE_MARK_KEY.MODIFY_TYPE] = MODIFY_TYPE.CHILDREN_MODIFY;
+              newElement['children'] = listContent;
+            }
+          }
+          content.push(newElement);
+        }
+      });
+    }
+  });
+  return content;
+};
+var getMergeElement = function getMergeElement(diffElement, baseElement) {
+  var modifyType = diffElement[REBASE_MARK_KEY.MODIFY_TYPE];
+
+  // revision 没有该元素，master 有该元素
+  if (modifyType === MODIFY_TYPE.DELETE) {
+    // baseContent没有该元素，说明是 master 新增的，需要保留，不计入冲突
+    if (!baseElement) {
+      var _newElement = _objectSpread({}, diffElement);
+      _newElement[REBASE_MARK_KEY.MODIFY_TYPE] && delete _newElement[REBASE_MARK_KEY.MODIFY_TYPE];
+      return [_newElement];
+    }
+
+    // baseContent有该元素, master 对其进行了修改，说明 revision 将其删除了, 用户手动选择冲突
+    if (!ObjectUtils.isSameObject(baseElement, diffElement, [REBASE_MARK_KEY.MODIFY_TYPE])) {
+      var _newElement2 = _objectSpread({}, diffElement);
+      _newElement2[REBASE_MARK_KEY.MODIFY_TYPE] && delete _newElement2[REBASE_MARK_KEY.MODIFY_TYPE];
+      _newElement2[REBASE_MARK_KEY.REBASE_TYPE] = REBASE_TYPE.MODIFY_DELETE;
+      return [_newElement2];
+    }
+
+    // baseContent有该元素，master 没有对其进行了修改, 说明 revision 将其删除了，程序删除，不计入冲突
+    return [];
+  }
+
+  // revision 有该元素，master 没有该元素
+  if (modifyType === MODIFY_TYPE.ADD) {
+    // baseContent没有该元素，说明是 revision 新增的，需要保留，不计入冲突
+    if (!baseElement) {
+      var _newElement3 = _objectSpread({}, diffElement);
+      _newElement3[REBASE_MARK_KEY.MODIFY_TYPE] && delete _newElement3[REBASE_MARK_KEY.MODIFY_TYPE];
+      return [_newElement3];
+    }
+
+    // master 将其删除了， revision 对其进行了修改, 用户手动选择冲突
+    if (!ObjectUtils.isSameObject(baseElement, diffElement, [REBASE_MARK_KEY.MODIFY_TYPE])) {
+      var _newElement4 = _objectSpread({}, diffElement);
+      _newElement4[REBASE_MARK_KEY.MODIFY_TYPE] && delete _newElement4[REBASE_MARK_KEY.MODIFY_TYPE];
+      _newElement4[REBASE_MARK_KEY.REBASE_TYPE] = REBASE_TYPE.DELETE_MODIFY;
+      return [_newElement4];
+    }
+
+    // master 将其删除了， revision 没有对其进行了修改, 程序删除，不计入冲突
+    return [];
+  }
+
+  // revision 和 master 有差异的元素
+  if (modifyType === MODIFY_TYPE.MODIFY) {
+    var _objectSpread7, _objectSpread8;
+    var revisionElement = _objectSpread({}, diffElement);
+    var masterElement = _objectSpread({}, diffElement[REBASE_MARK_KEY.OLD_ELEMENT]);
+    delete revisionElement[REBASE_MARK_KEY.MODIFY_TYPE];
+    delete revisionElement[REBASE_MARK_KEY.OLD_ELEMENT];
+
+    // revision 和 master 同时新增了一个元素，但且内容不一样。 ===》 目前这种情况不存在，仅存在理论阶段
+    if (!baseElement) {
+      var _objectSpread5, _objectSpread6;
+      return [_objectSpread(_objectSpread({}, replaceNodeId(masterElement)), {}, (_objectSpread5 = {}, _defineProperty(_objectSpread5, REBASE_MARK_KEY.REBASE_TYPE, REBASE_TYPE.MODIFY_MODIFY), _defineProperty(_objectSpread5, REBASE_MARK_KEY.OLD_ELEMENT, masterElement), _defineProperty(_objectSpread5, REBASE_MARK_KEY.ORIGIN, REBASE_ORIGIN.OTHER), _objectSpread5)), _objectSpread(_objectSpread({}, revisionElement), {}, (_objectSpread6 = {}, _defineProperty(_objectSpread6, REBASE_MARK_KEY.REBASE_TYPE, REBASE_TYPE.MODIFY_MODIFY), _defineProperty(_objectSpread6, REBASE_MARK_KEY.ORIGIN, REBASE_ORIGIN.MY), _objectSpread6))];
+    }
+
+    // master 和 base 一样，说明 revision 对内容进行了修改
+    if (ObjectUtils.isSameObject(masterElement, baseElement)) {
+      return [revisionElement];
+    }
+
+    // revision 和 base 一样，说明 master 对内容进行了修改
+    if (ObjectUtils.isSameObject(revisionElement, baseElement)) {
+      return [masterElement];
+    }
+
+    // 都不一样，revision 和 master 同时修改了，有冲突，需要手动解决冲突
+    return [_objectSpread(_objectSpread({}, replaceNodeId(masterElement)), {}, (_objectSpread7 = {}, _defineProperty(_objectSpread7, REBASE_MARK_KEY.REBASE_TYPE, REBASE_TYPE.MODIFY_MODIFY), _defineProperty(_objectSpread7, REBASE_MARK_KEY.OLD_ELEMENT, masterElement), _defineProperty(_objectSpread7, REBASE_MARK_KEY.ORIGIN, REBASE_ORIGIN.OTHER), _objectSpread7)), _objectSpread(_objectSpread({}, revisionElement), {}, (_objectSpread8 = {}, _defineProperty(_objectSpread8, REBASE_MARK_KEY.REBASE_TYPE, REBASE_TYPE.MODIFY_MODIFY), _defineProperty(_objectSpread8, REBASE_MARK_KEY.ORIGIN, REBASE_ORIGIN.MY), _objectSpread8))];
+  }
+  if (modifyType === MODIFY_TYPE.CHILDREN_MODIFY) {
+    var _revisionElement = _objectSpread({}, diffElement);
+    var _masterElement = _objectSpread({}, diffElement[REBASE_MARK_KEY.OLD_ELEMENT]);
+    delete _revisionElement[REBASE_MARK_KEY.MODIFY_TYPE];
+    delete _revisionElement[REBASE_MARK_KEY.OLD_ELEMENT];
+
+    // revision 和 master 同时新增了一个元素，但且内容不一样。 ===》 目前这种情况不存在，仅存在理论阶段
+    if (!baseElement) {
+      var _objectSpread9, _objectSpread10;
+      return [_objectSpread(_objectSpread({}, replaceNodeId(_masterElement)), {}, (_objectSpread9 = {}, _defineProperty(_objectSpread9, REBASE_MARK_KEY.REBASE_TYPE, REBASE_TYPE.MODIFY_MODIFY), _defineProperty(_objectSpread9, REBASE_MARK_KEY.OLD_ELEMENT, _masterElement), _defineProperty(_objectSpread9, REBASE_MARK_KEY.ORIGIN, REBASE_ORIGIN.OTHER), _objectSpread9)), _objectSpread(_objectSpread({}, _revisionElement), {}, (_objectSpread10 = {}, _defineProperty(_objectSpread10, REBASE_MARK_KEY.REBASE_TYPE, REBASE_TYPE.MODIFY_MODIFY), _defineProperty(_objectSpread10, REBASE_MARK_KEY.ORIGIN, REBASE_ORIGIN.MY), _objectSpread10))];
+    }
+
+    // master 和 base 一样，说明 revision 对内容进行了修改
+    if (ObjectUtils.isSameObject(_masterElement, baseElement)) {
+      return [_revisionElement];
+    }
+
+    // revision 和 base 一样，说明 master 对内容进行了修改
+    if (ObjectUtils.isSameObject(_revisionElement, baseElement)) {
+      return [_masterElement];
+    }
+    if (ObjectUtils.isSameObject(_masterElement, _revisionElement, ['type'])) {
+      // master 和 base 一样，说明 revision 对内容进行了修改
+      if (ObjectUtils.isSameObject(_masterElement, baseElement, ['type'])) {
+        return [_revisionElement];
+      }
+
+      // revision 和 base 一样，说明 master 对内容进行了修改
+      if (ObjectUtils.isSameObject(_revisionElement, baseElement, ['type'])) {
+        return [_masterElement];
+      }
+    }
+
+    // 子节点内容更改了，需要 手动解决
+    var _getMergeContent = getMergeContent(baseElement, diffElement.children),
+      childrenContent = _getMergeContent.content;
+    return [_objectSpread(_objectSpread({}, _revisionElement), {}, _defineProperty({
+      children: childrenContent
+    }, REBASE_MARK_KEY.REBASE_TYPE, REBASE_TYPE.CHILDREN_MODIFY))];
+  }
+  var newElement = _objectSpread({}, diffElement);
+  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];
+  return [newElement];
+};
+var getMergeContent = function getMergeContent(baseContent, diffChanges) {
+  var _generateIdMapAndIds3 = generateIdMapAndIds(diffChanges),
+    diffChangesContentMap = _generateIdMapAndIds3.map,
+    diffChangesContentIds = _generateIdMapAndIds3.ids;
+  var _generateIdMapAndIds4 = generateIdMapAndIds(baseContent.children),
+    baseContentMap = _generateIdMapAndIds4.map;
+  var content = [];
+  diffChangesContentIds.forEach(function (elementId) {
+    var diffElement = diffChangesContentMap[elementId];
+    var baseElement = baseContentMap[elementId];
+    var mergeElements = getMergeElement(diffElement, baseElement);
+    content.push.apply(content, _toConsumableArray(mergeElements));
+  });
+  var canMerge = !hasConflict(content);
+  return {
+    content: content,
+    canMerge: canMerge
+  };
+};
+export var getRebase = function getRebase(masterContent, baseContent, revisionContent) {
+  // master no changes, merged directly
+  if (masterContent.version === baseContent.version) {
+    return {
+      canMerge: true,
+      isNeedReplaceMaster: true,
+      value: revisionContent
+    };
+  }
+
+  // The revision content has not changed
+  if (baseContent.version === revisionContent.version) {
+    return {
+      canMerge: true,
+      isNeedReplaceMaster: false,
+      value: masterContent
+    };
+  }
+  var diffChanges = getChanges(masterContent, revisionContent);
+  var _getMergeContent2 = getMergeContent(baseContent, diffChanges),
+    canMerge = _getMergeContent2.canMerge,
+    content = _getMergeContent2.content;
+  return {
+    canMerge: canMerge,
+    isNeedReplaceMaster: true,
+    value: _objectSpread(_objectSpread({}, revisionContent), {}, {
+      children: content,
+      version: Math.max(masterContent.version, revisionContent.version) + 1
+    })
+  };
+};

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

@@ -6,7 +6,8 @@ import { ELEMENT_TYPE, ADDED_STYLE, DELETED_STYLE } from '../extension/constants
 import SDocViewer from './viewer';
 import '../../assets/css/diff-viewer.css';
 var DiffViewer = function DiffViewer(_ref) {
-  var currentContent = _ref.currentContent,
+  var editor = _ref.editor,
+    currentContent = _ref.currentContent,
     lastContent = _ref.lastContent,
     didMountCallback = _ref.didMountCallback,
     showToolbar = _ref.showToolbar,
@@ -38,6 +39,7 @@ var DiffViewer = function DiffViewer(_ref) {
     return renderElement(props, editor);
   }, []);
   return /*#__PURE__*/React.createElement(SDocViewer, {
+    editor: editor,
     showToolbar: showToolbar,
     showOutline: showOutline,
     document: {

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

@@ -1,4 +1,4 @@
-import React, { Fragment, useMemo } from 'react';
+import React, { Fragment } from 'react';
 import { Editable, Slate } from '@seafile/slate-react';
 import { renderLeaf as _renderLeaf, renderElement as _renderElement, createDefaultEditor } from '../extension';
 import withNodeId from '../node-id';
@@ -8,18 +8,15 @@ import { usePipDecorate } from '../decorates';
 import { ArticleContainer, EditorContainer, EditorContent } from '../layout';
 import '../assets/css/simple-viewer.css';
 var SDocViewer = function SDocViewer(_ref) {
-  var document = _ref.document,
+  var editor = _ref.editor,
+    document = _ref.document,
     customRenderLeaf = _ref.renderLeaf,
     customRenderElement = _ref.renderElement,
     showToolbar = _ref.showToolbar,
     showOutline = _ref.showOutline;
-  var editor = useMemo(function () {
-    var defaultEditor = createDefaultEditor();
-    return withNodeId(defaultEditor);
-  }, []);
-  editor.readonly = true;
+  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,
@@ -29,19 +26,19 @@ var SDocViewer = function SDocViewer(_ref) {
     readonly: true,
     showOutline: showOutline
   }, /*#__PURE__*/React.createElement(Slate, {
-    editor: editor,
+    editor: validEditor,
     value: slateValue
   }, /*#__PURE__*/React.createElement(ArticleContainer, {
-    editor: editor,
+    editor: validEditor,
     readOnly: true
   }, /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(SetNodeToDecorations, null), /*#__PURE__*/React.createElement(Editable, {
     readOnly: true,
     placeholder: "",
     renderElement: function renderElement(props) {
-      return (customRenderElement || _renderElement)(props, editor);
+      return (customRenderElement || _renderElement)(props, validEditor);
     },
     renderLeaf: function renderLeaf(props) {
-      return (customRenderLeaf || _renderLeaf)(props, editor);
+      return (customRenderLeaf || _renderLeaf)(props, validEditor);
     },
     onDOMBeforeInput: function onDOMBeforeInput(event) {},
     decorate: decorate

package/dist/components/doc-operations/index.js

@@ -11,14 +11,16 @@ import './style.css';
 var DocOperations = function DocOperations(_ref) {
   var isShowChanges = _ref.isShowChanges,
     changes = _ref.changes,
-    toggleViewChanges = _ref.toggleViewChanges;
+    toggleViewChanges = _ref.toggleViewChanges,
+    publishRevision = _ref.publishRevision;
   var isSdocRevision = context.getSetting('isSdocRevision');
   return /*#__PURE__*/React.createElement("div", {
     className: "doc-ops"
   }, /*#__PURE__*/React.createElement(RevisionOperations, {
     isShowChanges: isShowChanges,
     changes: changes,
-    toggleViewChanges: toggleViewChanges
+    toggleViewChanges: toggleViewChanges,
+    publishRevision: publishRevision
   }), /*#__PURE__*/React.createElement(CommentsOperation, null), !isSdocRevision && /*#__PURE__*/React.createElement(ShareOperation, null), /*#__PURE__*/React.createElement(HistoryOperation, null), /*#__PURE__*/React.createElement(CollaboratorsOperation, null), !isSdocRevision && /*#__PURE__*/React.createElement(MoreOperations, null));
 };
 export default withTranslation('sdoc-editor')(DocOperations);

package/dist/components/doc-operations/revision-operations/index.js

@@ -8,7 +8,8 @@ import ChangesCount from './changes-count';
 var RevisionOperations = function RevisionOperations(_ref) {
   var isShowChanges = _ref.isShowChanges,
     changes = _ref.changes,
-    toggleViewChanges = _ref.toggleViewChanges;
+    toggleViewChanges = _ref.toggleViewChanges,
+    publishRevision = _ref.publishRevision;
   var isSdocRevision = context.getSetting('isSdocRevision');
   var isPublished = context.getSetting('isPublished');
   return /*#__PURE__*/React.createElement(React.Fragment, null, !isSdocRevision && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(MoreRevisionOperations, null), /*#__PURE__*/React.createElement(Revisions, null)), isSdocRevision && isShowChanges && /*#__PURE__*/React.createElement(ChangesCount, {
@@ -16,6 +17,8 @@ var RevisionOperations = function RevisionOperations(_ref) {
   }), isSdocRevision && /*#__PURE__*/React.createElement(ViewChanges, {
     isShowChanges: isShowChanges,
     toggleViewChanges: toggleViewChanges
-  }), isSdocRevision && !isPublished && /*#__PURE__*/React.createElement(PublishRevision, null));
+  }), isSdocRevision && !isPublished && /*#__PURE__*/React.createElement(PublishRevision, {
+    publishRevision: publishRevision
+  }));
 };
 export default RevisionOperations;

package/dist/components/doc-operations/revision-operations/publish-button.js

@@ -1,21 +1,14 @@
 import React, { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 import { Button } from 'reactstrap';
-import { withTranslation } from 'react-i18next';
-import context from '../../../context';
-import toaster from '../../../components/toast';
 var PublishRevision = function PublishRevision(_ref) {
-  var t = _ref.t;
-  var repoID = context.getSetting('repoID');
-  var siteRoot = context.getSetting('siteRoot');
+  var publishRevision = _ref.publishRevision;
+  var _useTranslation = useTranslation(),
+    t = _useTranslation.t;
   var publish = useCallback(function (event) {
     event.stopPropagation();
     event.nativeEvent.stopImmediatePropagation();
-    context.publishSdocRevision().then(function (res) {
-      var origin_file_path = res.data.origin_file_path;
-      window.location.href = "".concat(siteRoot, "lib/").concat(repoID, "/file/").concat(origin_file_path);
-    }).catch(function (error) {
-      toaster.danger(t('Error'));
-    });
+    publishRevision();
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
@@ -25,4 +18,4 @@ var PublishRevision = function PublishRevision(_ref) {
     className: "ml-4"
   }, t('Publish'));
 };
-export default withTranslation('sdoc-editor')(PublishRevision);
+export default PublishRevision;

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

@@ -0,0 +1,48 @@
+import React, { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
+import { Modal, ModalHeader, ModalBody, ModalFooter, Button } from 'reactstrap';
+import classnames from 'classnames';
+import { TIP_TYPE, TIP_TITLE } from '../../constants';
+import TipContent from './tip-content';
+var TipDialog = function TipDialog(_ref) {
+  var className = _ref.className,
+    tipType = _ref.tipType,
+    toggle = _ref.toggle,
+    submit = _ref.submit;
+  var _useTranslation = useTranslation(),
+    t = _useTranslation.t;
+  var closeDialog = useCallback(function () {
+    toggle && toggle(false);
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [tipType]);
+  var confirmTip = useCallback(function () {
+    submit && submit();
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+  return /*#__PURE__*/React.createElement(Modal, {
+    isOpen: true,
+    autoFocus: false,
+    zIndex: 1071,
+    returnFocusAfterClose: false,
+    toggle: closeDialog,
+    className: classnames('sdoc-tip-dialog', className),
+    contentClassName: "sdoc-tip-modal"
+  }, /*#__PURE__*/React.createElement(ModalHeader, {
+    toggle: [TIP_TYPE.HAS_BEEN_REPLACED, TIP_TYPE.HAS_BEEN_PUBLISHED].includes(tipType) ? undefined : closeDialog
+  }, t(TIP_TITLE[tipType])), /*#__PURE__*/React.createElement(ModalBody, {
+    className: "sdoc-tip-body"
+  }, /*#__PURE__*/React.createElement(TipContent, {
+    tipType: tipType
+  })), ![TIP_TYPE.HAS_BEEN_REPLACED, TIP_TYPE.HAS_BEEN_PUBLISHED].includes(tipType) && /*#__PURE__*/React.createElement(ModalFooter, null, /*#__PURE__*/React.createElement(Button, {
+    color: "secondary",
+    className: "mr-2",
+    onClick: closeDialog
+  }, t('Cancel')), /*#__PURE__*/React.createElement(Button, {
+    color: "primary",
+    className: "highlight-bg-color",
+    onClick: confirmTip
+  }, t('Confirm'))));
+};
+export default TipDialog;