@seafile/sdoc-editor 0.2.11 → 0.2.13-beta

package/dist/api/seafile-api.js

@@ -110,6 +110,12 @@ var SeafileAPI = /*#__PURE__*/function () {
       var url = 'api/v2.1/seadoc/revision/base-version-content/' + docUuid + '/';
       return this.req.get(url);
     }
+  }, {
+    key: "getPublishedRevisionContent",
+    value: function getPublishedRevisionContent(docUuid) {
+      var url = 'api/v2.1/seadoc/revision/published-content/' + docUuid + '/';
+      return this.req.get(url);
+    }
 
     // local files
   }, {

package/dist/basic-sdk/extension/plugins/code-block/plugin.js

@@ -5,7 +5,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import slugid from 'slugid';
 import isHotkey from 'is-hotkey';
 import { Transforms, Node, Range, Editor } from '@seafile/slate';
-import { getNodeType, isLastNode, getSelectedNodeByType, generateEmptyElement } from '../../core';
+import { getNodeType, isLastNode, getSelectedNodeByType, generateEmptyElement, isSelectionAtBlockStart } from '../../core';
 import { deleteBackwardByLength } from './helpers';
 import { CODE_BLOCK, PARAGRAPH, CODE_LINE, BLOCKQUOTE } from '../../constants';
 var withCodeBlock = function withCodeBlock(editor) {
@@ -13,7 +13,8 @@ var withCodeBlock = function withCodeBlock(editor) {
     insertFragment = editor.insertFragment,
     insertText = editor.insertText,
     insertBreak = editor.insertBreak,
-    insertData = editor.insertData;
+    insertData = editor.insertData,
+    deleteBackward = editor.deleteBackward;
   var newEditor = editor;
 
   // If you enter two Spaces in quick succession, a period and a space appear （Default Settings for mac）
@@ -23,6 +24,13 @@ var withCodeBlock = function withCodeBlock(editor) {
     }
     return insertText(data);
   };
+  newEditor.deleteBackward = function (unit) {
+    var node = getSelectedNodeByType(editor, CODE_BLOCK);
+    if (node) {
+      if (isSelectionAtBlockStart(editor)) return;
+    }
+    deleteBackward(unit);
+  };
   newEditor.insertData = function (data) {
     // Paste a single code block element somewhere other than a code block
     if (data.types.includes('text/code-block') && !getSelectedNodeByType(editor, CODE_BLOCK)) {

package/dist/basic-sdk/index.js

@@ -1,5 +1,5 @@
 import SDocEditor from './editor/sdoc-editor';
-import { DiffViewer, SDocViewer } from './views';
+import { DiffViewer, SDocViewer, PublishedRevisionDiffViewer } from './views';
 import SDocOutline from './outline';
 import EventBus from './utils/event-bus';
-export { SDocEditor, SDocViewer, SDocOutline, EventBus, DiffViewer };
+export { SDocEditor, SDocViewer, SDocOutline, EventBus, DiffViewer, PublishedRevisionDiffViewer };

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

@@ -1,4 +1,5 @@
 import SDocViewer from './sdoc-viewer';
 import DiffViewer from './sdoc-diff-viewer';
 import RevisionDiffViewer from './revision-diff-viewer';
-export { SDocViewer, DiffViewer, RevisionDiffViewer };
+import PublishedRevisionDiffViewer from './published-revision-diff-viewer';
+export { SDocViewer, DiffViewer, RevisionDiffViewer, PublishedRevisionDiffViewer };

package/dist/basic-sdk/views/published-revision-diff-viewer.js

@@ -0,0 +1,56 @@
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import React, { useEffect, useState } from 'react';
+import context from '../../context';
+import { getDiff } from '../utils/diff';
+import SDocViewer from './sdoc-viewer';
+import Loading from '../../components/loading';
+import '../../assets/css/diff-viewer.css';
+var PublishedRevisionDiffViewer = function PublishedRevisionDiffViewer(_ref) {
+  var isShowChanges = _ref.isShowChanges,
+    revisionContent = _ref.revisionContent,
+    didMountCallback = _ref.didMountCallback;
+  var _useState = useState(true),
+    _useState2 = _slicedToArray(_useState, 2),
+    isLoading = _useState2[0],
+    setIsLoading = _useState2[1];
+  var _useState3 = useState(null),
+    _useState4 = _slicedToArray(_useState3, 2),
+    diff = _useState4[0],
+    setDiff = _useState4[1];
+  useEffect(function () {
+    setIsLoading(true);
+    if (isShowChanges) {
+      if (diff) {
+        setDiff(diff);
+        didMountCallback && didMountCallback(diff);
+        setIsLoading(false);
+        return;
+      }
+      context.getRevisionBaseVersionContent().then(function (res) {
+        var baseContentString = res.data.content;
+        var baseContent = JSON.parse(baseContentString);
+        var diff = getDiff(revisionContent, baseContent);
+        setDiff(diff);
+        didMountCallback && didMountCallback(diff);
+        setIsLoading(false);
+      }).catch(function (error) {
+        console.log('error');
+        setIsLoading(false);
+      });
+      return;
+    }
+    setDiff(null);
+    setIsLoading(false);
+  }, [revisionContent, didMountCallback, isShowChanges, diff]);
+  if (isLoading) {
+    return /*#__PURE__*/React.createElement(Loading, null);
+  }
+  return /*#__PURE__*/React.createElement(SDocViewer, {
+    showToolbar: true,
+    showOutline: true,
+    document: {
+      children: diff ? diff.value : revisionContent.children
+    }
+  });
+};
+export default PublishedRevisionDiffViewer;

package/dist/basic-sdk/views/sdoc-diff-viewer.js

@@ -7,9 +7,9 @@ var DiffViewer = function DiffViewer(_ref) {
   var currentContent = _ref.currentContent,
     lastContent = _ref.lastContent,
     didMountCallback = _ref.didMountCallback;
+  context.initApi();
   var diff = getDiff(currentContent, lastContent);
   useEffect(function () {
-    context.initApi();
     didMountCallback && didMountCallback(diff);
 
     // eslint-disable-next-line react-hooks/exhaustive-deps

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

@@ -78,7 +78,7 @@ var RevisionOperations = function RevisionOperations(_ref) {
 
   // solve show change view in revision editor
   var onViewChangesToggle = useCallback(function (isShowChanges) {
-    if (isShowChanges) {
+    if (!isPublished && 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
@@ -94,7 +94,7 @@ var RevisionOperations = function RevisionOperations(_ref) {
       return;
     }
     handleViewChangesToggle(isShowChanges);
-  }, [handleViewChangesToggle, loadDocument, t]);
+  }, [handleViewChangesToggle, loadDocument, t, isPublished]);
 
   // publish revision
   var publishRevision = useCallback(function () {

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

@@ -135,9 +135,10 @@ var RevisionsDialog = function RevisionsDialog(_ref) {
       updateRevisionsCount(newRevisions.length);
       setRevisions(newRevisions);
       closeDeleteTipDialog();
-      toaster.success(t('Delete_Successfully'));
+      toaster.success(t('Revision_deleted'));
     }).catch(function (error) {
-      toaster.danger(t('Delete_failed'));
+      var errorMessage = getErrorMsg(error);
+      toaster.danger(t(errorMessage));
     });
 
     // eslint-disable-next-line react-hooks/exhaustive-deps

package/dist/context.js

@@ -216,6 +216,12 @@ var Context = /*#__PURE__*/function () {
       var docUuid = this.getSetting('docUuid');
       return this.api.getRevisionBaseVersionContent(docUuid);
     }
+  }, {
+    key: "getPublishedRevisionContent",
+    value: function getPublishedRevisionContent() {
+      var docUuid = this.getSetting('docUuid');
+      return this.api.getPublishedRevisionContent(docUuid);
+    }
 
     // local files
   }, {

package/dist/index.js

@@ -3,4 +3,5 @@ import { EXTERNAL_EVENT } from './constants';
 import SimpleEditor from './pages/simple-editor';
 import SimpleViewer from './pages/simple-viewer';
 import DiffViewer from './pages/diff-viewer';
-export { SDocViewer, SimpleEditor, SimpleViewer, EventBus, EXTERNAL_EVENT, DiffViewer };
+import PublishedRevisionViewer from './pages/published-revision-viewer';
+export { SDocViewer, SimpleEditor, SimpleViewer, EventBus, EXTERNAL_EVENT, DiffViewer, PublishedRevisionViewer };

package/dist/pages/published-revision-viewer.js

@@ -0,0 +1,96 @@
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import React, { useCallback, useEffect, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import Loading from '../components/loading';
+import DocInfo from '../components/doc-info';
+import DocOperations from '../components/doc-operations';
+import Layout, { Header, Content } from '../layout';
+import context from '../context';
+import ErrorBoundary from './error-boundary';
+import { PublishedRevisionDiffViewer } from '../basic-sdk';
+import { resetWebTitleAndURL } from '../utils';
+import '../assets/css/simple-editor.css';
+var PublishedRevisionViewer = function PublishedRevisionViewer(_ref) {
+  var isStarred = _ref.isStarred,
+    isDraft = _ref.isDraft;
+  context.initApi();
+  var _useTranslation = useTranslation(),
+    t = _useTranslation.t;
+  var _useState = useState(true),
+    _useState2 = _slicedToArray(_useState, 2),
+    isFirstLoading = _useState2[0],
+    setIsFirstLoading = _useState2[1];
+  var _useState3 = useState(''),
+    _useState4 = _slicedToArray(_useState3, 2),
+    errorMessage = _useState4[0],
+    setErrorMessage = _useState4[1];
+  var _useState5 = useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    isShowChanges = _useState6[0],
+    setShowChanges = _useState6[1];
+  var _useState7 = useState([]),
+    _useState8 = _slicedToArray(_useState7, 2),
+    changes = _useState8[0],
+    setChanges = _useState8[1];
+  var _useState9 = useState({}),
+    _useState10 = _slicedToArray(_useState9, 2),
+    document = _useState10[0],
+    setDocument = _useState10[1];
+
+  // useMount: reset title
+  useEffect(function () {
+    resetWebTitleAndURL(t);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+  useEffect(function () {
+    context.getPublishedRevisionContent().then(function (res) {
+      var revisionContentString = res.data.content;
+      var document = JSON.parse(revisionContentString);
+      setDocument(document);
+      setIsFirstLoading(false);
+    }).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';
+        }
+      }
+      setErrorMessage(errorMessage);
+      setIsFirstLoading(false);
+    });
+  }, []);
+  var setDiffChanges = useCallback(function (diff) {
+    setChanges((diff === null || diff === void 0 ? void 0 : diff.changes) || []);
+  }, []);
+  var handleViewChangesToggle = useCallback(function (isShowChanges) {
+    setShowChanges(isShowChanges);
+  }, []);
+  if (isFirstLoading) {
+    return /*#__PURE__*/React.createElement(Loading, null);
+  }
+  if (errorMessage) {
+    return /*#__PURE__*/React.createElement("div", {
+      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,
+    isDraft: isDraft,
+    isEditMode: false
+  }), /*#__PURE__*/React.createElement(DocOperations, {
+    isShowChanges: isShowChanges,
+    changes: changes,
+    handleViewChangesToggle: handleViewChangesToggle
+  })), /*#__PURE__*/React.createElement(Content, null, /*#__PURE__*/React.createElement(PublishedRevisionDiffViewer, {
+    isShowChanges: isShowChanges,
+    revisionContent: document,
+    didMountCallback: setDiffChanges
+  }))));
+};
+export default PublishedRevisionViewer;

package/dist/pages/simple-editor.js

@@ -1,4 +1,3 @@
-import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { withTranslation } from 'react-i18next';
@@ -8,11 +7,10 @@ import DocOperations from '../components/doc-operations';
 import Layout, { Header, Content } from '../layout';
 import context from '../context';
 import ErrorBoundary from './error-boundary';
-import { REVISION_FIRST_LOAD_KEY, REVISION_FIRST_LOAD_VALUE } from '../constants';
-import toaster from '../components/toast';
 import { SDocEditor } from '../basic-sdk';
 import { RevisionDiffViewer } from '../basic-sdk/views';
 import { useDocument } from '../hooks/use-document';
+import { resetWebTitleAndURL } from '../utils';
 import '../assets/css/simple-editor.css';
 var SimpleEditor = function SimpleEditor(_ref) {
   var isStarred = _ref.isStarred,
@@ -41,40 +39,7 @@ var SimpleEditor = function SimpleEditor(_ref) {
 
   // 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);
-
-      // show revision created success info
-      var url = new URL(window.location.href);
-      var searchParams = new URLSearchParams(url.search);
-      if (!searchParams.has(REVISION_FIRST_LOAD_KEY)) return;
-      var firstLoadValue = searchParams.get(REVISION_FIRST_LOAD_KEY);
-      if (firstLoadValue === REVISION_FIRST_LOAD_VALUE) {
-        var revisionId = context.getSetting('revisionId');
-        toaster.success(t('Revision_created', {
-          id: revisionId
-        }));
-        searchParams.delete(REVISION_FIRST_LOAD_KEY);
-      }
-      var newParamsString = '';
-      var _iterator = _createForOfIteratorHelper(searchParams.entries()),
-        _step;
-      try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var item = _step.value;
-          newParamsString = newParamsString + "&".concat(item[0], "=").concat(item[1]);
-        }
-      } catch (err) {
-        _iterator.e(err);
-      } finally {
-        _iterator.f();
-      }
-      var newURL = "".concat(url.origin).concat(url.pathname).concat(newParamsString ? '/?' + newParamsString : '');
-      window.history.replaceState(null, null, newURL);
-    }
-
+    resetWebTitleAndURL(t);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   var setDiffChanges = useCallback(function (diff) {

package/dist/utils/index.js

@@ -1,5 +1,9 @@
+import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
 import DateUtils from './date-utils';
 import LocalStorage from './local-storage-utils';
+import context from '../context';
+import { REVISION_FIRST_LOAD_KEY, REVISION_FIRST_LOAD_VALUE } from '../constants';
+import toaster from '../components/toast';
 export var getDirPath = function getDirPath(path) {
   var dir = path.slice(0, path.lastIndexOf('/'));
   if (dir === '') {
@@ -45,4 +49,38 @@ export var isMac = function isMac() {
   return platform === 'Mac68K' || platform === 'MacPPC' || platform === 'Macintosh' || platform === 'MacIntel';
 };
 export var isMobile = typeof window !== 'undefined' && (window.innerWidth < 768 || navigator.userAgent.toLowerCase().match(/(ipod|ipad|iphone|android|coolpad|mmp|smartphone|midp|wap|xoom|symbian|j2me|blackberry|wince)/i) != null);
+export var resetWebTitleAndURL = function resetWebTitleAndURL(t) {
+  var isSdocRevision = context.getSetting('isSdocRevision');
+  var originFilename = context.getSetting('originFilename');
+  if (!isSdocRevision) return;
+  window.document.getElementsByTagName('title')[0].innerText = "".concat(t('Revision'), " - ").concat(originFilename);
+
+  // show revision created success info
+  var url = new URL(window.location.href);
+  var searchParams = new URLSearchParams(url.search);
+  if (!searchParams.has(REVISION_FIRST_LOAD_KEY)) return;
+  var firstLoadValue = searchParams.get(REVISION_FIRST_LOAD_KEY);
+  if (firstLoadValue === REVISION_FIRST_LOAD_VALUE) {
+    var revisionId = context.getSetting('revisionId');
+    toaster.success(t('Revision_created', {
+      id: revisionId
+    }));
+    searchParams.delete(REVISION_FIRST_LOAD_KEY);
+  }
+  var newParamsString = '';
+  var _iterator = _createForOfIteratorHelper(searchParams.entries()),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var item = _step.value;
+      newParamsString = newParamsString + "&".concat(item[0], "=").concat(item[1]);
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  var newURL = "".concat(url.origin).concat(url.pathname).concat(newParamsString ? '/?' + newParamsString : '');
+  window.history.replaceState(null, null, newURL);
+};
 export { DateUtils, LocalStorage };

package/package.json

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

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

@@ -385,6 +385,5 @@
   "Image_border": "Image border",
   "Delete_revision": "Delete revision",
   "Delete_tip": "Are you sure you want to delete {{content}} ?",
-  "Delete_Successfully": "Delete Successfully",
-  "Delete_failed": "Smazání se nezdařilo"
+  "Revision_deleted": "Revision deleted"
 }

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

@@ -385,6 +385,5 @@
   "Image_border": "Image border",
   "Delete_revision": "Delete revision",
   "Delete_tip": "Are you sure you want to delete {{content}} ?",
-  "Delete_Successfully": "Delete Successfully",
-  "Delete_failed": "Löschen fehlgeschlagen"
+  "Revision_deleted": "Revision deleted"
 }

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

@@ -385,6 +385,5 @@
   "Image_border": "Image border",
   "Delete_revision": "Delete revision",
   "Delete_tip": "Are you sure you want to delete {{content}} ?",
-  "Delete_Successfully": "Delete Successfully",
-  "Delete_failed": "Delete failed"
+  "Revision_deleted": "Revision deleted"
 }

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

@@ -385,6 +385,5 @@
   "Image_border": "Image border",
   "Delete_revision": "Delete revision",
   "Delete_tip": "Are you sure you want to delete {{content}} ?",
-  "Delete_Successfully": "Delete Successfully",
-  "Delete_failed": "Eliminar falló"
+  "Revision_deleted": "Revision deleted"
 }

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

@@ -385,6 +385,5 @@
   "Image_border": "Image border",
   "Delete_revision": "Delete revision",
   "Delete_tip": "Are you sure you want to delete {{content}} ?",
-  "Delete_Successfully": "Delete Successfully",
-  "Delete_failed": "Échec de la suppression"
+  "Revision_deleted": "Revision deleted"
 }

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

@@ -385,6 +385,5 @@
   "Image_border": "Image border",
   "Delete_revision": "Delete revision",
   "Delete_tip": "Are you sure you want to delete {{content}} ?",
-  "Delete_Successfully": "Delete Successfully",
-  "Delete_failed": "Rimozione fallita"
+  "Revision_deleted": "Revision deleted"
 }

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

@@ -383,8 +383,7 @@
   "Block": "Блок",
   "Full_screen_mode": "Полноэкранный режим",
   "Image_border": "Граница изображения",
-  "Delete_revision": "Delete revision",
-  "Delete_tip": "Are you sure you want to delete {{content}} ?",
-  "Delete_Successfully": "Delete Successfully",
-  "Delete_failed": "Не удалось удалить"
+  "Delete_revision": "Удалить редакцию",
+  "Delete_tip": "Вы уверены, что хотите удалить {{content}} ?",
+  "Revision_deleted": "Revision deleted"
 }

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

@@ -385,6 +385,5 @@
   "Image_border": "图片边框",
   "Delete_revision": "删除修订稿",
   "Delete_tip": "确定要删除 {{content}} 吗？",
-  "Delete_Successfully": "删除成功",
-  "Delete_failed": "删除失败"
+  "Revision_deleted": "修订稿已删除"
 }