@seafile/sdoc-editor 0.1.168 → 0.1.169

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

@@ -1,4 +1,5 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useMemo, useEffect, useState, useCallback, useImperativeHandle, forwardRef } from 'react';
 import deepCopy from 'deep-copy';
@@ -11,7 +12,9 @@ import { withSocketIO } from '../socket';
 import SDocEditor from './sdoc-editor';
 import './index.css';
 var Editor = forwardRef(function (_ref, ref) {
-  var document = _ref.document;
+  var document = _ref.document,
+    _ref$isReloading = _ref.isReloading,
+    isReloading = _ref$isReloading === void 0 ? false : _ref$isReloading;
   var editor = useMemo(function () {
     var defaultEditor = createDefaultEditor();
     var editorConfig = context.getEditorConfig();
@@ -26,14 +29,10 @@ var Editor = forwardRef(function (_ref, ref) {
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
-  var _useState = useState(false),
+  var _useState = useState(document.children),
     _useState2 = _slicedToArray(_useState, 2),
-    isLoading = _useState2[0],
-    _setLoading = _useState2[1];
-  var _useState3 = useState(document.children),
-    _useState4 = _slicedToArray(_useState3, 2),
-    slateValue = _useState4[0],
-    _setSlateValue = _useState4[1];
+    slateValue = _useState2[0],
+    _setSlateValue = _useState2[1];
 
   // useMount: init socket connection
   useEffect(function () {
@@ -53,12 +52,10 @@ var Editor = forwardRef(function (_ref, ref) {
   // The parent component can call the method of this component through ref
   useImperativeHandle(ref, function () {
     return {
-      // set value
-      setLoading: function setLoading(isLoading) {
-        _setLoading(isLoading);
-      },
       setSlateValue: function setSlateValue(document) {
-        _setSlateValue(document.children);
+        _setSlateValue(_toConsumableArray(document.children));
+        // Force update of editor's child elements
+        editor.children = document.children;
       },
       updateDocumentVersion: function updateDocumentVersion(document) {
         editor.updateDocumentVersion(document);
@@ -73,7 +70,7 @@ var Editor = forwardRef(function (_ref, ref) {
       // eslint-disable-next-line react-hooks/exhaustive-deps
     };
   }, [document, editor, slateValue]);
-  if (isLoading) {
+  if (isReloading) {
     return /*#__PURE__*/React.createElement("div", {
       className: "h-100 w-100 d-flex align-items-center justify-content-center"
     }, /*#__PURE__*/React.createElement(CommonLoading, null));

package/dist/hooks/use-document.js

@@ -0,0 +1,80 @@
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import { useCallback, useEffect, useState } from 'react';
+import context from '../context';
+export var useDocument = function useDocument() {
+  var _useState = useState(true),
+    _useState2 = _slicedToArray(_useState, 2),
+    isFirstLoading = _useState2[0],
+    setIsFirstLoading = _useState2[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    isReloading = _useState4[0],
+    setIsReloading = _useState4[1];
+  var _useState5 = useState(true),
+    _useState6 = _slicedToArray(_useState5, 2),
+    document = _useState6[0],
+    setDocument = _useState6[1];
+  var _useState7 = useState(''),
+    _useState8 = _slicedToArray(_useState7, 2),
+    errorMessage = _useState8[0],
+    setErrorMessage = _useState8[1];
+  var loadDocument = useCallback(function () {
+    return new Promise(function (resolve, reject) {
+      context.getFileContent().then(function (res) {
+        var result = res.data;
+        if (result && !result.children) {
+          result = {
+            version: 0,
+            children: result.content,
+            cursors: result.cursors || {}
+          };
+        }
+        resolve(result);
+      }).catch(function (error) {
+        // eslint-disable-next-line
+        console.log(error);
+        var errorMessage = 'Load_doc_content_error';
+        if (error && error.response) {
+          var _ref = error.response.data || {},
+            error_type = _ref.error_type;
+          if (error_type === 'content_invalid') {
+            errorMessage = 'Sdoc_format_invalid';
+          }
+        }
+        reject(errorMessage);
+      });
+    });
+  }, []);
+  var reloadDocument = useCallback(function () {
+    setIsReloading(true);
+    loadDocument().then(function (document) {
+      setDocument(document);
+      setIsReloading(false);
+    }).catch(function (errorMessage) {
+      setIsReloading(false);
+      setErrorMessage(errorMessage);
+      setDocument(null);
+      setIsReloading(false);
+    });
+  }, [loadDocument]);
+  useEffect(function () {
+    loadDocument().then(function (document) {
+      setDocument(document);
+      setIsFirstLoading(false);
+    }).catch(function (errorMessage) {
+      setErrorMessage(errorMessage);
+      setDocument(null);
+      setIsFirstLoading(false);
+    });
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+  return {
+    isFirstLoading: isFirstLoading,
+    isReloading: isReloading,
+    errorMessage: errorMessage,
+    document: document,
+    loadDocument: loadDocument,
+    reloadDocument: reloadDocument
+  };
+};

package/dist/pages/simple-editor.js

@@ -7,7 +7,6 @@ import Loading from '../components/loading';
 import DocInfo from '../components/doc-info';
 import DocOperations from '../components/doc-operations';
 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';
@@ -16,6 +15,7 @@ import { getRebase, hasConflict } from '../basic-sdk/utils/rebase';
 import toaster from '../components/toast';
 import { EventBus, SDocEditor } from '../basic-sdk';
 import { RevisionDiffViewer } from '../basic-sdk/views';
+import { useDocument } from '../hooks/use-document';
 import '../assets/css/simple-editor.css';
 var SimpleEditor = function SimpleEditor(_ref) {
   var isStarred = _ref.isStarred,
@@ -23,56 +23,37 @@ var SimpleEditor = function SimpleEditor(_ref) {
     t = _ref.t;
   context.initApi();
   var editorRef = useRef(null);
-  var _useState = useState(true),
+  var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
-    isLoadingSdoc = _useState2[0],
-    setLoadingSdoc = _useState2[1];
-  var _useState3 = useState(''),
+    isShowChanges = _useState2[0],
+    setShowChanges = _useState2[1];
+  var _useState3 = useState(null),
     _useState4 = _slicedToArray(_useState3, 2),
-    errorMessage = _useState4[0],
-    setErrorMessage = _useState4[1];
-  var _useState5 = useState(false),
+    revisionContent = _useState4[0],
+    setRevisionContent = _useState4[1];
+  var _useState5 = useState([]),
     _useState6 = _slicedToArray(_useState5, 2),
-    isShowChanges = _useState6[0],
-    setShowChanges = _useState6[1];
-  var _useState7 = useState(null),
+    changes = _useState6[0],
+    setChanges = _useState6[1];
+  var _useState7 = useState(false),
     _useState8 = _slicedToArray(_useState7, 2),
-    revisionContent = _useState8[0],
-    setRevisionContent = _useState8[1];
-  var _useState9 = useState(null),
+    showTip = _useState8[0],
+    setShowTip = _useState8[1];
+  var _useState9 = useState(''),
     _useState10 = _slicedToArray(_useState9, 2),
-    document = _useState10[0],
-    setDocument = _useState10[1];
+    tipType = _useState10[0],
+    setTipType = _useState10[1];
   var _useState11 = useState([]),
     _useState12 = _slicedToArray(_useState11, 2),
-    changes = _useState12[0],
-    setChanges = _useState12[1];
-  var _useState13 = useState(false),
-    _useState14 = _slicedToArray(_useState13, 2),
-    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
-  }, []);
+    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 () {
@@ -141,42 +122,10 @@ var SimpleEditor = function SimpleEditor(_ref) {
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
-  var loadDocument = useCallback(function (successCallback, errorCallback, callback) {
-    callback && callback();
-    context.getFileContent().then(function (res) {
-      var result = res.data || generateDefaultDocContent();
-      if (result && !result.children) {
-        result = {
-          version: 0,
-          children: result.content,
-          cursors: result.cursors || {}
-        };
-      }
-      successCallback && successCallback(result);
-    }).catch(function (error) {
-      // eslint-disable-next-line
-      console.log(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') {
-          errorMessage = 'Sdoc_format_invalid';
-        }
-      }
-      errorCallback && errorCallback(errorMessage);
-    });
-  }, []);
   var toggleViewChanges = useCallback(function (isShowChanges) {
     if (!isShowChanges) {
-      loadDocument(function (document) {
-        setDocument(document);
-        setShowChanges(isShowChanges);
-        editorRef.current.setLoading(false);
-      }, function (errorMessage) {
-        setErrorMessage(errorMessage);
-        editorRef.current.setLoading(false);
-      });
+      setShowChanges(isShowChanges);
+      reloadDocument();
       return;
     }
 
@@ -200,63 +149,62 @@ var SimpleEditor = function SimpleEditor(_ref) {
     // 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);
-          loadDocument(function (document) {
-            var revisionContent = document;
+          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 baseContent;
-            var masterContent;
-            context.getRevisionBaseVersionContent().then(function (res) {
-              var baseVersionContentString = res.data.content; // commit content
-              baseContent = JSON.parse(baseVersionContentString);
-              return context.getSeadocOriginFileContent();
-            }).then(function (res) {
-              var masterContentString = res.data.content;
-              masterContent = JSON.parse(masterContentString);
-              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);
+            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);
-                return;
-              }
-              setMergeValue(value);
-              setTipType(TIP_TYPE.MERGE);
+              }).catch(function (error) {
+                toaster.danger(t('Error'));
+              });
+              return;
+            }
+            if (canMerge && !isNeedReplaceMaster) {
+              setTipType(TIP_TYPE.DELETE_NO_CHANGES_REVISION);
               setShowTip(true);
-            }).catch(function (error) {
-              toaster.danger(t('Error'));
-            });
-          }, function (errorMessage) {
-            toaster.danger(t(errorMessage));
+              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'));
           });
-
-          // eslint-disable-next-line react-hooks/exhaustive-deps
-        case 3:
+        case 6:
         case "end":
           return _context.stop();
       }
     }, _callee);
-  })), [isShowChanges]);
+  })), [loadDocument, t]);
   var jumpToURL = useCallback(function (url) {
     window.location.href = url;
   }, []);
@@ -300,10 +248,8 @@ var SimpleEditor = function SimpleEditor(_ref) {
         if (isShowChanges) {
           setShowChanges(false);
         }
-        editorRef.current.setLoading(true);
         editorRef.current.setSlateValue(mergeValue);
         editorRef.current.updateDocumentVersion(mergeValue);
-        editorRef.current.setLoading(false);
         setShowTip(false);
       }).catch(function (error) {
         callback && callback(false);
@@ -315,7 +261,7 @@ var SimpleEditor = function SimpleEditor(_ref) {
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [tipType, mergeValue, editorRef.current, document]);
-  if (isLoadingSdoc) {
+  if (isFirstLoading) {
     return /*#__PURE__*/React.createElement(Loading, null);
   }
   if (errorMessage) {
@@ -336,6 +282,7 @@ var SimpleEditor = function SimpleEditor(_ref) {
     publishRevision: publishRevision
   })), /*#__PURE__*/React.createElement(Content, null, !isShowChanges && /*#__PURE__*/React.createElement(SDocEditor, {
     ref: editorRef,
+    isReloading: isReloading,
     document: document
   }), isShowChanges && /*#__PURE__*/React.createElement(RevisionDiffViewer, {
     revisionContent: revisionContent,

package/package.json

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