@seafile/sdoc-editor 0.1.143-beta2 → 0.1.143-beta3

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

@@ -39,9 +39,13 @@ var SDocRebaseEditor = function SDocRebaseEditor(_ref) {
       return item.rebaseType;
     }).length === 0) {
       context.rebaseSdocRevision().then(function (res) {
+        var origin_file_version = res.data.origin_file_version;
+        context.updateSettings({
+          'originFileVersion': origin_file_version
+        });
         editor.rebaseContent({
           children: slateValue
-        });
+        }, origin_file_version);
       }).then(function (res) {
         rebaseEnd();
       }).catch(function (error) {
@@ -182,14 +186,14 @@ var SDocRebaseEditor = function SDocRebaseEditor(_ref) {
       }, /*#__PURE__*/React.createElement("div", {
         className: "sdoc-rebase-btn",
         onClick: function onClick() {
-          return deleteMark(element);
+          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 deleteElement(element);
+          return deleteMark(element);
         }
       }, t('Keep_my_modification')), /*#__PURE__*/React.createElement("div", {
         className: "mr-2 ml-2"
@@ -219,14 +223,14 @@ var SDocRebaseEditor = function SDocRebaseEditor(_ref) {
         }, /*#__PURE__*/React.createElement("div", {
           className: "sdoc-rebase-btn",
           onClick: function onClick() {
-            return useCurrentChanges(element);
+            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 useMasterChanges(element);
+            return useCurrentChanges(element);
           }
         }, t('Keep_my_modification')), /*#__PURE__*/React.createElement("div", {
           className: "mr-2 ml-2"

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,7 +253,7 @@ export var reExecRevertOperationList = function reExecRevertOperationList(editor
   }
 };
 export var syncRemoteOperations = function syncRemoteOperations(editor, remoteOperations) {
-  if (editor.isReadonly) return;
+  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

@@ -123,16 +123,17 @@ var SocketClient = /*#__PURE__*/_createClass(function SocketClient(config) {
   this.disconnectWithServer = function () {
     _this.socket.disconnect();
   };
-  this.receiveRebaseDocument = function (document) {
+  this.receiveRebaseDocument = function (document, originFileVersion) {
     var socketManager = SocketManager.getInstance();
-    socketManager.receiveRebaseContent(document);
+    socketManager.receiveRebaseContent(document, originFileVersion);
   };
-  this.sendRebaseDocument = function (document, callback) {
+  this.sendRebaseDocument = function (document, originFileVersion, callback) {
     debug('=========== send operations ==========');
     debug('%O', document);
     debug('======================================');
     _this.socket.emit('rebase-document', _this.getParams({
-      document: document
+      document: document,
+      originFileVersion: originFileVersion
     }), function (result) {
       callback && callback(result);
     });

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

@@ -7,7 +7,7 @@ import { syncRemoteOperations, reExecRevertOperationList, revertOperationList, s
 import SocketClient from './socket-client';
 import debug from '../utils/debug';
 import { deleteCursor } from '../cursor/helper';
-import { EXTERNAL_EVENT } from '../../constants';
+import { EXTERNAL_EVENT, MODE } from '../../constants';
 
 //  idle --> sending --> conflict --> idle
 //       --> conflict --> idle
@@ -27,12 +27,15 @@ var SocketManager = /*#__PURE__*/_createClass(function SocketManager(editor, _do
     var version = _this.document.version;
     return version;
   };
-  this.sendRebaseContent = function (document) {
-    _this.socketClient.sendRebaseDocument(document);
+  this.sendRebaseContent = function (document, originFileVersion) {
+    _this.socketClient.sendRebaseDocument(document, originFileVersion, function (result) {
+      var serverVersion = result.version;
+      _this.document['version'] = serverVersion;
+    });
   };
-  this.receiveRebaseContent = function (document) {
+  this.receiveRebaseContent = function (document, originFileVersion) {
     _this.document = document;
-    _this.eventBus.dispatch(EXTERNAL_EVENT.REBASE_DOCUMENT, document);
+    _this.eventBus.dispatch(EXTERNAL_EVENT.REBASE_DOCUMENT, document, originFileVersion);
   };
   this.onReceiveLocalOperations = function (operations) {
     _this.pendingOperationList.push(operations);
@@ -42,7 +45,7 @@ var SocketManager = /*#__PURE__*/_createClass(function SocketManager(editor, _do
     _this.sendOperations();
   };
   this.sendOperations = function () {
-    if (_this.editor.isReadonly) return;
+    if (_this.editor.mode !== MODE.EDITOR) return;
     if (_this.state !== STATE.IDLE) return;
     _this.state = STATE.SENDING;
     _this.sendNextOperations();

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

@@ -49,10 +49,10 @@ var withSocketIO = function withSocketIO(editor, options) {
     }
     onChange();
   };
-  newEditor.rebaseContent = function (document) {
+  newEditor.rebaseContent = function (document, originFileVersion) {
     var config = options.config;
     var socketManager = SocketManager.getInstance(newEditor, document, config);
-    socketManager.sendRebaseContent(document);
+    socketManager.sendRebaseContent(document, originFileVersion);
   };
   return newEditor;
 };

package/dist/context.js

@@ -48,6 +48,13 @@ var Context = /*#__PURE__*/function () {
       if (this.settings[key] === false) return this.settings[key];
       return this.settings[key] || '';
     }
+  }, {
+    key: "updateSettings",
+    value: function updateSettings(update) {
+      for (var key in update) {
+        this.settings[key] = update[key];
+      }
+    }
   }, {
     key: "getViewConfig",
     value: function getViewConfig() {

package/dist/pages/simple-editor.js

@@ -53,8 +53,11 @@ var SimpleEditor = function SimpleEditor(_ref) {
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
-  var rebaseDocument = useCallback(function (document) {
-    toaster.warning(t('Document_has_rebased'));
+  var rebaseDocument = useCallback(function (document, originFileVersion) {
+    toaster.warning(t('Document_rebased_tip'));
+    context.updateSettings({
+      originFileVersion: originFileVersion
+    });
     editorRef.current.setLoading(true);
     setShowChanges(false);
     setMode(MODE.EDITOR);

package/package.json

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

package/public/locales/en/sdoc-editor.json

@@ -369,5 +369,6 @@
   "Need_rebase": "Need rebase",
   "Abort": "Abort",
   "Tip": "Tip",
-  "Rebase_delete_no_change_revision_tip": "No changes have been made in the revision, should the revision be deleted directly ?"
+  "Rebase_delete_no_change_revision_tip": "No changes have been made in the revision, should the revision be deleted directly ?",
+  "Document_rebased_tip": "Document has been rebased"
 }

package/public/locales/zh_CN/sdoc-editor.json

@@ -368,5 +368,6 @@
   "Keep_both_modification": "保留两个更改",
   "Need_rebase": "需要变基",
   "Abort": "中止",
-  "Rebase_delete_no_change_revision_tip": "修订稿未做任何改动，是否直接删除修订稿？"
+  "Rebase_delete_no_change_revision_tip": "修订稿未做任何改动，是否直接删除修订稿？",
+  "Document_rebased_tip": "文档已经变基了"
 }