@seafile/sdoc-editor 0.2.13-beta3 → 0.2.13

package/dist/api/seafile-api.js

@@ -110,12 +110,6 @@ 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/index.js

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

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

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

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

@@ -48,7 +48,6 @@ var DocInfo = function DocInfo(_ref) {
   var revisionCreatedAt = context.getSetting('revisionCreatedAt');
   var oldDocName = context.getSetting('originFilename');
   var revisionId = context.getSetting('revisionId');
-  var isPublished = context.getSetting('isPublished');
   return /*#__PURE__*/React.createElement("div", {
     className: "doc-info d-flex flex-column align-items-start"
   }, /*#__PURE__*/React.createElement("div", {
@@ -57,9 +56,7 @@ var DocInfo = function DocInfo(_ref) {
     className: "doc-name"
   }, oldDocName), /*#__PURE__*/React.createElement("div", {
     className: "sdoc-revision-order"
-  }, t('Revision') + ' ' + revisionId), isPublished && /*#__PURE__*/React.createElement("div", {
-    className: "sdoc-revision-order"
-  }, t('Published')), /*#__PURE__*/React.createElement(TipMessage, {
+  }, t('Revision') + ' ' + revisionId), /*#__PURE__*/React.createElement(TipMessage, {
     isEditMode: isEditMode
   })), /*#__PURE__*/React.createElement("div", {
     className: "doc-state"

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

@@ -15,7 +15,6 @@ var DocOperations = function DocOperations(_ref) {
     handleViewChangesToggle = _ref.handleViewChangesToggle,
     handleRevisionPublished = _ref.handleRevisionPublished;
   var isSdocRevision = context.getSetting('isSdocRevision');
-  var isPublished = context.getSetting('isPublished');
   if (isMobile) {
     return /*#__PURE__*/React.createElement("div", {
       className: "doc-ops"
@@ -28,6 +27,6 @@ var DocOperations = function DocOperations(_ref) {
     changes: changes,
     handleViewChangesToggle: handleViewChangesToggle,
     handleRevisionPublished: handleRevisionPublished
-  }), !isPublished && /*#__PURE__*/React.createElement(CommentsOperation, null), !isSdocRevision && /*#__PURE__*/React.createElement(ShareOperation, null), /*#__PURE__*/React.createElement(HistoryOperation, null), !isPublished && /*#__PURE__*/React.createElement(CollaboratorsOperation, null), !isSdocRevision && /*#__PURE__*/React.createElement(MoreOperations, null));
+  }), /*#__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

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

package/dist/context.js

@@ -216,12 +216,6 @@ 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/hooks/use-document.js

@@ -2,8 +2,6 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { useCallback, useEffect, useState } from 'react';
 import context from '../context';
 export var useDocument = function useDocument() {
-  var isSdocRevision = context.getSetting('isSdocRevision');
-  var isPublished = context.getSetting('isPublished');
   var _useState = useState(true),
     _useState2 = _slicedToArray(_useState, 2),
     isFirstLoading = _useState2[0],
@@ -60,7 +58,6 @@ export var useDocument = function useDocument() {
     });
   }, [loadDocument]);
   useEffect(function () {
-    if (isSdocRevision && isPublished) return;
     loadDocument().then(function (document) {
       setDocument(document);
       setIsFirstLoading(false);

package/dist/index.js

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

package/dist/pages/simple-editor.js

@@ -1,3 +1,4 @@
+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';
@@ -7,10 +8,11 @@ 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,
@@ -39,7 +41,40 @@ var SimpleEditor = function SimpleEditor(_ref) {
 
   // useMount: reset title
   useEffect(function () {
-    resetWebTitleAndURL(t);
+    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);
+    }
+
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   var setDiffChanges = useCallback(function (diff) {

package/dist/utils/index.js

@@ -1,9 +1,5 @@
-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 === '') {
@@ -49,38 +45,4 @@ 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,11 +1,12 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "0.2.13beta3",
+  "version": "0.2.13",
   "private": false,
   "description": "This is a sdoc editor",
   "main": "dist/index.js",
   "dependencies": {
     "@seafile/react-image-lightbox": "2.0.4",
+    "@seafile/sdoc-editor": "0.2.12",
     "@seafile/slate": "0.91.8",
     "@seafile/slate-history": "0.86.2",
     "@seafile/slate-hyperscript": "0.81.7",

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}} ?",
-  "Revision_deleted": "Revision deleted",
-  "Published": "Published"
+  "Revision_deleted": "Revision deleted"
 }

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

@@ -1,59 +0,0 @@
-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) {
-        didMountCallback && didMountCallback(diff);
-        setTimeout(function () {
-          setIsLoading(false);
-        }, 1);
-        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;
-    }
-    setTimeout(function () {
-      setIsLoading(false);
-    }, 1);
-  }, [revisionContent, didMountCallback, isShowChanges, diff]);
-  if (isLoading) {
-    return /*#__PURE__*/React.createElement(Loading, null);
-  }
-  var document = {
-    children: isShowChanges && (diff === null || diff === void 0 ? void 0 : diff.value) || revisionContent.children
-  };
-  return /*#__PURE__*/React.createElement(SDocViewer, {
-    showToolbar: true,
-    showOutline: true,
-    document: document
-  });
-};
-export default PublishedRevisionDiffViewer;

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

@@ -1,92 +0,0 @@
-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() {
-  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 _ref = error.response.data || {},
-          error_type = _ref.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, {
-    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;