@seafile/sdoc-editor 0.1.152 → 0.1.154-beta

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

@@ -0,0 +1,47 @@
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import React, { useEffect, useState } from 'react';
+import PropTypes from 'prop-types';
+import { useTranslation } from 'react-i18next';
+import { TIP_TYPE, TIP_CONTENT } from '../../constants';
+import context from '../../context';
+var TipContent = function TipContent(_ref) {
+  var tipType = _ref.tipType;
+  var _useState = useState(3),
+    _useState2 = _slicedToArray(_useState, 2),
+    time = _useState2[0],
+    setTime = _useState2[1];
+  useEffect(function () {
+    if (tipType === TIP_TYPE.HAS_BEEN_PUBLISHED) {
+      var _time = 3;
+      var timer = setInterval(function () {
+        _time--;
+        setTime(_time);
+        if (_time === 0) {
+          clearInterval(timer);
+          timer = null;
+        }
+      }, 1000);
+      return function () {
+        timer && clearInterval(timer);
+      };
+    }
+  }, [tipType]);
+  useEffect(function () {
+    if (time === 0) {
+      var originFileURL = context.getSetting('originFileURL');
+      window.location.href = originFileURL;
+    }
+  }, [time]);
+  var _useTranslation = useTranslation(),
+    t = _useTranslation.t;
+  if (tipType === TIP_TYPE.HAS_BEEN_PUBLISHED) {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, t(TIP_CONTENT[tipType], {
+      time: time
+    }));
+  }
+  return /*#__PURE__*/React.createElement(React.Fragment, null, t(TIP_CONTENT[tipType]));
+};
+TipContent.propTypes = {
+  tipType: PropTypes.string
+};
+export default TipContent;

package/dist/constants/index.js

@@ -1,6 +1,27 @@
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+var _TIP_TITLE, _TIP_CONTENT;
 export var EXTERNAL_EVENT = {
   INTERNAL_LINK_CLICK: 'internal_link_click',
   TOGGLE_STAR: 'toggle_star',
   UNMARK_AS_DRAFT: 'unmark_as_draft',
-  SHARE_SDOC: 'share_sdoc'
-};
+  SHARE_SDOC: 'share_sdoc',
+  PUBLISH_DOCUMENT: 'publish_document',
+  PUBLISH_DOCUMENT_ERROR: 'publish_document_error',
+  DOCUMENT_REPLACED: 'document_replaced',
+  DOCUMENT_REPLACED_ERROR: 'document_replaced_error'
+};
+export var MODE = {
+  DIFF_VIEWER: 'diff_viewer',
+  VIEWER: 'viewer',
+  EDITOR: 'editor'
+};
+export var TIP_TYPE = {
+  DELETE_NO_CHANGES_REVISION: 'delete_no_changes_revision',
+  MERGE: 'merge',
+  HAS_CONFLICT_BEFORE_PUBLISH: 'has_conflict_before_publish',
+  HAS_BEEN_PUBLISHED: 'has_been_published',
+  HAS_BEEN_REPLACED: 'has_been_merge',
+  HAS_CONFLICT_BEFORE_VIEW_CHANGES: 'has_conflict_before_view_changes'
+};
+export var TIP_TITLE = (_TIP_TITLE = {}, _defineProperty(_TIP_TITLE, TIP_TYPE.DELETE_NO_CHANGES_REVISION, 'Tip'), _defineProperty(_TIP_TITLE, TIP_TYPE.MERGE, 'Tip'), _defineProperty(_TIP_TITLE, TIP_TYPE.HAS_CONFLICT_BEFORE_PUBLISH, 'Tip'), _defineProperty(_TIP_TITLE, TIP_TYPE.HAS_BEEN_PUBLISHED, 'Tip'), _defineProperty(_TIP_TITLE, TIP_TYPE.HAS_BEEN_REPLACED, 'Tip'), _defineProperty(_TIP_TITLE, TIP_TYPE.HAS_CONFLICT_BEFORE_VIEW_CHANGES, 'Tip'), _TIP_TITLE);
+export var TIP_CONTENT = (_TIP_CONTENT = {}, _defineProperty(_TIP_CONTENT, TIP_TYPE.DELETE_NO_CHANGES_REVISION, 'Rebase_delete_no_change_revision_tip'), _defineProperty(_TIP_CONTENT, TIP_TYPE.MERGE, 'Merge_tip'), _defineProperty(_TIP_CONTENT, TIP_TYPE.HAS_CONFLICT_BEFORE_PUBLISH, 'Has_conflict_before_publish_tip'), _defineProperty(_TIP_CONTENT, TIP_TYPE.HAS_BEEN_PUBLISHED, 'Has_been_published_tip'), _defineProperty(_TIP_CONTENT, TIP_TYPE.HAS_BEEN_REPLACED, 'Has_been_replaced_tip'), _defineProperty(_TIP_CONTENT, TIP_TYPE.HAS_CONFLICT_BEFORE_VIEW_CHANGES, 'Has_conflict_before_view_changes_tip'), _TIP_CONTENT);

