@seafile/sdoc-editor 0.1.145 → 0.1.146-beta-4

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

@@ -0,0 +1,56 @@
+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 repoID = context.getSetting('repoID');
+      var siteRoot = context.getSetting('siteRoot');
+      var originFilePath = context.getSetting('originFilePath');
+      var originFileURL = "".concat(siteRoot, "lib/").concat(repoID, "/file").concat(originFilePath);
+      window.location.href = originFileURL;
+    }
+  }, [time]);
+  var _useTranslation = useTranslation(),
+    t = _useTranslation.t;
+  switch (tipType) {
+    case TIP_TYPE.HAS_BEEN_PUBLISHED:
+      {
+        return /*#__PURE__*/React.createElement(React.Fragment, null, t(TIP_CONTENT[tipType], {
+          time: time
+        }));
+      }
+    default:
+      {
+        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,28 @@
+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',
+  MERGE_DOCUMENT: 'merge_document',
+  MERGE_DOCUMENT_ERROR: 'merge_document_error',
+  UPDATE_DOCUMENT_FROM_HARD_DISK: 'update-document-from-hard-disk'
+};
+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_MERGE: '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_MERGE, '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_MERGE, 'Has_been_merge_tip'), _defineProperty(_TIP_CONTENT, TIP_TYPE.HAS_CONFLICT_BEFORE_VIEW_CHANGES, 'Has_conflict_before_view_changes_tip'), _TIP_CONTENT);

package/dist/context.js

