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

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

@@ -16,7 +16,7 @@ var Editor = forwardRef(function (_ref, ref) {
   var mode = _ref.mode,
     document = _ref.document,
     setDiffChanges = _ref.setDiffChanges,
-    toggleViewChanges = _ref.toggleViewChanges;
+    rebaseEnd = _ref.rebaseEnd;
   context.initApi();
   var editor = useMemo(function () {
     var defaultEditor = createDefaultEditor();
@@ -127,7 +127,7 @@ var Editor = forwardRef(function (_ref, ref) {
       editor: editor,
       version: document.version,
       updateSlateValue: updateSlateValue,
-      toggleViewChanges: toggleViewChanges
+      rebaseEnd: rebaseEnd
     });
   }
   return null;

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

@@ -19,7 +19,7 @@ var SDocRebaseEditor = function SDocRebaseEditor(_ref) {
     editor = _ref.editor,
     version = _ref.version,
     updateSlateValue = _ref.updateSlateValue,
-    toggleViewChanges = _ref.toggleViewChanges;
+    rebaseEnd = _ref.rebaseEnd;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
 
@@ -42,11 +42,8 @@ var SDocRebaseEditor = function SDocRebaseEditor(_ref) {
         editor.rebaseContent({
           children: slateValue
         });
-
-        // return context.saveDocContentByRebase();
       }).then(function (res) {
-        // toaster.success(t('Successfully_rebase_'));
-        // toggleViewChanges(false, true);
+        rebaseEnd();
       }).catch(function (error) {
         toaster.danger(t('Error'));
       });
@@ -185,16 +182,16 @@ var SDocRebaseEditor = function SDocRebaseEditor(_ref) {
       }, /*#__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", {
+      }, 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);
+          return deleteElement(element);
         }
-      }, t('Keep_other_modification')), /*#__PURE__*/React.createElement("div", {
+      }, t('Keep_my_modification')), /*#__PURE__*/React.createElement("div", {
         className: "mr-2 ml-2"
       }, '|'), /*#__PURE__*/React.createElement("div", {
         className: "sdoc-rebase-btn",
@@ -222,16 +219,16 @@ var SDocRebaseEditor = function SDocRebaseEditor(_ref) {
         }, /*#__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", {
+        }, 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);
+            return useMasterChanges(element);
           }
-        }, t('Keep_other_modification')), /*#__PURE__*/React.createElement("div", {
+        }, t('Keep_my_modification')), /*#__PURE__*/React.createElement("div", {
           className: "mr-2 ml-2"
         }, '|'), /*#__PURE__*/React.createElement("div", {
           className: "sdoc-rebase-btn",

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

@@ -50,7 +50,6 @@ var withSocketIO = function withSocketIO(editor, options) {
     onChange();
   };
   newEditor.rebaseContent = function (document) {
-    console.log('send rebase document: ', document);
     var config = options.config;
     var socketManager = SocketManager.getInstance(newEditor, document, config);
     socketManager.sendRebaseContent(document);

package/dist/pages/simple-editor.js

@@ -59,9 +59,6 @@ var SimpleEditor = function SimpleEditor(_ref) {
     setShowChanges(false);
     setMode(MODE.EDITOR);
     editorRef.current.setEditorMode(MODE.EDITOR);
-
-    // 
-    console.log('document: ', document);
     setDocument(document);
     editorRef.current.setSlateValue(document);
     editorRef.current.setLoading(false);
@@ -250,6 +247,15 @@ var SimpleEditor = function SimpleEditor(_ref) {
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [document, isShowChanges, mode]);
+  var rebaseEnd = useCallback(function () {
+    editorRef.current.setLoading(true);
+    setShowChanges(false);
+    setMode(MODE.EDITOR);
+    editorRef.current.setEditorMode(MODE.EDITOR);
+    setFileContent();
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
   var abortRebase = useCallback(function () {
     toggleViewChanges(isShowChanges, true);
 
@@ -307,7 +313,8 @@ var SimpleEditor = function SimpleEditor(_ref) {
     document: document,
     mode: mode,
     setDiffChanges: setDiffChanges,
-    toggleViewChanges: toggleViewChanges
+    toggleViewChanges: toggleViewChanges,
+    rebaseEnd: rebaseEnd
   }))), showTip && /*#__PURE__*/React.createElement(TipDialog, {
     toggle: closeTipDialog,
     submit: deleteRevision,

package/package.json

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