@seafile/sdoc-editor 0.2.23-beta → 0.2.23-beta2

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

@@ -7,15 +7,15 @@ import { EXTERNAL_EVENT } from '../../constants';
 import { DateUtils } from '../../utils';
 import DraftDropdown from '../draft-dropdown';
 import RevisionAvatar from '../../assets/images/revision-avatar.png';
-import { useDocument } from '../../hooks';
+import { useConfig } from '../../hooks';
 import './index.css';
 var DocInfo = function DocInfo(_ref) {
   var t = _ref.t,
     isStarred = _ref.isStarred,
     isDraft = _ref.isDraft,
     isEditMode = _ref.isEditMode;
-  var _useDocument = useDocument(),
-    isPublished = _useDocument.isPublished;
+  var _useConfig = useConfig(),
+    isPublished = _useConfig.isPublished;
   var onInternalLinkClick = useCallback(function () {
     var eventBus = EventBus.getInstance();
     eventBus.dispatch(EXTERNAL_EVENT.INTERNAL_LINK_CLICK);
@@ -70,7 +70,7 @@ var DocInfo = function DocInfo(_ref) {
     className: "sdoc-revision-order"
   }, t('Revision') + ' ' + revisionId), isPublished && /*#__PURE__*/React.createElement("div", {
     className: "sdoc-revision-order"
-  }, t('Published')), /*#__PURE__*/React.createElement(TipMessage, {
+  }, t('Published')), !isPublished && /*#__PURE__*/React.createElement(TipMessage, {
     isEditMode: isEditMode
   })), /*#__PURE__*/React.createElement("div", {
     className: "doc-state"

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

@@ -9,7 +9,7 @@ import CommentsOperation from './comments-operation';
 import ShareOperation from './share-operation';
 import TagOperation from './tag-operation';
 import { isMobile } from '../../utils';
-import { useDocument } from '../../hooks';
+import { useConfig } from '../../hooks';
 import './style.css';
 var DocOperations = function DocOperations(_ref) {
   var isShowChanges = _ref.isShowChanges,
@@ -17,8 +17,8 @@ var DocOperations = function DocOperations(_ref) {
     handleViewChangesToggle = _ref.handleViewChangesToggle,
     handleRevisionPublished = _ref.handleRevisionPublished;
   var isSdocRevision = context.getSetting('isSdocRevision');
-  var _useDocument = useDocument(),
-    isPublished = _useDocument.isPublished;
+  var _useConfig = useConfig(),
+    isPublished = _useConfig.isPublished;
   if (isMobile) {
     return /*#__PURE__*/React.createElement("div", {
       className: "doc-ops"

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

@@ -4,7 +4,6 @@ import { EventBus } from '../../../basic-sdk';
 import { getRebase, hasConflict } from '../../../basic-sdk/utils/rebase';
 import context from '../../../context';
 import { EXTERNAL_EVENT, TIP_TYPE } from '../../../constants';
-import { useDocument } from '../../../hooks/use-document';
 import toaster from '../../toast';
 import TipDialog from '../../tip-dialog';
 import { useTranslation } from 'react-i18next';
@@ -13,6 +12,7 @@ import ViewChanges from './view-changes';
 import MoreRevisionOperations from './more-revision-operations';
 import Revisions from './revisions';
 import ChangesCount from './changes-count';
+import { useConfig, useDocument } from '../../../hooks';
 var RevisionOperations = function RevisionOperations(_ref) {
   var isShowChanges = _ref.isShowChanges,
     changes = _ref.changes,
@@ -25,7 +25,7 @@ var RevisionOperations = function RevisionOperations(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     isShowTip = _useState2[0],
     setShowTip = _useState2[1];
-  var _useState3 = useState(false),
+  var _useState3 = useState(''),
     _useState4 = _slicedToArray(_useState3, 2),
     tipType = _useState4[0],
     setTipType = _useState4[1];
@@ -34,9 +34,10 @@ var RevisionOperations = function RevisionOperations(_ref) {
     mergeValue = _useState6[0],
     setMergeValue = _useState6[1];
   var _useDocument = useDocument(),
-    loadDocument = _useDocument.loadDocument,
-    isPublished = _useDocument.isPublished,
-    setPublished = _useDocument.setPublished;
+    loadDocument = _useDocument.loadDocument;
+  var _useConfig = useConfig(),
+    isPublished = _useConfig.isPublished,
+    setPublished = _useConfig.setPublished;
   var onDocumentReplaced = useCallback(function () {
     if (isShowTip) return;
     setTipType(TIP_TYPE.HAS_BEEN_REPLACED);
@@ -123,7 +124,10 @@ var RevisionOperations = function RevisionOperations(_ref) {
       if (canMerge && isNeedReplaceMaster) {
         setTipType(TIP_TYPE.PUBLISHING);
         context.publishRevision().then(function (res) {
-          setTipType(TIP_TYPE.HAS_BEEN_PUBLISHED);
+          setShowTip(false);
+          setTipType('');
+          setPublished(true);
+          toaster.success(t('Revision published'));
         }).catch(function (error) {
           toaster.danger(t('Error'));
         });
@@ -146,7 +150,7 @@ var RevisionOperations = function RevisionOperations(_ref) {
       }
       toaster.danger(t('Error'));
     });
-  }, [loadDocument, t]);
+  }, [loadDocument, t, setPublished]);
 
   // confirm publish
   var onSubmit = useCallback(function () {

package/dist/hooks/index.js

@@ -1,3 +1,3 @@
-import { CollaboratorsProvider, useCollaborators } from './use-collaborators';
-import { useDocument } from './use-document';
-export { CollaboratorsProvider, useCollaborators, useDocument };
+export { CollaboratorsProvider, useCollaborators } from './use-collaborators';
+export { useDocument } from './use-document';
+export { ConfigContext, useConfig } from './use-config';

package/dist/hooks/use-config.js

@@ -1,2 +1,26 @@
-import { useCallback, useEffect, useState } from 'react';
-import context from '../context';
+import React, { useContext } from 'react';
+export var ConfigContext = React.createContext(null);
+
+// export const ConfigProvider = (props) => {
+//   const initIsPublished = context.getSetting('isPublished');
+//   const [isPublished, setPublished] = useState(initIsPublished);
+
+//   return (
+//     <ConfigContext.Provider value={{ isPublished, setPublished }}>
+//       {props.children}
+//     </ConfigContext.Provider>
+//   );
+// };
+
+export var useConfig = function useConfig() {
+  var context = useContext(ConfigContext);
+  if (!context) {
+    throw new Error('\'ConfigContext\' is null');
+  }
+  var isPublished = context.isPublished,
+    setPublished = context.setPublished;
+  return {
+    isPublished: isPublished,
+    setPublished: setPublished
+  };
+};

package/dist/hooks/use-document.js

@@ -3,6 +3,7 @@ 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],
@@ -23,10 +24,6 @@ export var useDocument = function useDocument() {
     _useState8 = _slicedToArray(_useState7, 2),
     errorMessage = _useState8[0],
     setErrorMessage = _useState8[1];
-  var _useState9 = useState(context.getSetting('isPublished')),
-    _useState10 = _slicedToArray(_useState9, 2),
-    isPublished = _useState10[0],
-    setPublished = _useState10[1];
   var loadDocument = useCallback(function () {
     return new Promise(function (resolve, reject) {
       context.getFileContent().then(function (res) {
@@ -85,8 +82,6 @@ export var useDocument = function useDocument() {
     errorMessage: errorMessage,
     document: document,
     loadDocument: loadDocument,
-    reloadDocument: reloadDocument,
-    isPublished: isPublished,
-    setPublished: setPublished
+    reloadDocument: reloadDocument
   };
 };

package/dist/pages/simple-editor.js

@@ -9,7 +9,7 @@ import context from '../context';
 import ErrorBoundary from './error-boundary';
 import { SDocEditor } from '../basic-sdk';
 import { PublishedRevisionDiffViewer, RevisionDiffViewer } from '../basic-sdk/views';
-import { useDocument } from '../hooks';
+import { useDocument, ConfigContext } from '../hooks';
 import { resetWebTitleAndURL } from '../utils';
 import '../assets/css/simple-editor.css';
 var SimpleEditor = function SimpleEditor(_ref) {
@@ -23,8 +23,7 @@ var SimpleEditor = function SimpleEditor(_ref) {
     isReloading = _useDocument.isReloading,
     errorMessage = _useDocument.errorMessage,
     document = _useDocument.document,
-    reloadDocument = _useDocument.reloadDocument,
-    isPublished = _useDocument.isPublished;
+    reloadDocument = _useDocument.reloadDocument;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     isShowChanges = _useState2[0],
@@ -37,6 +36,11 @@ var SimpleEditor = function SimpleEditor(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     changes = _useState6[0],
     setChanges = _useState6[1];
+  var initIsPublished = context.getSetting('isPublished');
+  var _useState7 = useState(initIsPublished),
+    _useState8 = _slicedToArray(_useState7, 2),
+    isPublished = _useState8[0],
+    setPublished = _useState8[1];
 
   // useMount: reset title
   useEffect(function () {
@@ -69,6 +73,11 @@ var SimpleEditor = function SimpleEditor(_ref) {
     editorRef.current.setSlateValue(value);
     editorRef.current.updateDocumentVersion(value);
   }, []);
+
+  // const setPublished = useCallback(() => {
+
+  // }, []);
+
   if (isFirstLoading) {
     return /*#__PURE__*/React.createElement(Loading, null);
   }
@@ -79,7 +88,12 @@ var SimpleEditor = function SimpleEditor(_ref) {
       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, {
+  return /*#__PURE__*/React.createElement(ErrorBoundary, null, /*#__PURE__*/React.createElement(Layout, null, /*#__PURE__*/React.createElement(Header, null, /*#__PURE__*/React.createElement(ConfigContext.Provider, {
+    value: {
+      isPublished: isPublished,
+      setPublished: setPublished
+    }
+  }, /*#__PURE__*/React.createElement(DocInfo, {
     isStarred: isStarred,
     isDraft: isDraft,
     isEditMode: isPublished ? false : !isShowChanges
@@ -88,7 +102,7 @@ var SimpleEditor = function SimpleEditor(_ref) {
     changes: changes,
     handleViewChangesToggle: handleViewChangesToggle,
     handleRevisionPublished: handleRevisionPublished
-  })), /*#__PURE__*/React.createElement(Content, null, isPublished && /*#__PURE__*/React.createElement(PublishedRevisionDiffViewer, {
+  }))), /*#__PURE__*/React.createElement(Content, null, isPublished && /*#__PURE__*/React.createElement(PublishedRevisionDiffViewer, {
     isShowChanges: isShowChanges,
     revisionContent: revisionContent,
     didMountCallback: setDiffChanges

package/package.json

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