@seafile/sdoc-editor 0.1.169 → 0.1.170

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

@@ -1,7 +1,7 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import classNames from 'classnames';
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { withTranslation } from 'react-i18next';
+import { useTranslation } from 'react-i18next';
 import { Button } from 'reactstrap';
 var getSubmitTip = function getSubmitTip(type, content) {
   if (content) return 'Save';
@@ -15,8 +15,10 @@ var CommentEditor = function CommentEditor(_ref) {
     insertContent = _ref.insertContent,
     updateContent = _ref.updateContent,
     setIsEditing = _ref.setIsEditing,
-    t = _ref.t;
+    hiddenComment = _ref.hiddenComment;
   var commentRef = useRef();
+  var _useTranslation = useTranslation(),
+    t = _useTranslation.t;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     isFocus = _useState2[0],
@@ -48,6 +50,9 @@ var CommentEditor = function CommentEditor(_ref) {
     setIsFocus(false);
     commentRef.current.textContent = '';
     setIsEditing && setIsEditing(false);
+    hiddenComment && hiddenComment(false);
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [setIsEditing]);
   var onKeyDown = useCallback(function (event) {
     // enter
@@ -88,4 +93,4 @@ var CommentEditor = function CommentEditor(_ref) {
 CommentEditor.defaultProps = {
   placeholder: 'Enter_a_comment'
 };
-export default withTranslation('sdoc-editor')(CommentEditor);
+export default CommentEditor;

package/dist/basic-sdk/comment/comment/comment-item-wrapper.js

@@ -17,7 +17,8 @@ export default function CommentItemWrapper(_ref) {
     isActive = _ref.isActive,
     comment = _ref.comment,
     onCommentClick = _ref.onCommentClick,
-    updateScrollPosition = _ref.updateScrollPosition;
+    updateScrollPosition = _ref.updateScrollPosition,
+    hiddenComment = _ref.hiddenComment;
   var listRef = useRef(null);
   var _useCommentContext = useCommentContext(),
     dispatch = _useCommentContext.dispatch;
@@ -360,7 +361,8 @@ export default function CommentItemWrapper(_ref) {
     className: "mt-4",
     type: "reply",
     placeholder: tip,
-    insertContent: insertContent
+    insertContent: insertContent,
+    hiddenComment: hiddenComment
   }), isShowDeleteDialog && isActive && /*#__PURE__*/React.createElement(CommentDeleteShadow, {
     type: 'comment',
     deleteConfirm: _deleteComment,

package/dist/basic-sdk/comment/comment/comment-list.js

@@ -12,7 +12,8 @@ import CommentItemWrapper from './comment-item-wrapper';
 import './comment-list.css';
 var CommentList = function CommentList(_ref) {
   var comments = _ref.comments,
-    selectionElement = _ref.selectionElement;
+    selectionElement = _ref.selectionElement,
+    hiddenComment = _ref.hiddenComment;
   var commentRef = useRef(null);
   var position = useCommentListPosition();
   var _useState = useState(false),
@@ -102,7 +103,10 @@ var CommentList = function CommentList(_ref) {
       key: comment.id,
       comment: comment,
       isActive: isActive,
-      onCommentClick: onCommentClick
+      onCommentClick: onCommentClick,
+      hiddenComment: function hiddenComment() {
+        return setActiveComment(null);
+      }
     };
     return /*#__PURE__*/React.createElement(CommentItemWrapper, props);
   })), comments.length === 0 && /*#__PURE__*/React.createElement("div", {
@@ -110,7 +114,8 @@ var CommentList = function CommentList(_ref) {
   }, /*#__PURE__*/React.createElement(CommentEditor, {
     type: "comment",
     insertContent: insertContent,
-    selectionElement: selectionElement
+    selectionElement: selectionElement,
+    hiddenComment: hiddenComment
   })));
 };
 export default CommentList;

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

@@ -51,11 +51,16 @@ var EditorComment = function EditorComment() {
     setComments([]);
     setIsShowComments(false);
   }, [element_comments_map, selectionElement, editor.selection]);
+  var hiddenComment = useCallback(function () {
+    setComments([]);
+    setIsShowComments(false);
+  }, []);
   var onHiddenComment = useCallback(function (e) {
     if (e.target.className === 'article') {
-      setComments([]);
-      setIsShowComments(false);
+      hiddenComment();
     }
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   useEffect(function () {
     window.addEventListener('click', onHiddenComment);
@@ -85,7 +90,8 @@ var EditorComment = function EditorComment() {
     } : null
   }, isShowComments && /*#__PURE__*/React.createElement(CommentList, {
     comments: comments,
-    selectionElement: selectionElement
+    selectionElement: selectionElement,
+    hiddenComment: hiddenComment
   }))));
 };
 export default EditorComment;

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

@@ -53,9 +53,9 @@ var Editor = forwardRef(function (_ref, ref) {
   useImperativeHandle(ref, function () {
     return {
       setSlateValue: function setSlateValue(document) {
-        _setSlateValue(_toConsumableArray(document.children));
         // Force update of editor's child elements
         editor.children = document.children;
+        _setSlateValue(_toConsumableArray(document.children));
       },
       updateDocumentVersion: function updateDocumentVersion(document) {
         editor.updateDocumentVersion(document);

package/dist/components/doc-operations/index.js

@@ -11,16 +11,16 @@ import './style.css';
 var DocOperations = function DocOperations(_ref) {
   var isShowChanges = _ref.isShowChanges,
     changes = _ref.changes,
-    toggleViewChanges = _ref.toggleViewChanges,
-    publishRevision = _ref.publishRevision;
+    handleViewChangesToggle = _ref.handleViewChangesToggle,
+    handleRevisionPublished = _ref.handleRevisionPublished;
   var isSdocRevision = context.getSetting('isSdocRevision');
   return /*#__PURE__*/React.createElement("div", {
     className: "doc-ops"
   }, /*#__PURE__*/React.createElement(RevisionOperations, {
     isShowChanges: isShowChanges,
     changes: changes,
-    toggleViewChanges: toggleViewChanges,
-    publishRevision: publishRevision
+    handleViewChangesToggle: handleViewChangesToggle,
+    handleRevisionPublished: handleRevisionPublished
   }), /*#__PURE__*/React.createElement(CommentsOperation, null), !isSdocRevision && /*#__PURE__*/React.createElement(ShareOperation, null), /*#__PURE__*/React.createElement(HistoryOperation, null), /*#__PURE__*/React.createElement(CollaboratorsOperation, null), !isSdocRevision && /*#__PURE__*/React.createElement(MoreOperations, null));
 };
 export default withTranslation('sdoc-editor')(DocOperations);

package/dist/components/doc-operations/revision-operations/index.js

@@ -1,6 +1,14 @@
-import React from 'react';
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import React, { useCallback, useEffect, useState } from 'react';
+import { EventBus } from '../../../basic-sdk';
+import { getRebase, hasConflict } from '../../../basic-sdk/utils/rebase';
 import context from '../../../context';
-import PublishRevision from './publish-button';
+import { EXTERNAL_EVENT, TIP_TYPE } from '../../../constants';
+import { useDocument } from '../../../hooks/use-document';
+import toaster from '../../toast';
+import TipDialog from '../../tip-dialog';
+import { useTranslation } from 'react-i18next';
+import PublishRevision from './publish-revision';
 import ViewChanges from './view-changes';
 import MoreRevisionOperations from './more-revision-operations';
 import Revisions from './revisions';
@@ -8,17 +16,190 @@ import ChangesCount from './changes-count';
 var RevisionOperations = function RevisionOperations(_ref) {
   var isShowChanges = _ref.isShowChanges,
     changes = _ref.changes,
-    toggleViewChanges = _ref.toggleViewChanges,
-    publishRevision = _ref.publishRevision;
+    handleViewChangesToggle = _ref.handleViewChangesToggle,
+    handleRevisionPublished = _ref.handleRevisionPublished;
   var isSdocRevision = context.getSetting('isSdocRevision');
   var isPublished = context.getSetting('isPublished');
+  var _useTranslation = useTranslation(),
+    t = _useTranslation.t;
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    isShowTip = _useState2[0],
+    setShowTip = _useState2[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    tipType = _useState4[0],
+    setTipType = _useState4[1];
+  var _useState5 = useState(null),
+    _useState6 = _slicedToArray(_useState5, 2),
+    mergeValue = _useState6[0],
+    setMergeValue = _useState6[1];
+  var onDocumentReplaced = useCallback(function () {
+    if (isShowTip) return;
+    setTipType(TIP_TYPE.HAS_BEEN_REPLACED);
+    setShowTip(true);
+  }, [isShowTip]);
+  var hasPublishRevision = useCallback(function () {
+    if (isShowTip) return;
+    setTipType(TIP_TYPE.HAS_BEEN_PUBLISHED);
+    setShowTip(true);
+  }, [isShowTip]);
+  var onDocumentRemoved = useCallback(function () {
+    if (isShowTip) return;
+    setTipType(TIP_TYPE.HAS_BEEN_REMOVED);
+    setShowTip(true);
+  }, [isShowTip]);
+  var onError = useCallback(function () {
+    toaster.danger(t('Error'));
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+  useEffect(function () {
+    var eventBus = EventBus.getInstance();
+    var unsubscribeMergeDocument = eventBus.subscribe(EXTERNAL_EVENT.DOCUMENT_REPLACED, onDocumentReplaced);
+    var unsubscribeMergeDocumentError = eventBus.subscribe(EXTERNAL_EVENT.DOCUMENT_REPLACED_ERROR, onError);
+    var unsubscribePublishDocument = eventBus.subscribe(EXTERNAL_EVENT.PUBLISH_DOCUMENT, hasPublishRevision);
+    var unsubscribePublishDocumentError = eventBus.subscribe(EXTERNAL_EVENT.PUBLISH_DOCUMENT_ERROR, onError);
+    var unsubscribeRemoveDocument = eventBus.subscribe(EXTERNAL_EVENT.REMOVE_DOCUMENT, onDocumentRemoved);
+    var unsubscribeRemoveDocumentError = eventBus.subscribe(EXTERNAL_EVENT.REMOVE_DOCUMENT_ERROR, onError);
+    return function () {
+      unsubscribeMergeDocument();
+      unsubscribeMergeDocumentError();
+      unsubscribePublishDocument();
+      unsubscribePublishDocumentError();
+      unsubscribeRemoveDocument();
+      unsubscribeRemoveDocumentError();
+    };
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+  var _useDocument = useDocument(),
+    loadDocument = _useDocument.loadDocument;
+
+  // solve show change view in revision editor
+  var onViewChangesToggle = useCallback(function (isShowChanges) {
+    if (isShowChanges) {
+      // The trick here is to send one more api request in order to use the same information box.
+      loadDocument().then(function (revisionContent) {
+        // Prevent users from switching if document contains conflicting content
+        if (hasConflict(revisionContent.children)) {
+          setTipType(TIP_TYPE.HAS_CONFLICT_BEFORE_VIEW_CHANGES);
+          setShowTip(true);
+        } else {
+          handleViewChangesToggle(isShowChanges);
+        }
+      }).catch(function (errorMessage) {
+        toaster.danger(t(errorMessage));
+      });
+      return;
+    }
+    handleViewChangesToggle(isShowChanges);
+  }, [handleViewChangesToggle, loadDocument, t]);
+
+  // publish revision
+  var publishRevision = useCallback(function () {
+    setShowTip(true);
+    setTipType(TIP_TYPE.CHECKING);
+    var revisionPromise = loadDocument();
+    var baseVersionPromise = context.getRevisionBaseVersionContent();
+    var originVersionPromise = context.getSeadocOriginFileContent();
+    Promise.all([revisionPromise, baseVersionPromise, originVersionPromise]).then(function (results) {
+      var _results = _slicedToArray(results, 3),
+        revisionContent = _results[0],
+        baseRes = _results[1],
+        masterRes = _results[2];
+      var baseContent = JSON.parse(baseRes.data.content);
+      var masterContent = JSON.parse(masterRes.data.content);
+      if (hasConflict(revisionContent.children)) {
+        setTipType(TIP_TYPE.HAS_CONFLICT_BEFORE_PUBLISH);
+        return;
+      }
+      var _getRebase = getRebase(masterContent, baseContent, revisionContent),
+        canMerge = _getRebase.canMerge,
+        isNeedReplaceMaster = _getRebase.isNeedReplaceMaster,
+        value = _getRebase.value;
+      // change to HAS_BEEN_PUBLISHED
+      if (canMerge && isNeedReplaceMaster) {
+        setTipType(TIP_TYPE.PUBLISHING);
+        context.publishRevision().then(function (res) {
+          setTipType(TIP_TYPE.HAS_BEEN_PUBLISHED);
+        }).catch(function (error) {
+          toaster.danger(t('Error'));
+        });
+        return;
+      }
+
+      // change to DELETE_NO_CHANGES_REVISION
+      if (canMerge && !isNeedReplaceMaster) {
+        setTipType(TIP_TYPE.DELETE_NO_CHANGES_REVISION);
+        return;
+      }
+
+      // change to MERGE
+      setMergeValue(value);
+      setTipType(TIP_TYPE.MERGE);
+    }).catch(function (error) {
+      if (typeof error === 'string') {
+        toaster.danger(t(error));
+        return;
+      }
+      toaster.danger(t('Error'));
+    });
+  }, [loadDocument, t]);
+
+  // confirm publish
+  var onSubmit = useCallback(function () {
+    if (tipType === TIP_TYPE.HAS_BEEN_PUBLISHED) {
+      // nothing todo
+    }
+    if (tipType === TIP_TYPE.DELETE_NO_CHANGES_REVISION) {
+      context.deleteSdocRevision().then(function (res) {
+        // update current location
+        var originFileURL = context.getSetting('originFileURL');
+        window.location.href = originFileURL;
+      }).catch(function (error) {
+        toaster.danger(t('Error'));
+      });
+      return;
+    }
+    if (tipType === TIP_TYPE.MERGE) {
+      var _context$getUserInfo = context.getUserInfo(),
+        username = _context$getUserInfo.username;
+      var doc = {
+        children: mergeValue.children,
+        version: mergeValue.version,
+        format_version: mergeValue.format_version,
+        last_modify_user: username
+      };
+      context.updateSdocRevision(doc).then(function (res) {
+        var origin_file_version = res.data.origin_file_version;
+        context.updateSettings({
+          'originFileVersion': origin_file_version
+        });
+        handleRevisionPublished && handleRevisionPublished(mergeValue);
+        setShowTip(false);
+      }).catch(function (error) {
+        toaster.danger(t('Error'));
+      });
+      return;
+    }
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [tipType, mergeValue, document]);
+  var onClose = useCallback(function () {
+    setShowTip(false);
+  }, []);
   return /*#__PURE__*/React.createElement(React.Fragment, null, !isSdocRevision && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(MoreRevisionOperations, null), /*#__PURE__*/React.createElement(Revisions, null)), isSdocRevision && isShowChanges && /*#__PURE__*/React.createElement(ChangesCount, {
     changes: changes
   }), isSdocRevision && /*#__PURE__*/React.createElement(ViewChanges, {
     isShowChanges: isShowChanges,
-    toggleViewChanges: toggleViewChanges
+    onViewChangesToggle: onViewChangesToggle
   }), isSdocRevision && !isPublished && /*#__PURE__*/React.createElement(PublishRevision, {
     publishRevision: publishRevision
+  }), isShowTip && /*#__PURE__*/React.createElement(TipDialog, {
+    tipType: tipType,
+    onSubmit: onSubmit,
+    onClose: onClose
   }));
 };
 export default RevisionOperations;

package/dist/components/doc-operations/revision-operations/more-revision-operations/index.js

@@ -8,8 +8,6 @@ import { REVISION_FIRST_LOAD_KEY, REVISION_FIRST_LOAD_VALUE } from '../../../../
 import './index.css';
 var MoreRevisionOperations = function MoreRevisionOperations(_ref) {
   var t = _ref.t;
-  var repoID = context.getSetting('repoID');
-  var siteRoot = context.getSetting('siteRoot');
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     isDropdownOpen = _useState2[0],
@@ -19,6 +17,8 @@ var MoreRevisionOperations = function MoreRevisionOperations(_ref) {
   }, []);
   var startRevise = useCallback(function () {
     context.startRevise().then(function (res) {
+      var repoID = context.getSetting('repoID');
+      var siteRoot = context.getSetting('siteRoot');
       window.location.href = "".concat(siteRoot, "lib/").concat(repoID, "/revisions/").concat(res.data.revision_id, "/?").concat(REVISION_FIRST_LOAD_KEY, "=").concat(REVISION_FIRST_LOAD_VALUE);
     }).catch(function (error) {
       toaster.danger(t('Error'));

package/dist/components/doc-operations/revision-operations/{publish-button.js → publish-revision/index.js}

@@ -5,7 +5,7 @@ var PublishRevision = function PublishRevision(_ref) {
   var publishRevision = _ref.publishRevision;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
-  var publish = useCallback(function (event) {
+  var onPublishRevision = useCallback(function (event) {
     event.stopPropagation();
     event.nativeEvent.stopImmediatePropagation();
     publishRevision();
@@ -14,7 +14,7 @@ var PublishRevision = function PublishRevision(_ref) {
   }, []);
   return /*#__PURE__*/React.createElement(Button, {
     color: "success",
-    onClick: publish,
+    onClick: onPublishRevision,
     className: "ml-4"
   }, t('Publish'));
 };

package/dist/components/doc-operations/revision-operations/view-changes/index.js

@@ -1,15 +1,15 @@
 import React, { useCallback } from 'react';
-import { withTranslation } from 'react-i18next';
+import { useTranslation } from 'react-i18next';
 import { UncontrolledTooltip } from 'reactstrap';
 import Switch from '../../../switch';
 import './index.css';
 var ViewChanges = function ViewChanges(_ref) {
   var isShowChanges = _ref.isShowChanges,
-    t = _ref.t,
-    toggleViewChanges = _ref.toggleViewChanges;
-  var onToggleViewCHanges = useCallback(function () {
-    toggleViewChanges(!isShowChanges);
-
+    propsOnViewChangesToggle = _ref.onViewChangesToggle;
+  var _useTranslation = useTranslation(),
+    t = _useTranslation.t;
+  var onViewChangesToggle = useCallback(function () {
+    propsOnViewChangesToggle(!isShowChanges);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isShowChanges]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
@@ -17,11 +17,11 @@ var ViewChanges = function ViewChanges(_ref) {
     className: "h-100 ml-4 d-flex align-items-center "
   }, /*#__PURE__*/React.createElement(Switch, {
     checked: isShowChanges,
-    onChange: onToggleViewCHanges,
+    onChange: onViewChangesToggle,
     className: "sdoc-toggle-revision-changes d-flex align-items-center"
   })), /*#__PURE__*/React.createElement(UncontrolledTooltip, {
     target: "sdoc-toggle-revision-changes-container",
     fade: false
   }, t('View_changes')));
 };
-export default withTranslation('sdoc-editor')(ViewChanges);
+export default ViewChanges;

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

@@ -1,5 +1,5 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import React, { useCallback, useState } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Modal, ModalHeader, ModalBody, ModalFooter, Button } from 'reactstrap';
 import classnames from 'classnames';
@@ -11,28 +11,38 @@ var NOT_CLOSE_DIALOG_TIP_TYPE = [TIP_TYPE.HAS_BEEN_REPLACED, TIP_TYPE.HAS_BEEN_P
 var TipDialog = function TipDialog(_ref) {
   var className = _ref.className,
     tipType = _ref.tipType,
-    toggle = _ref.toggle,
-    submit = _ref.submit;
+    onClose = _ref.onClose,
+    propsOnSubmit = _ref.onSubmit;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
-  var _useState = useState(false),
+  var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     isSubmitting = _useState2[0],
     setSubmitting = _useState2[1];
   var closeDialog = useCallback(function () {
     if (NOT_CLOSE_DIALOG_TIP_TYPE.includes(tipType)) return;
     if (isSubmitting) return;
-    toggle && toggle();
-
+    onClose && onClose();
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [tipType, isSubmitting]);
-  var confirmTip = useCallback(function () {
-    submit && submit(function (submitting) {
-      setSubmitting(submitting);
-    });
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [tipType]);
+  var onSubmit = useCallback(function () {
+    if (tipType === TIP_TYPE.HAS_CONFLICT_BEFORE_VIEW_CHANGES) {
+      closeDialog();
+      return;
+    }
+    setSubmitting(true);
+    propsOnSubmit && propsOnSubmit();
+  }, [closeDialog, propsOnSubmit, tipType]);
+  useEffect(function () {
+    if (isSubmitting) {
+      var timer = setTimeout(function () {
+        setSubmitting(false);
+      }, 3000);
+      return function () {
+        clearTimeout(timer);
+      };
+    }
+  }, [isSubmitting]);
   return /*#__PURE__*/React.createElement(Modal, {
     isOpen: true,
     autoFocus: false,
@@ -56,8 +66,8 @@ var TipDialog = function TipDialog(_ref) {
     className: classnames('highlight-bg-color', {
       'd-flex align-items-center': isSubmitting
     }),
-    onClick: confirmTip,
-    disabled: isSubmitting
+    disabled: isSubmitting,
+    onClick: onSubmit
   }, isSubmitting && /*#__PURE__*/React.createElement("span", {
     className: "submit-loading-container mr-2"
   }, /*#__PURE__*/React.createElement(CommonLoading, null)), t('Confirm'))));

package/dist/pages/simple-editor.js

@@ -1,6 +1,4 @@
-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 Loading from '../components/loading';
@@ -9,11 +7,9 @@ import DocOperations from '../components/doc-operations';
 import Layout, { Header, Content } from '../layout';
 import context from '../context';
 import ErrorBoundary from './error-boundary';
-import TipDialog from '../components/tip-dialog';
-import { EXTERNAL_EVENT, TIP_TYPE, REVISION_FIRST_LOAD_KEY, REVISION_FIRST_LOAD_VALUE } from '../constants';
-import { getRebase, hasConflict } from '../basic-sdk/utils/rebase';
+import { REVISION_FIRST_LOAD_KEY, REVISION_FIRST_LOAD_VALUE } from '../constants';
 import toaster from '../components/toast';
-import { EventBus, SDocEditor } from '../basic-sdk';
+import { SDocEditor } from '../basic-sdk';
 import { RevisionDiffViewer } from '../basic-sdk/views';
 import { useDocument } from '../hooks/use-document';
 import '../assets/css/simple-editor.css';
@@ -23,6 +19,12 @@ var SimpleEditor = function SimpleEditor(_ref) {
     t = _ref.t;
   context.initApi();
   var editorRef = useRef(null);
+  var _useDocument = useDocument(),
+    isFirstLoading = _useDocument.isFirstLoading,
+    isReloading = _useDocument.isReloading,
+    errorMessage = _useDocument.errorMessage,
+    document = _useDocument.document,
+    reloadDocument = _useDocument.reloadDocument;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     isShowChanges = _useState2[0],
@@ -35,25 +37,6 @@ var SimpleEditor = function SimpleEditor(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     changes = _useState6[0],
     setChanges = _useState6[1];
-  var _useState7 = useState(false),
-    _useState8 = _slicedToArray(_useState7, 2),
-    showTip = _useState8[0],
-    setShowTip = _useState8[1];
-  var _useState9 = useState(''),
-    _useState10 = _slicedToArray(_useState9, 2),
-    tipType = _useState10[0],
-    setTipType = _useState10[1];
-  var _useState11 = useState([]),
-    _useState12 = _slicedToArray(_useState11, 2),
-    mergeValue = _useState12[0],
-    setMergeValue = _useState12[1];
-  var _useDocument = useDocument(),
-    isFirstLoading = _useDocument.isFirstLoading,
-    isReloading = _useDocument.isReloading,
-    errorMessage = _useDocument.errorMessage,
-    document = _useDocument.document,
-    loadDocument = _useDocument.loadDocument,
-    reloadDocument = _useDocument.reloadDocument;
 
   // useMount: reset title
   useEffect(function () {
@@ -77,52 +60,11 @@ var SimpleEditor = function SimpleEditor(_ref) {
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
-  var onDocumentReplaced = useCallback(function () {
-    if (showTip) return;
-    setTipType(TIP_TYPE.HAS_BEEN_REPLACED);
-    setShowTip(true);
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [editorRef, showTip]);
-  var hasPublishRevision = useCallback(function () {
-    if (showTip) return;
-    setTipType(TIP_TYPE.HAS_BEEN_PUBLISHED);
-    setShowTip(true);
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [editorRef, showTip]);
-  var onError = useCallback(function () {
-    toaster.danger(t('Error'));
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-  var onDocumentRemoved = useCallback(function () {
-    if (showTip) return;
-    setTipType(TIP_TYPE.HAS_BEEN_REMOVED);
-    setShowTip(true);
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [showTip]);
-  useEffect(function () {
-    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, onError);
-    var unsubscribePublishDocumentError = eventBus.subscribe(EXTERNAL_EVENT.PUBLISH_DOCUMENT_ERROR, onError);
-    var unsubscribeRemoveDocument = eventBus.subscribe(EXTERNAL_EVENT.REMOVE_DOCUMENT, onDocumentRemoved);
-    var unsubscribeRemoveDocumentError = eventBus.subscribe(EXTERNAL_EVENT.REMOVE_DOCUMENT_ERROR, onError);
-    return function () {
-      unsubscribeMergeDocument();
-      unsubscribePublishDocument();
-      unsubscribeMergeDocumentError();
-      unsubscribePublishDocumentError();
-      unsubscribeRemoveDocument();
-      unsubscribeRemoveDocumentError();
-    };
-
+  var setDiffChanges = useCallback(function (diff) {
+    setChanges(diff.changes);
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-  var toggleViewChanges = useCallback(function (isShowChanges) {
+  }, [isShowChanges]);
+  var handleViewChangesToggle = useCallback(function (isShowChanges) {
     if (!isShowChanges) {
       setShowChanges(isShowChanges);
       reloadDocument();
@@ -131,136 +73,15 @@ var SimpleEditor = function SimpleEditor(_ref) {
 
     // Get the contents of the current revision
     var revisionContent = editorRef.current.getSlateValue();
-
-    // Prevent users from switching if document contains conflicting content
-    if (hasConflict(revisionContent.children)) {
-      setTipType(TIP_TYPE.HAS_CONFLICT_BEFORE_VIEW_CHANGES);
-      setShowTip(true);
-      return;
-    }
-
-    // Record the contents of the current revision
     setRevisionContent(revisionContent);
     setShowChanges(isShowChanges);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [document, editorRef.current]);
-  var setDiffChanges = useCallback(function (diff) {
-    setChanges(diff.changes);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [isShowChanges]);
-  var publishRevision = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var revisionPromise, baseVersionPromise, originVersionPromise;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          setTipType(TIP_TYPE.CHECKING);
-          setShowTip(true);
-          revisionPromise = loadDocument();
-          baseVersionPromise = context.getRevisionBaseVersionContent();
-          originVersionPromise = context.getSeadocOriginFileContent();
-          Promise.all([revisionPromise, baseVersionPromise, originVersionPromise]).then(function (results) {
-            var _results = _slicedToArray(results, 3),
-              revisionContent = _results[0],
-              baseRes = _results[1],
-              masterRes = _results[2];
-            var baseContent = JSON.parse(baseRes.data.content);
-            var masterContent = JSON.parse(masterRes.data.content);
-            if (hasConflict(revisionContent.children)) {
-              setTipType(TIP_TYPE.HAS_CONFLICT_BEFORE_PUBLISH);
-              setShowTip(true);
-              return;
-            }
-            var _getRebase = getRebase(masterContent, baseContent, revisionContent),
-              canMerge = _getRebase.canMerge,
-              isNeedReplaceMaster = _getRebase.isNeedReplaceMaster,
-              value = _getRebase.value;
-            if (canMerge && isNeedReplaceMaster) {
-              setTipType(TIP_TYPE.PUBLISHING);
-              context.publishRevision().then(function (res) {
-                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) {
-            if (typeof error === 'string') {
-              toaster.danger(t(error));
-              return;
-            }
-            toaster.danger(t('Error'));
-          });
-        case 6:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  })), [loadDocument, t]);
-  var jumpToURL = useCallback(function (url) {
-    window.location.href = url;
+  var handleRevisionPublished = useCallback(function (value) {
+    setShowChanges(false);
+    editorRef.current.setSlateValue(value);
+    editorRef.current.updateDocumentVersion(value);
   }, []);
-  var closeTip = useCallback(function () {
-    setShowTip(false);
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [tipType]);
-  var tipSubmit = useCallback(function (callback) {
-    if (tipType === TIP_TYPE.DELETE_NO_CHANGES_REVISION) {
-      callback && callback(true);
-      context.deleteSdocRevision().then(function (res) {
-        callback && callback(false);
-        setShowTip(false);
-        var originFileURL = context.getSetting('originFileURL');
-        jumpToURL(originFileURL);
-      }).catch(function (error) {
-        callback && callback(false);
-        toaster.danger(t('Error'));
-      });
-      return;
-    }
-    if (tipType === TIP_TYPE.MERGE) {
-      callback && callback(true);
-      var _context$getUserInfo = context.getUserInfo(),
-        username = _context$getUserInfo.username;
-      var doc = {
-        children: mergeValue.children,
-        version: mergeValue.version,
-        format_version: document.format_version,
-        docName: document.docName,
-        last_modify_user: username
-      };
-      context.updateSdocRevision(doc).then(function (res) {
-        callback && callback(false);
-        var origin_file_version = res.data.origin_file_version;
-        context.updateSettings({
-          'originFileVersion': origin_file_version
-        });
-        // if revision diff view change to sdoc editor
-        if (isShowChanges) {
-          setShowChanges(false);
-        }
-        editorRef.current.setSlateValue(mergeValue);
-        editorRef.current.updateDocumentVersion(mergeValue);
-        setShowTip(false);
-      }).catch(function (error) {
-        callback && callback(false);
-        toaster.danger(t('Error'));
-      });
-      return;
-    }
-    setShowTip(false);
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [tipType, mergeValue, editorRef.current, document]);
   if (isFirstLoading) {
     return /*#__PURE__*/React.createElement(Loading, null);
   }
@@ -278,8 +99,8 @@ var SimpleEditor = function SimpleEditor(_ref) {
   }), /*#__PURE__*/React.createElement(DocOperations, {
     isShowChanges: isShowChanges,
     changes: changes,
-    toggleViewChanges: toggleViewChanges,
-    publishRevision: publishRevision
+    handleViewChangesToggle: handleViewChangesToggle,
+    handleRevisionPublished: handleRevisionPublished
   })), /*#__PURE__*/React.createElement(Content, null, !isShowChanges && /*#__PURE__*/React.createElement(SDocEditor, {
     ref: editorRef,
     isReloading: isReloading,
@@ -287,10 +108,6 @@ var SimpleEditor = function SimpleEditor(_ref) {
   }), isShowChanges && /*#__PURE__*/React.createElement(RevisionDiffViewer, {
     revisionContent: revisionContent,
     didMountCallback: 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.169",
+  "version": "0.1.170",
   "private": false,
   "description": "This is a sdoc editor",
   "main": "dist/index.js",

package/dist/components/doc-operations/revision-operations/revision-operations.js

@@ -1,60 +0,0 @@
-import React, { useCallback } from 'react';
-import { Button } from 'reactstrap';
-import { withTranslation } from 'react-i18next';
-import context from '../../../context';
-import toaster from '../../toast';
-var RevisionOperations = function RevisionOperations(_ref) {
-  var t = _ref.t;
-  var isSdocRevision = context.getSetting('isSdocRevision');
-  var revisionURL = context.getSetting('revisionURL');
-  var isPublished = context.getSetting('isPublished');
-  var repoID = context.getSetting('repoID');
-  var siteRoot = context.getSetting('siteRoot');
-  var viewChanges = useCallback(function (event) {
-    event.stopPropagation();
-    event.nativeEvent.stopImmediatePropagation();
-    window.location.href = revisionURL;
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-  var publishRevision = useCallback(function (event) {
-    event.stopPropagation();
-    event.nativeEvent.stopImmediatePropagation();
-    context.publishSdocRevision().then(function (res) {
-      var origin_file_path = res.data.origin_file_path;
-      window.location.href = "".concat(siteRoot, "lib/").concat(repoID, "/file/").concat(origin_file_path);
-    }).catch(function (error) {
-      toaster.danger(t('Error'));
-    });
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-  var startRevise = useCallback(function () {
-    context.startRevise().then(function (res) {
-      window.location.href = "".concat(siteRoot, "lib/").concat(repoID, "/file").concat(res.data.file_path);
-    }).catch(function (error) {
-      toaster.danger(t('Error'));
-    });
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-  var startReviseBtn = useCallback(function (className) {
-    return /*#__PURE__*/React.createElement(Button, {
-      color: "success",
-      className: className,
-      onClick: startRevise
-    }, t('Start_revise'));
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-  if (!isSdocRevision) return startReviseBtn();
-  return /*#__PURE__*/React.createElement(React.Fragment, null, !isPublished && revisionURL && /*#__PURE__*/React.createElement(Button, {
-    color: "success",
-    className: "mr-4",
-    onClick: viewChanges
-  }, t('View_changes')), !isPublished && /*#__PURE__*/React.createElement(Button, {
-    color: "success",
-    onClick: publishRevision
-  }, t('Publish')));
-};
-export default withTranslation('sdoc-editor')(RevisionOperations);