@seafile/sdoc-editor 0.1.111 → 0.1.113

package/dist/basic-sdk/extension/plugins/font/menu/font-family/index.css

@@ -1,18 +1,34 @@
 .menu-group .menu-group-item.sdoc-menu-with-dropdown.sdoc-font-family-menu {
-  width: 70px;
-  max-width: 70px;
+  width: 76px;
+  max-width: 76px;
+}
+
+.menu-group .menu-group-item.sdoc-menu-with-dropdown.sdoc-font-family-menu.disabled {
+  width: 70px !important;
 }
 
 .sdoc-font-family-menu .sdoc-menu-with-dropdown-icon,
 .sdoc-font-family-menu .sdoc-menu-with-dropdown-icon div {
-  width: 58px;
+  width: 64px;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
+  font-size: 14px;
 }
 
 .sdoc-font-family-menu .sdoc-menu-with-dropdown-icon div {
   padding-left: 5px;
+  color: #212529;
+}
+
+.menu-group .menu-group-item.sdoc-menu-with-dropdown.sdoc-font-family-menu.disabled .sdoc-menu-with-dropdown-icon {
+  width: 70px !important;
+}
+
+.menu-group .menu-group-item.sdoc-menu-with-dropdown.sdoc-font-family-menu.disabled .sdoc-menu-with-dropdown-icon div {
+  padding-right: 5px;
+  width: 70px;
+  color: #BDBDBD;
 }
 
 /* sdoc-font-family-menu-popover */
@@ -20,5 +36,5 @@
   padding: 8px 10px;
   color: gray;
   cursor: default;
-  font-size: 12px;
+  font-size: 14px;
 }

package/dist/basic-sdk/extension/plugins/font/menu/font-size/index.css

@@ -9,10 +9,17 @@
 .menu-group .sdoc-font-size-menu .sdoc-menu-with-dropdown-icon,
 .menu-group .sdoc-font-size-menu .sdoc-menu-with-dropdown-icon div {
   width: 34px;
+  font-size: 14px;
 }
 
 .menu-group .sdoc-font-size-menu .sdoc-menu-with-dropdown-icon div {
   padding-left: 5px;
+  color: #212529;
+}
+
+.menu-group .sdoc-menu-with-dropdown.sdoc-font-size-menu.disabled .sdoc-menu-with-dropdown-icon div {
+  padding-right: 5px;
+  color: #BDBDBD;
 }
 
 .sdoc-font-size-menu-popover .sdoc-dropdown-menu-item .sdoc-check-mark {
@@ -30,5 +37,5 @@
 }
 
 .sdoc-font-size-menu-popover .sdoc-dropdown-menu-item {
-  font-size: 12px;
+  font-size: 14px;
 }

package/dist/basic-sdk/extension/plugins/header/menu/style.css

@@ -15,14 +15,16 @@
   align-items: center;
   padding-left: 5px;
   height: 24px;
+  cursor: pointer;
 }
 
 .header-menu .header-toggle .active {
-  font-size: 12px;
+  font-size: 14px;
 }
 
 .header-menu .header-toggle-disabled {
-  color: #BdBDBD;
+  color: #BDBDBD;
+  cursor: unset;
 }
 
 .header-menu .header-toggle:not(.header-toggle-disabled):hover {
@@ -58,5 +60,5 @@
 }
 
 .header-menu .header-popover .sdoc-dropdown-menu-item {
-  font-size: 12px;
+  font-size: 14px;
 }

package/dist/basic-sdk/extension/plugins/table/menu/active-table-menu/index.css

@@ -15,5 +15,5 @@
 }
 
 .sdoc-table-menu-popover .sdoc-dropdown-menu-item {
-  font-size: 12px;
+  font-size: 14px;
 }

package/dist/components/doc-operations/revision-operations/revisions/revisions-dialog/index.css

@@ -61,6 +61,7 @@
 }
 
 .revisions-dialog .revisions-body .sdoc-revision:hover {
+  cursor: pointer;
   background-color: #f5f5f5;
 }
 
@@ -92,13 +93,6 @@
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
-
-}
-
-.revisions-dialog .sdoc-revision .sdoc-revision-name-content:hover {
-  text-decoration: underline;
-  cursor: pointer;
-  color: #ff8000;
 }
 
 .revisions-dialog .sdoc-revision .sdoc-revision-time {

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

@@ -133,17 +133,17 @@ var RevisionsDialog = function RevisionsDialog(_ref) {
     }, revisions.map(function (revision) {
       return /*#__PURE__*/React.createElement("div", {
         className: "sdoc-revision",
-        key: revision.id
+        key: revision.id,
+        onClick: function onClick() {
+          return openRevision(revision.id);
+        }
       }, /*#__PURE__*/React.createElement("div", {
         className: "sdoc-revision-name",
         style: {
           width: '40%'
         }
       }, /*#__PURE__*/React.createElement("div", {
-        className: "sdoc-revision-name-content",
-        onClick: function onClick() {
-          return openRevision(revision.id);
-        }
+        className: "sdoc-revision-name-content"
       }, t('Revision') + ' ' + revision.id)), /*#__PURE__*/React.createElement("div", {
         className: "sdoc-revision-user",
         style: {

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.111",
+  "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": "背景色",