package/dist/context.js

@@ -9,7 +9,17 @@ var Context = /*#__PURE__*/function () {
     _classCallCheck(this, Context);
     this.initSettings = function () {
       _this.settings = window.seafile ? window.seafile : window.seafileConfig;
+      if (_this.settings['isSdocRevision']) {
+        var repoID = _this.getSetting('repoID');
+        var siteRoot = _this.getSetting('siteRoot');
+        var originFilePath = _this.getSetting('originFilePath');
+        var originFileURL = "".concat(siteRoot, "lib/").concat(repoID, "/file").concat(originFilePath);
+        _this.settings['originFileURL'] = originFileURL;
+      }
     };
+    // saveDocContentByRebase(content) {
+    //   return this.sdocServerApi.saveDocContentByRebase(content);
+    // }
     this.uploadLocalImage = function (imageFile) {
       var docUuid = _this.getSetting('docUuid');
       return _this.api.uploadSdocImage(docUuid, imageFile).then(function (res) {
@@ -45,6 +55,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() {
@@ -154,16 +171,10 @@ var Context = /*#__PURE__*/function () {
       return this.api.startRevise(repoID, fileUuid, filePath);
     }
   }, {
-    key: "publishSdocRevision",
-    value: function publishSdocRevision() {
-      var docUuid = this.getSetting('docUuid');
-      return this.api.sdocPublishRevision(docUuid);
-    }
-  }, {
-    key: "getSeadocRevisionDownloadLinks",
-    value: function getSeadocRevisionDownloadLinks() {
+    key: "getSeadocOriginFileDownloadLink",
+    value: function getSeadocOriginFileDownloadLink() {
       var docUuid = this.getSetting('docUuid');
-      return this.api.getSeadocRevisionDownloadLinks(docUuid);
+      return this.api.getSeadocOriginFileDownloadLink(docUuid);
     }
   }, {
     key: "getSdocRevisionsCount",
@@ -177,6 +188,20 @@ var Context = /*#__PURE__*/function () {
       var docUuid = this.getSetting('docUuid');
       return this.api.getSdocRevisions(docUuid, page, perPage);
     }
+  }, {
+    key: "updateSdocRevision",
+    value: function updateSdocRevision() {
+      var docUuid = this.getSetting('docUuid');
+      return this.api.updateSdocRevision(docUuid);
+    }
+  }, {
+    key: "getFileHistoryVersion",
+    value: function getFileHistoryVersion(fileVersion, filePath) {
+      var docUuid = this.getSetting('docUuid');
+      return this.api.getFileHistoryVersion(docUuid, fileVersion, filePath);
+    }
+
+    // local files
   }, {
     key: "getSdocLocalFiles",
     value: function getSdocLocalFiles(p, type) {

package/dist/pages/simple-editor.js

@@ -1,9 +1,8 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == typeof h && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(typeof e + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { withTranslation } from 'react-i18next';
-import deepCopy from 'deep-copy';
-import { SDocEditor, DiffViewer } from '../basic-sdk';
 import Loading from '../components/loading';
 import DocInfo from '../components/doc-info';
 import DocOperations from '../components/doc-operations';
@@ -11,49 +10,118 @@ import Layout, { Header, Content } from '../layout';
 import { generateDefaultDocContent } from '../utils';
 import context from '../context';
 import ErrorBoundary from './error-boundary';
+import TipDialog from '../components/tip-dialog';
+import { EXTERNAL_EVENT, MODE, TIP_TYPE } from '../constants';
+import { getRebase, hasConflict } from '../basic-sdk/utils/rebase';
+import toaster from '../components/toast';
+import { EventBus, SDocEditor } from '../basic-sdk';
 import '../assets/css/simple-editor.css';
 var SimpleEditor = function SimpleEditor(_ref) {
   var isStarred = _ref.isStarred,
     isDraft = _ref.isDraft,
     t = _ref.t;
+  context.initApi();
   var editorRef = useRef(null);
   var _useState = useState(true),
     _useState2 = _slicedToArray(_useState, 2),
-    isFirstLoad = _useState2[0],
-    setFirstLoad = _useState2[1];
-  var _useState3 = useState(true),
+    isLoadingSdoc = _useState2[0],
+    setLoadingSdoc = _useState2[1];
+  var _useState3 = useState(''),
     _useState4 = _slicedToArray(_useState3, 2),
-    isLoadingSdoc = _useState4[0],
-    setLoadingSdoc = _useState4[1];
-  var _useState5 = useState(''),
+    errorMessage = _useState4[0],
+    setErrorMessage = _useState4[1];
+  var _useState5 = useState(false),
     _useState6 = _slicedToArray(_useState5, 2),
-    errorMessage = _useState6[0],
-    setErrorMessage = _useState6[1];
-  var _useState7 = useState(false),
+    isShowChanges = _useState6[0],
+    setShowChanges = _useState6[1];
+  var _useState7 = useState(null),
     _useState8 = _slicedToArray(_useState7, 2),
-    isShowChanges = _useState8[0],
-    setShowChanges = _useState8[1];
-  var _useState9 = useState(null),
+    document = _useState8[0],
+    setDocument = _useState8[1];
+  var _useState9 = useState(MODE.EDITOR),
     _useState10 = _slicedToArray(_useState9, 2),
-    document = _useState10[0],
-    setDocument = _useState10[1];
-  var _useState11 = useState(null),
+    mode = _useState10[0],
+    setMode = _useState10[1];
+  var _useState11 = useState([]),
     _useState12 = _slicedToArray(_useState11, 2),
-    currentContent = _useState12[0],
-    setCurrentContent = _useState12[1];
-  var _useState13 = useState(null),
+    changes = _useState12[0],
+    setChanges = _useState12[1];
+  var _useState13 = useState(false),
     _useState14 = _slicedToArray(_useState13, 2),
-    lastContent = _useState14[0],
-    setLastContent = _useState14[1];
+    showTip = _useState14[0],
+    setShowTip = _useState14[1];
+  var _useState15 = useState(''),
+    _useState16 = _slicedToArray(_useState15, 2),
+    tipType = _useState16[0],
+    setTipType = _useState16[1];
+  var _useState17 = useState([]),
+    _useState18 = _slicedToArray(_useState17, 2),
+    mergeValue = _useState18[0],
+    setMergeValue = _useState18[1];
+  useEffect(function () {
+    loadDocument(function (document) {
+      setDocument(document);
+      setLoadingSdoc(false);
+    }, function (errorMessage) {
+      setErrorMessage(errorMessage);
+      setDocument(null);
+      setLoadingSdoc(false);
+    }, function () {
+      setLoadingSdoc(true);
+    });
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  // useMount: reset title
+  useEffect(function () {
+    var isSdocRevision = context.getSetting('isSdocRevision');
+    var originFilename = context.getSetting('originFilename');
+    if (isSdocRevision) {
+      window.document.getElementsByTagName('title')[0].innerText = "".concat(t('Revision'), " - ").concat(originFilename);
+    }
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+  var onDocumentReplaced = useCallback(function () {
+    setTipType(TIP_TYPE.HAS_BEEN_REPLACED);
+    setShowTip(true);
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [editorRef]);
+  var hasPublishRevision = useCallback(function () {
+    setTipType(TIP_TYPE.HAS_BEEN_PUBLISHED);
+    setShowTip(true);
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [editorRef]);
+  var onDocumentReplacedError = useCallback(function () {
+    toaster.danger(t('Error'));
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+  var publishDocumentError = useCallback(function () {
+    toaster.danger(t('Error'));
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
   useEffect(function () {
-    context.initApi();
-    initDocumentData(true);
+    var eventBus = EventBus.getInstance();
+    var unsubscribeMergeDocument = eventBus.subscribe(EXTERNAL_EVENT.DOCUMENT_REPLACED, onDocumentReplaced);
+    var unsubscribePublishDocument = eventBus.subscribe(EXTERNAL_EVENT.PUBLISH_DOCUMENT, hasPublishRevision);
+    var unsubscribeMergeDocumentError = eventBus.subscribe(EXTERNAL_EVENT.DOCUMENT_REPLACED_ERROR, onDocumentReplacedError);
+    var unsubscribePublishDocumentError = eventBus.subscribe(EXTERNAL_EVENT.PUBLISH_DOCUMENT_ERROR, publishDocumentError);
+    return function () {
+      unsubscribeMergeDocument();
+      unsubscribePublishDocument();
+      unsubscribeMergeDocumentError();
+      unsubscribePublishDocumentError();
+    };
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
-  var initDocumentData = useCallback(function (isFirstLoad) {
-    setShowChanges(false);
-    setLoadingSdoc(true);
+  var loadDocument = useCallback(function (successCallback, errorCallback, callback) {
+    callback && callback();
     context.getFileContent().then(function (res) {
       var result = res.data || generateDefaultDocContent();
       if (result && !result.children) {
@@ -63,74 +131,180 @@ var SimpleEditor = function SimpleEditor(_ref) {
           cursors: result.cursors || {}
         };
       }
-      setDocument(result);
-      setLoadingSdoc(false);
-      isFirstLoad && setFirstLoad(false);
+      successCallback && successCallback(result);
     }).catch(function (error) {
       // eslint-disable-next-line
       console.log(error);
-      setErrorMessage('Load_doc_content_error');
+      var errorMessage = 'Load_doc_content_error';
       if (error && error.response) {
         var _ref2 = error.response.data || {},
           error_type = _ref2.error_type;
         if (error_type === 'content_invalid') {
-          setErrorMessage('Sdoc_format_invalid');
+          errorMessage = 'Sdoc_format_invalid';
         }
       }
-      setDocument(null);
-      setLoadingSdoc(false);
+      errorCallback && errorCallback(errorMessage);
     });
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
-  var initChangesData = useCallback(function () {
-    setShowChanges(true);
-    setLoadingSdoc(true);
-    context.getSeadocRevisionDownloadLinks().then(function (res) {
+  var setDiffContent = useCallback(function () {
+    context.getSeadocOriginFileDownloadLink().then(function (res) {
       var originFileDownloadLink = res.data.origin_file_download_link;
       return fetch(originFileDownloadLink);
     }).then(function (res) {
       return res.json();
     }).then(function (originContent) {
-      setLastContent(originContent);
-      setErrorMessage(null);
-      setLoadingSdoc(false);
+      editorRef.current.setDiffContent(originContent);
+      editorRef.current.setLoading(false);
     }).catch(function (error) {
-      setErrorMessage('Load_doc_content_error');
-      setLoadingSdoc(false);
+      console.log('error');
     });
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [document]);
+  }, []);
   var toggleViewChanges = useCallback(function (isShowChanges) {
-    if (isShowChanges) {
-      var newestValue = editorRef.current.getValue();
-      setCurrentContent(deepCopy(_objectSpread(_objectSpread({}, document), {}, {
-        children: newestValue
-      })));
+    var revisionContent = editorRef.current.getSlateValue();
+    if (isShowChanges && hasConflict(revisionContent.children)) {
+      setTipType(TIP_TYPE.HAS_CONFLICT_BEFORE_VIEW_CHANGES);
+      setShowTip(true);
+      return;
     }
-    if (isShowChanges) {
-      initChangesData();
+    editorRef.current.setLoading(true);
+    setShowChanges(isShowChanges);
+    var mode = isShowChanges ? MODE.DIFF_VIEWER : MODE.EDITOR;
+    setMode(mode);
+    editorRef.current.setEditorMode(mode);
+    if (!isShowChanges) {
+      loadDocument(function (document) {
+        setDocument(document);
+        editorRef.current.setSlateValue(document);
+        editorRef.current.setLoading(false);
+      }, function (errorMessage) {
+        setErrorMessage(errorMessage);
+        editorRef.current.setLoading(false);
+      });
       return;
     }
-    setChanges([]);
-    initDocumentData(false);
+    setDiffContent();
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [document]);
-  var _useState15 = useState([]),
-    _useState16 = _slicedToArray(_useState15, 2),
-    changes = _useState16[0],
-    setChanges = _useState16[1];
+  }, [document, editorRef.current]);
+  var publishRevision = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          loadDocument(function (document) {
+            var revisionContent = document;
+            if (hasConflict(revisionContent.children)) {
+              setTipType(TIP_TYPE.HAS_CONFLICT_BEFORE_PUBLISH);
+              setShowTip(true);
+              return;
+            }
+            var originFileVersion = context.getSetting('originFileVersion'); // changing
+            var originFilePath = context.getSetting('originFilePath');
+            var originDocName = context.getSetting('originFilename');
+            var originDocUuid = context.getSetting('originDocUuid');
+            var baseContent;
+            var masterContent;
+            context.getFileHistoryVersion(originFileVersion, originFilePath).then(function (res) {
+              var fileHistoryRevisionContent = res.data.content; // commit content
+              baseContent = JSON.parse(fileHistoryRevisionContent);
+              return context.getSeadocOriginFileDownloadLink();
+            }).then(function (res) {
+              var originFileDownloadLink = res.data.origin_file_download_link;
+              return fetch(originFileDownloadLink);
+            }).then(function (res) {
+              return res.json();
+            }).then(function (content) {
+              masterContent = content;
+              var _getRebase = getRebase(masterContent, baseContent, revisionContent),
+                canMerge = _getRebase.canMerge,
+                isNeedReplaceMaster = _getRebase.isNeedReplaceMaster,
+                value = _getRebase.value;
+              if (canMerge && isNeedReplaceMaster) {
+                editorRef.current.publishDocument(originDocUuid, originDocName, true, function (success) {
+                  if (success) {
+                    setTipType(TIP_TYPE.HAS_BEEN_PUBLISHED);
+                    setShowTip(true);
+                  } else {
+                    toaster.danger(t('Error'));
+                  }
+                });
+                return;
+              }
+              if (canMerge && !isNeedReplaceMaster) {
+                setTipType(TIP_TYPE.DELETE_NO_CHANGES_REVISION);
+                setShowTip(true);
+                return;
+              }
+              setMergeValue(value);
+              setTipType(TIP_TYPE.MERGE);
+              setShowTip(true);
+            }).catch(function (error) {
+              toaster.danger(t('Error'));
+            });
+          }, function (errorMessage) {
+            toaster.danger(t(errorMessage));
+          });
+
+          // eslint-disable-next-line react-hooks/exhaustive-deps
+        case 1:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  })), [isShowChanges, mode]);
   var setDiffChanges = useCallback(function (diff) {
     setChanges(diff.changes);
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isShowChanges]);
-  if (isFirstLoad && !errorMessage) {
+  var jumpToURL = useCallback(function (url) {
+    window.location.href = url;
+  }, []);
+  var closeTip = useCallback(function () {
+    setShowTip(false);
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [tipType]);
+  var tipSubmit = useCallback(function () {
+    if (tipType === TIP_TYPE.DELETE_NO_CHANGES_REVISION) {
+      var originFileURL = context.getSetting('originFileURL');
+      var originDocName = context.getSetting('originFilename');
+      var originDocUuid = context.getSetting('originDocUuid');
+      editorRef.current.publishDocument(originDocUuid, originDocName, false, function (success) {
+        if (success) {
+          setShowTip(false);
+          jumpToURL(originFileURL);
+        } else {
+          toaster.danger(t('Error'));
+        }
+      });
+      return;
+    }
+    if (tipType === TIP_TYPE.MERGE) {
+      context.updateSdocRevision().then(function (res) {
+        var origin_file_version = res.data.origin_file_version;
+        context.updateSettings({
+          'originFileVersion': origin_file_version
+        });
+        editorRef.current.replaceDocument(mergeValue);
+        editorRef.current.setLoading(true);
+        editorRef.current.setSlateValue(mergeValue);
+        setMode(MODE.EDITOR);
+        editorRef.current.setEditorMode(MODE.EDITOR);
+        editorRef.current.setLoading(false);
+        setShowTip(false);
+      }).catch(function (error) {
+        toaster.danger(t('Error'));
+      });
+      return;
+    }
+    setShowTip(false);
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [tipType, mergeValue, editorRef.current]);
+  if (isLoadingSdoc) {
     return /*#__PURE__*/React.createElement(Loading, null);
   }
-  if (isFirstLoad && errorMessage) {
+  if (errorMessage) {
     return /*#__PURE__*/React.createElement("div", {
       className: "error-page"
     }, /*#__PURE__*/React.createElement("div", {
@@ -144,24 +318,17 @@ var SimpleEditor = function SimpleEditor(_ref) {
   }), /*#__PURE__*/React.createElement(DocOperations, {
     isShowChanges: isShowChanges,
     changes: changes,
-    toggleViewChanges: toggleViewChanges
-  })), /*#__PURE__*/React.createElement(Content, null, isLoadingSdoc && /*#__PURE__*/React.createElement("div", {
-    className: "w-100 h-100 d-flex align-items-center justify-content-center"
-  }, /*#__PURE__*/React.createElement(Loading, null)), !isLoadingSdoc && errorMessage && /*#__PURE__*/React.createElement("div", {
-    className: "error-page"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "error-tip"
-  }, t(errorMessage))), !isLoadingSdoc && !errorMessage && /*#__PURE__*/React.createElement(React.Fragment, null, isShowChanges ? /*#__PURE__*/React.createElement(DiffViewer, {
-    showToolbar: true,
-    showOutline: true,
-    currentContent: currentContent,
-    lastContent: lastContent,
-    didMountCallback: setDiffChanges
-  }) : /*#__PURE__*/React.createElement(SDocEditor, {
-    config: context.getEditorConfig(),
-    document: document,
+    toggleViewChanges: toggleViewChanges,
+    publishRevision: publishRevision
+  })), /*#__PURE__*/React.createElement(Content, null, /*#__PURE__*/React.createElement(SDocEditor, {
     ref: editorRef,
-    isOpenSocket: context.getSetting('isOpenSocket')
-  })))));
+    document: document,
+    mode: mode,
+    setDiffChanges: setDiffChanges
+  }))), showTip && /*#__PURE__*/React.createElement(TipDialog, {
+    toggle: closeTip,
+    submit: tipSubmit,
+    tipType: tipType
+  }));
 };
 export default withTranslation('sdoc-editor')(SimpleEditor);

package/package.json

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

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

@@ -364,5 +364,15 @@
   "Title": "Title",
   "Subtitle": "Subtitle",
   "Link_sdoc": "Link sdoc",
-  "Link_file": "Link file"
+  "Link_file": "Link file",
+  "Keep_my_modification": "Keep my modification",
+  "Keep_other_modification": "Keep other's modification",
+  "Keep_both_modification": "Keep my modification",
+  "Tip": "Tip",
+  "Rebase_delete_no_change_revision_tip": "Revision has not made any change compared to original document. Do you want to delete this revision?",
+  "Has_been_replaced_tip": "Document content has been replaced. Please refresh the page.",
+  "Has_been_published_tip": "Revision has been published, Automatically jump to source content after {{ time }} seconds.",
+  "Has_conflict_before_publish_tip": "There are conflicts in the document, please resolve it before publishing!",
+  "Merge_tip": "There are conflicts in the documents. Do you want to merge them?",
+  "Has_conflict_before_view_changes_tip": "There are conflicts in the document. Please resolve the conflict before viewing the changes!"
 }

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

@@ -363,5 +363,14 @@
   "No_changes": "没有变化",
   "Title": "标题",
   "Subtitle": "副标题",
-  "Link_sdoc": "链接 sdoc"
+  "Link_sdoc": "链接 sdoc",
+  "Keep_my_modification": "保留我的更改",
+  "Keep_other_modification": "保留其他的更改",
+  "Keep_both_modification": "保留两个更改",
+  "Rebase_delete_no_change_revision_tip": "修订改没有更改，是否删除修订稿？",
+  "Has_been_replaced_tip": "文档内容已经被替换，请刷新页面。",
+  "Has_been_published_tip": "修订稿已经发布了，{{ time }} 秒后自动跳转到源文件。",
+  "Has_conflict_before_publish_tip": "文档有冲突，请解决冲突后再发布！",
+  "Merge_tip": "文档有冲突，是否合并？",
+  "Has_conflict_before_view_changes_tip": "文档有冲突，请解决冲突后再查看更改！"
 }