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

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

@@ -11,12 +11,12 @@ export var MODIFY_TYPE = {
   ADD: 'add',
   DELETE: 'delete',
   MODIFY: 'modify',
-  CHILDREN_MODIFY: 'children-modify'
+  CHILDREN_MODIFY: 'children_modify'
 };
 export var REBASE_TYPE = {
-  MODIFY_MODIFY: 'modify-modify',
-  DELETE_MODIFY: 'delete-modify',
-  CHILDREN_MODIFY: 'children-modify'
+  MODIFY_MODIFY: 'modify_modify',
+  DELETE_MODIFY: 'delete_modify',
+  CHILDREN_MODIFY: 'children_modify'
 };
 export var REBASE_MARK_KEY = {
   ORIGIN: 'origin',
@@ -24,4 +24,4 @@ export var REBASE_MARK_KEY = {
   MODIFY_TYPE: 'modify_type',
   OLD_ELEMENT: 'old_element'
 };
-export var REBASE_MARKS = ['origin', 'rebase_type', 'old_element'];
+export var REBASE_MARKS = [REBASE_MARK_KEY.ORIGIN, REBASE_MARK_KEY.REBASE_TYPE, REBASE_MARK_KEY.MODIFY_TYPE, REBASE_MARK_KEY.OLD_ELEMENT];

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

@@ -99,6 +99,9 @@ var Editor = forwardRef(function (_ref, ref) {
       },
       replaceDocument: function replaceDocument(value, originFileVersion) {
         editor.replaceDocument(value, originFileVersion);
+      },
+      saveDocument: function saveDocument(callback) {
+        editor.saveDocument(callback);
       }
 
       // eslint-disable-next-line react-hooks/exhaustive-deps

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/render/render-element.js

@@ -224,7 +224,7 @@ var RenderElement = function RenderElement(props) {
   }, [editor]);
   var useMasterChanges = useCallback(function (element) {
     var path = findPath(editor, element);
-    deleteNodeMark(editor, path, element, REBASE_MARKS);
+    deleteNodeMark(editor, path, element[REBASE_MARK_KEY.OLD_ELEMENT], REBASE_MARKS);
     var nextElementPath = _toConsumableArray(path);
     nextElementPath[path.length - 1] = path[path.length - 1] + 1;
     Transforms.removeNodes(editor, {

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

@@ -151,6 +151,13 @@ var SocketClient = /*#__PURE__*/_createClass(function SocketClient(config) {
     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, {

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

@@ -48,6 +48,9 @@ var SocketManager = /*#__PURE__*/_createClass(function SocketManager(editor, _do
   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) {

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

@@ -64,6 +64,11 @@ var withSocketIO = function withSocketIO(editor, options) {
     var socketManager = SocketManager.getInstance(newEditor, document, config);
     socketManager.sendReplaceDocument(document);
   };
+  newEditor.saveDocument = function (callback) {
+    var config = options.config;
+    var socketManager = SocketManager.getInstance(newEditor, document, config);
+    socketManager.sendSaveDocument(callback);
+  };
   return newEditor;
 };
 export default withSocketIO;

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

@@ -110,7 +110,7 @@ var getMasterChanges = function getMasterChanges(masterContent, revisionChanges)
           // Modify at the same time
         } else if (currentElement[REBASE_MARK_KEY.MODIFY_TYPE] === MODIFY_TYPE.MODIFY) {
           var _objectSpread5, _objectSpread6;
-          var oldMasterElement = replaceNodeId(_objectSpread(_objectSpread({}, masterElement), {}, (_objectSpread5 = {}, _defineProperty(_objectSpread5, REBASE_MARK_KEY.REBASE_TYPE, REBASE_TYPE.MODIFY_MODIFY), _defineProperty(_objectSpread5, REBASE_MARK_KEY.ORIGIN, 'master'), _objectSpread5)));
+          var oldMasterElement = replaceNodeId(_objectSpread(_objectSpread({}, masterElement), {}, (_objectSpread5 = {}, _defineProperty(_objectSpread5, REBASE_MARK_KEY.REBASE_TYPE, REBASE_TYPE.MODIFY_MODIFY), _defineProperty(_objectSpread5, REBASE_MARK_KEY.ORIGIN, 'master'), _defineProperty(_objectSpread5, REBASE_MARK_KEY.OLD_ELEMENT, masterElement), _objectSpread5)));
           content.push(oldMasterElement);
           var _newElement = _objectSpread(_objectSpread({}, currentElement), {}, (_objectSpread6 = {}, _defineProperty(_objectSpread6, REBASE_MARK_KEY.REBASE_TYPE, REBASE_TYPE.MODIFY_MODIFY), _defineProperty(_objectSpread6, REBASE_MARK_KEY.ORIGIN, 'current'), _objectSpread6));
           _newElement[REBASE_MARK_KEY.MODIFY_TYPE] && delete _newElement[REBASE_MARK_KEY.MODIFY_TYPE];
@@ -129,7 +129,7 @@ var getMasterChanges = function getMasterChanges(masterContent, revisionChanges)
             }, REBASE_MARK_KEY.REBASE_TYPE, REBASE_TYPE.CHILDREN_MODIFY)));
           } else {
             var _objectSpread8, _objectSpread9;
-            var _oldMasterElement = replaceNodeId(_objectSpread(_objectSpread({}, masterElement), {}, (_objectSpread8 = {}, _defineProperty(_objectSpread8, REBASE_MARK_KEY.REBASE_TYPE, REBASE_TYPE.MODIFY_MODIFY), _defineProperty(_objectSpread8, REBASE_MARK_KEY.ORIGIN, 'master'), _objectSpread8)));
+            var _oldMasterElement = replaceNodeId(_objectSpread(_objectSpread({}, masterElement), {}, (_objectSpread8 = {}, _defineProperty(_objectSpread8, REBASE_MARK_KEY.REBASE_TYPE, REBASE_TYPE.MODIFY_MODIFY), _defineProperty(_objectSpread8, REBASE_MARK_KEY.ORIGIN, 'master'), _defineProperty(_objectSpread8, REBASE_MARK_KEY.OLD_ELEMENT, masterElement), _objectSpread8)));
             content.push(_oldMasterElement);
             var _newElement2 = _objectSpread(_objectSpread({}, currentElement[REBASE_MARK_KEY.OLD_ELEMENT]), {}, (_objectSpread9 = {}, _defineProperty(_objectSpread9, REBASE_MARK_KEY.REBASE_TYPE, REBASE_TYPE.MODIFY_MODIFY), _defineProperty(_objectSpread9, REBASE_MARK_KEY.ORIGIN, 'current'), _objectSpread9));
             content.push(_newElement2);

package/dist/constants/index.js

@@ -11,7 +11,7 @@ export var EXTERNAL_EVENT = {
   DOCUMENT_REPLACED_ERROR: 'document_replaced_error'
 };
 export var MODE = {
-  DIFF_VIEWER: 'diff-viewer',
+  DIFF_VIEWER: 'diff_viewer',
   VIEWER: 'viewer',
   EDITOR: 'editor'
 };

package/dist/pages/simple-editor.js

@@ -227,12 +227,18 @@ var SimpleEditor = function SimpleEditor(_ref) {
                 isNeedReplaceMaster = _getRebase.isNeedReplaceMaster,
                 value = _getRebase.value;
               if (canMerge && isNeedReplaceMaster) {
-                context.publishSdocRevision().then(function (res) {
-                  editorRef.current.publishDocument(originDocUuid, originDocName, true);
-                  setTipType(TIP_TYPE.HAS_BEEN_PUBLISHED);
-                  setShowTip(true);
-                }).catch(function (error) {
-                  toaster.danger(t('Error'));
+                editorRef.current.saveDocument(function (saveFlag) {
+                  if (saveFlag) {
+                    context.publishSdocRevision().then(function (res) {
+                      editorRef.current.publishDocument(originDocUuid, originDocName, true);
+                      setTipType(TIP_TYPE.HAS_BEEN_PUBLISHED);
+                      setShowTip(true);
+                    }).catch(function (error) {
+                      toaster.danger(t('Error'));
+                    });
+                  } else {
+                    toaster.danger(t('Error'));
+                  }
                 });
                 return;
               }

package/package.json

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