@seafile/sdoc-editor 0.1.112 → 0.1.113

package/dist/pages/simple-editor.js

@@ -22,10 +22,10 @@ var SimpleEditor = function SimpleEditor(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     isFirstLoad = _useState2[0],
     setFirstLoad = _useState2[1];
-  var _useState3 = useState(false),
+  var _useState3 = useState(true),
     _useState4 = _slicedToArray(_useState3, 2),
-    isContextInit = _useState4[0],
-    setContextInit = _useState4[1];
+    isLoadingSdoc = _useState4[0],
+    setLoadingSdoc = _useState4[1];
   var _useState5 = useState(''),
     _useState6 = _slicedToArray(_useState5, 2),
     errorMessage = _useState6[0],
@@ -54,6 +54,7 @@ var SimpleEditor = function SimpleEditor(_ref) {
   }, []);
   var initDocumentData = useCallback(function (isFirstLoad) {
     setShowChanges(false);
+    setLoadingSdoc(true);
     context.getFileContent().then(function (res) {
       var result = res.data || generateDefaultDocContent();
       if (result && !result.children) {
@@ -64,21 +65,28 @@ var SimpleEditor = function SimpleEditor(_ref) {
         };
       }
       setDocument(result);
-      setContextInit(true);
+      setLoadingSdoc(false);
       isFirstLoad && setFirstLoad(false);
     }).catch(function (error) {
       // eslint-disable-next-line
       console.log(error);
       setErrorMessage('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');
+        }
+      }
       setDocument(null);
-      setContextInit(true);
-      isFirstLoad && setFirstLoad(false);
+      setLoadingSdoc(false);
     });
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   var initChangesData = useCallback(function () {
     setShowChanges(true);
+    setLoadingSdoc(true);
     context.getSeadocRevisionDownloadLinks().then(function (res) {
       var originFileDownloadLink = res.data.origin_file_download_link;
       return fetch(originFileDownloadLink);
@@ -87,10 +95,10 @@ var SimpleEditor = function SimpleEditor(_ref) {
     }).then(function (originContent) {
       setLastContent(originContent);
       setErrorMessage(null);
-      setContextInit(true);
+      setLoadingSdoc(false);
     }).catch(function (error) {
       setErrorMessage('Load_doc_content_error');
-      setContextInit(true);
+      setLoadingSdoc(false);
     });
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -102,7 +110,6 @@ var SimpleEditor = function SimpleEditor(_ref) {
         children: newestValue
       })));
     }
-    setContextInit(false);
     if (isShowChanges) {
       initChangesData();
       return;
@@ -111,13 +118,15 @@ var SimpleEditor = function SimpleEditor(_ref) {
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [document]);
-  if (isFirstLoad && !isContextInit) {
+  if (isFirstLoad && !errorMessage) {
     return /*#__PURE__*/React.createElement(Loading, null);
   }
   if (isFirstLoad && errorMessage) {
     return /*#__PURE__*/React.createElement("div", {
-      className: "d-flex justify-content-center"
-    }, t(errorMessage));
+      className: "error-page"
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "error-tip"
+    }, t(errorMessage)));
   }
   return /*#__PURE__*/React.createElement(ErrorBoundary, null, /*#__PURE__*/React.createElement(Layout, null, /*#__PURE__*/React.createElement(Header, null, /*#__PURE__*/React.createElement(DocInfo, {
     isStarred: isStarred,
@@ -126,11 +135,13 @@ var SimpleEditor = function SimpleEditor(_ref) {
   }), /*#__PURE__*/React.createElement(DocOperations, {
     isShowChanges: isShowChanges,
     toggleViewChanges: toggleViewChanges
-  })), /*#__PURE__*/React.createElement(Content, null, !isContextInit && /*#__PURE__*/React.createElement("div", {
+  })), /*#__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)), !isContextInit && errorMessage && /*#__PURE__*/React.createElement("div", {
-    className: "w-100 h-100 d-flex justify-content-center align-items-center"
-  }, t(errorMessage)), isContextInit && /*#__PURE__*/React.createElement(React.Fragment, null, isShowChanges ? /*#__PURE__*/React.createElement(DiffViewer, {
+  }, /*#__PURE__*/React.createElement(Loading, null)), !isLoadingSdoc && errorMessage && /*#__PURE__*/React.createElement("div", {
+    className: "error-page"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "error-tip"
+  }, t(errorMessage))), !isLoadingSdoc && /*#__PURE__*/React.createElement(React.Fragment, null, isShowChanges ? /*#__PURE__*/React.createElement(DiffViewer, {
     currentContent: currentContent,
     lastContent: lastContent
   }) : /*#__PURE__*/React.createElement(SDocEditor, {

package/package.json

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

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

@@ -276,6 +276,7 @@
   "Failed_to_execute_operation_on_server": "Failed to execute operation on server",
   "Start_revise_tip": "Create a temporary document and modify on it, merge it back after reviewing changes",
   "Load_doc_content_error": "Load doc content error",
+  "Sdoc_format_invalid": "The content of the document does not conform to the sdoc specification",
   "Draft": "Draft",
   "Unmark_as_draft": "Unmark as draft",
   "Background_color": "Background color",

package/public/locales/zh-CN/sdoc-editor.json

@@ -276,6 +276,7 @@
   "Failed_to_execute_operation_on_server": "无法在服务器上执行操作",
   "Start_revise_tip": "创建一个临时文档并对其进行修订，检查更改后将其合并回来",
   "Load_doc_content_error": "加载文档内容错误",
+  "Sdoc_format_invalid": "文档内容不符合 sdoc 规范",
   "Draft": "草稿",
   "Unmark_as_draft": "取消草稿标记",
   "Background_color": "背景色",