@@ -10,6 +10,9 @@ var Context = /*#__PURE__*/function () {
     this.initSettings = function () {
       _this.settings = window.seafile ? window.seafile : window.seafileConfig;
     };
+    // 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 +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() {
@@ -156,14 +166,15 @@ var Context = /*#__PURE__*/function () {
   }, {
     key: "publishSdocRevision",
     value: function publishSdocRevision() {
+      var replace = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1;
       var docUuid = this.getSetting('docUuid');
-      return this.api.sdocPublishRevision(docUuid);
+      return this.api.sdocPublishRevision(docUuid, replace);
     }
   }, {
-    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,26 @@ var Context = /*#__PURE__*/function () {
       var docUuid = this.getSetting('docUuid');
       return this.api.getSdocRevisions(docUuid, page, perPage);
     }
+  }, {
+    key: "deleteSdocRevision",
+    value: function deleteSdocRevision() {
+      var docUuid = this.getSetting('docUuid');
+      return this.api.deleteSdocRevision(docUuid);
+    }
+  }, {
+    key: "mergeSdocRevision",
+    value: function mergeSdocRevision() {
+      var docUuid = this.getSetting('docUuid');
+      return this.api.mergeSdocRevision(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) {

package/dist/pages/simple-editor.js

@@ -1,9 +1,6 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 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,47 +8,115 @@ 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 } 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 repoID = context.getSetting('repoID');
+  var siteRoot = context.getSetting('siteRoot');
+  var originFilePath = context.getSetting('originFilePath');
+  var isRevision = context.getSetting('isSdocRevision');
+  var originFileURL = isRevision ? "".concat(siteRoot, "lib/").concat(repoID, "/file").concat(originFilePath) : '';
+  var originDocName = isRevision ? context.getSetting('originFilename') : '';
+  var originDocUuid = isRevision ? context.getSetting('originDocUuid') : '';
   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 () {
+    initDocumentData();
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+  var mergeDocument = useCallback(function () {
+    setTipType(TIP_TYPE.HAS_BEEN_MERGE);
+    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 mergeDocumentError = useCallback(function () {}, []);
+  var publishDocumentError = useCallback(function () {}, []);
+  var updateDocumentFromHardDisk = useCallback(function (document) {
+    setDocument(document);
+    editorRef.current.setSlateValue(document);
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [editorRef.current]);
   useEffect(function () {
-    context.initApi();
-    initDocumentData(true);
+    var eventBus = EventBus.getInstance();
+    var mergeDocumentSubscribe = eventBus.subscribe(EXTERNAL_EVENT.MERGE_DOCUMENT, mergeDocument);
+    var publishDocumentSubscribe = eventBus.subscribe(EXTERNAL_EVENT.PUBLISH_DOCUMENT, hasPublishRevision);
+    var mergeDocumentErrorSubscribe = eventBus.subscribe(EXTERNAL_EVENT.MERGE_DOCUMENT_ERROR, mergeDocumentError);
+    var publishDocumentErrorSubscribe = eventBus.subscribe(EXTERNAL_EVENT.PUBLISH_DOCUMENT_ERROR, publishDocumentError);
+    var updateDocumentFromHardDiskSubscribe = eventBus.subscribe(EXTERNAL_EVENT.UPDATE_DOCUMENT_FROM_HARD_DISK, updateDocumentFromHardDisk);
+    return function () {
+      mergeDocumentSubscribe();
+      publishDocumentSubscribe();
+      mergeDocumentErrorSubscribe();
+      publishDocumentErrorSubscribe();
+      updateDocumentFromHardDiskSubscribe();
+    };
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
-  var initDocumentData = useCallback(function (isFirstLoad) {
+
+  // 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 initDocumentData = useCallback(function () {
     setShowChanges(false);
     setLoadingSdoc(true);
     context.getFileContent().then(function (res) {
@@ -65,7 +130,6 @@ var SimpleEditor = function SimpleEditor(_ref) {
       }
       setDocument(result);
       setLoadingSdoc(false);
-      isFirstLoad && setFirstLoad(false);
     }).catch(function (error) {
       // eslint-disable-next-line
       console.log(error);
@@ -83,54 +147,194 @@ var SimpleEditor = function SimpleEditor(_ref) {
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
-  var initChangesData = useCallback(function () {
-    setShowChanges(true);
-    setLoadingSdoc(true);
-    context.getSeadocRevisionDownloadLinks().then(function (res) {
+  var setFileContent = useCallback(function () {
+    context.getFileContent().then(function (res) {
+      var result = res.data || generateDefaultDocContent();
+      if (result && !result.children) {
+        result = {
+          version: 0,
+          children: result.content,
+          cursors: result.cursors || {}
+        };
+      }
+      setDocument(result);
+      editorRef.current.setSlateValue(result);
+      editorRef.current.setLoading(false);
+    }).catch(function (error) {
+      // eslint-disable-next-line
+      console.log(error);
+      setErrorMessage('Load_doc_content_error');
+      editorRef.current.setLoading(false);
+    });
+
+    // eslint-disable-next-line no-trailing-spaces
+  }, []);
+  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) {
+      console.log('error');
+    });
+  }, []);
+  var toggleViewChanges = useCallback(function (isShowChanges) {
+    var needFetchNewContent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    var revisionCurrentContent = editorRef.current.getSlateValue();
+    if (revisionCurrentContent.children.filter(function (item) {
+      return item.rebaseType;
+    }).length !== 0) {
+      setTipType(TIP_TYPE.HAS_CONFLICT_BEFORE_VIEW_CHANGES);
+      setShowTip(true);
+      return;
+    }
+    editorRef.current.setLoading(true);
+    setShowChanges(isShowChanges);
+    var mode = isShowChanges ? MODE.DIFF_VIEWER : MODE.EDITOR;
+    setMode(mode);
+    editorRef.current.setEditorMode(mode);
+    if (!isShowChanges) {
+      setFileContent();
+      return;
+    }
+    if (!needFetchNewContent) {
+      setDiffContent();
+      return;
+    }
+    context.getFileContent().then(function (res) {
+      var result = res.data || generateDefaultDocContent();
+      if (result && !result.children) {
+        result = {
+          version: 0,
+          children: result.content,
+          cursors: result.cursors || {}
+        };
+      }
+      setDocument(result);
+      editorRef.current.setSlateValue(result);
+    }).then(function () {
+      setDiffContent();
+    }).catch(function (error) {
+      // eslint-disable-next-line
+      console.log(error);
       setErrorMessage('Load_doc_content_error');
-      setLoadingSdoc(false);
+      editorRef.current.setLoading(false);
     });
 
     // 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
-      })));
-    }
-    if (isShowChanges) {
-      initChangesData();
+  }, [document, editorRef.current]);
+  var publishRevision = useCallback(function () {
+    var revisionCurrentContent = editorRef.current.getSlateValue();
+    if (revisionCurrentContent.children.filter(function (item) {
+      return item.rebaseType;
+    }).length !== 0) {
+      setTipType(TIP_TYPE.HAS_CONFLICT_BEFORE_PUBLISH);
+      setShowTip(true);
       return;
     }
-    setChanges([]);
-    initDocumentData(false);
+    var originFileVersion = context.getSetting('originFileVersion'); // changing
+    var revisionMasterContent;
+    var masterContent;
+    context.getFileHistoryVersion(originFileVersion, originFilePath).then(function (res) {
+      var fileHistoryRevisionContent = res.data.content; // commit content
+      revisionMasterContent = 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, revisionMasterContent, revisionCurrentContent),
+        canMerge = _getRebase.canMerge,
+        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'));
+        });
+        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'));
+    });
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [document]);
-  var _useState15 = useState([]),
-    _useState16 = _slicedToArray(_useState15, 2),
-    changes = _useState16[0],
-    setChanges = _useState16[1];
+  }, [document, isShowChanges, mode, originDocUuid, originDocName, originFilePath]);
+  var abortRebase = useCallback(function () {
+    toggleViewChanges(isShowChanges, true);
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [isShowChanges, document]);
   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) {
+      context.deleteSdocRevision().then(function (res) {
+        if (res.data.success) {
+          editorRef.current.publishDocument(originDocUuid, originDocName, false);
+          setShowTip(false);
+          jumpToURL(originFileURL);
+        }
+      }).catch(function (error) {
+        toaster.danger(t('Error'));
+      });
+      return;
+    }
+    if (tipType === TIP_TYPE.MERGE) {
+      context.mergeSdocRevision().then(function (res) {
+        var origin_file_version = res.data.origin_file_version;
+        context.updateSettings({
+          'originFileVersion': origin_file_version
+        });
+        editorRef.current.mergeDocument(mergeValue, origin_file_version);
+        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, originFileURL, mergeValue, editorRef.current, originDocUuid, originDocName]);
+  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", {
@@ -143,25 +347,21 @@ var SimpleEditor = function SimpleEditor(_ref) {
     isEditMode: !isShowChanges
   }), /*#__PURE__*/React.createElement(DocOperations, {
     isShowChanges: isShowChanges,
+    mode: mode,
     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,
+    abortRebase: abortRebase
+  })), /*#__PURE__*/React.createElement(Content, null, /*#__PURE__*/React.createElement(SDocEditor, {
     ref: editorRef,
-    isOpenSocket: context.getSetting('isOpenSocket')
-  })))));
+    document: document,
+    mode: mode,
+    setDiffChanges: setDiffChanges,
+    toggleViewChanges: toggleViewChanges
+  }))), 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.145",
+  "version": "0.1.146beta-4",
   "private": false,
   "description": "This is a sdoc editor",
   "main": "dist/index.js",

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

@@ -362,5 +362,17 @@
   "No_changes": "No changes",
   "Title": "Title",
   "Subtitle": "Subtitle",
-  "Link_sdoc": "Link sdoc"
+  "Link_sdoc": "Link sdoc",
+  "Keep_my_modification": "Keep my modification",
+  "Keep_other_modification": "Keep other's modification",
+  "Keep_both_modification": "Keep my modification",
+  "Need_rebase": "Need rebase",
+  "Abort": "Abort",
+  "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_merge_tip": "Revision has been merged, please refresh the page to see the latest content.",
+  "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

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