@seafile/sdoc-editor 1.0.119 → 1.0.121

package/dist/basic-sdk/comment/components/comment-operation/index.css

@@ -0,0 +1,14 @@
+.sdoc-notification-count {
+  position: absolute;
+  color: #fff;
+  font-size: 12px;
+  top: -7px;
+  right: -10px;
+  padding: 2px;
+  background: #fc6440;
+  border-radius: 50%;
+  min-width: 20px;
+  min-height: 20px;
+  transform: scale(.7);
+  text-align: center;
+}

package/dist/basic-sdk/comment/components/comment-operation/index.js

@@ -0,0 +1,32 @@
+"use strict";
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = CommentsOperation;
+var _react = _interopRequireWildcard(require("react"));
+var _ = require("../../..");
+var _constants = require("../../../constants");
+require("./index.css");
+function CommentsOperation() {
+  const [unseenNotificationsCount, setUnseenNotificationsCount] = (0, _react.useState)(0);
+  const updateUnseenNotificationsCount = (0, _react.useCallback)(count => {
+    console.log(count);
+    setUnseenNotificationsCount(count);
+  }, []);
+  (0, _react.useEffect)(() => {
+    const eventBus = _.EventBus.getInstance();
+    const unsubscribeUnseenNotificationsCount = eventBus.subscribe(_constants.INTERNAL_EVENT.UNSEEN_NOTIFICATIONS_COUNT, updateUnseenNotificationsCount);
+    return () => {
+      unsubscribeUnseenNotificationsCount();
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+  console.log(unseenNotificationsCount);
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("i", {
+    className: "sdocfont sdoc-comments"
+  }), unseenNotificationsCount > 0 && /*#__PURE__*/_react.default.createElement("span", {
+    className: "sdoc-notification-count"
+  }, unseenNotificationsCount));
+}

package/dist/basic-sdk/comment/hooks/use-participants.js

@@ -1,96 +1,12 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useParticipantsContext = exports.ParticipantsProvider = void 0;
+exports.useParticipantsContext = exports.ParticipantsContext = void 0;
 var _react = _interopRequireWildcard(require("react"));
-var _reactI18next = require("react-i18next");
-var _context = _interopRequireDefault(require("../../../context"));
-var _model = require("../../../model");
-var _toast = _interopRequireDefault(require("../../../components/toast"));
-var _utils = require("../../../utils");
-var _basicSdk = require("../../../basic-sdk");
-var _constants = require("../../../constants");
-const ParticipantsContext = /*#__PURE__*/_react.default.createContext(null);
-const ParticipantsProvider = props => {
-  const isSdocRevision = _context.default.getSetting('isSdocRevision');
-  const isPublished = _context.default.getSetting('isPublished');
-  const [participants, setParticipants] = (0, _react.useState)([]);
-  const {
-    t
-  } = (0, _reactI18next.useTranslation)();
-  const updateLocalParticipants = (0, _react.useCallback)(function () {
-    let added = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-    if (!Array.isArray(added) || added.length === 0) return;
-    let newParticipants = participants.slice(0);
-    added.forEach(participant => {
-      const newParticipant = new _model.User(participant);
-      if (!newParticipants.find(item => item.username === newParticipant.username)) {
-        newParticipants.push(newParticipant);
-      }
-    });
-    setParticipants(newParticipants);
-  }, [participants]);
-  const addParticipants = (0, _react.useCallback)(otherEmail => {
-    if (participants.find(participant => participant.username === otherEmail)) return;
-    _context.default.addParticipants([otherEmail]).then(res => {
-      const {
-        success
-      } = res.data;
-      updateLocalParticipants(success);
-    }).catch(error => {
-      const errorMessage = (0, _utils.getErrorMsg)(error);
-      _toast.default.danger(t(errorMessage));
-    });
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [updateLocalParticipants, participants]);
-  const deleteLocalParticipant = (0, _react.useCallback)(email => {
-    if (!participants.find(participant => participant.username === email)) return;
-    let newParticipants = participants.slice(0);
-    newParticipants = newParticipants.filter(participant => participant.username !== email);
-    setParticipants(newParticipants);
-  }, [participants]);
-  const deleteParticipant = (0, _react.useCallback)(email => {
-    if (!participants.find(participant => participant.username === email)) return;
-    _context.default.deleteParticipants(email).then(res => {
-      let newParticipants = participants.slice(0);
-      newParticipants = newParticipants.filter(participant => participant.username !== email);
-      setParticipants(newParticipants);
-    }).catch(error => {
-      const errorMessage = (0, _utils.getErrorMsg)(error);
-      _toast.default.danger(t(errorMessage));
-    });
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [participants]);
-  (0, _react.useEffect)(() => {
-    if (isSdocRevision && isPublished) return;
-    _context.default.listParticipants().then(res => {
-      const participants = res.data.participant_list;
-      updateLocalParticipants(participants);
-    }).catch(error => {});
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-  (0, _react.useEffect)(() => {
-    const eventBus = _basicSdk.EventBus.getInstance();
-    const unsubscribeParticipantAdded = eventBus.subscribe(_constants.EXTERNAL_EVENT.PARTICIPANT_ADDED, updateLocalParticipants);
-    const unsubscribeParticipantRemoved = eventBus.subscribe(_constants.EXTERNAL_EVENT.PARTICIPANT_REMOVED, deleteLocalParticipant);
-    return () => {
-      unsubscribeParticipantAdded();
-      unsubscribeParticipantRemoved();
-    };
-  }, [updateLocalParticipants, deleteLocalParticipant]);
-  return /*#__PURE__*/_react.default.createElement(ParticipantsContext.Provider, {
-    value: {
-      participants,
-      addParticipants,
-      deleteParticipant
-    }
-  }, props.children);
-};
-exports.ParticipantsProvider = ParticipantsProvider;
+const ParticipantsContext = exports.ParticipantsContext = /*#__PURE__*/_react.default.createContext(null);
 const useParticipantsContext = () => {
   const context = (0, _react.useContext)(ParticipantsContext);
   if (!context) {

package/dist/basic-sdk/comment/provider/index.js

@@ -8,6 +8,7 @@ exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _commentContextProvider = _interopRequireDefault(require("./comment-context-provider"));
 var _notificationContextProvider = _interopRequireDefault(require("./notification-context-provider"));
+var _participantsContentProvider = _interopRequireDefault(require("./participants-content-provider"));
 const Provider = _ref => {
   let {
     children,
@@ -17,6 +18,6 @@ const Provider = _ref => {
     editor: editor
   }, /*#__PURE__*/_react.default.createElement(_commentContextProvider.default, {
     editor: editor
-  }, children));
+  }, /*#__PURE__*/_react.default.createElement(_participantsContentProvider.default, null, children)));
 };
 var _default = exports.default = Provider;

package/dist/basic-sdk/comment/provider/participants-content-provider.js

@@ -0,0 +1,96 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _react = _interopRequireWildcard(require("react"));
+var _reactI18next = require("react-i18next");
+var _context = _interopRequireDefault(require("../../../context"));
+var _model = require("../../../model");
+var _toast = _interopRequireDefault(require("../../../components/toast"));
+var _utils = require("../../../utils");
+var _basicSdk = require("../../../basic-sdk");
+var _constants = require("../../../constants");
+var _useParticipants = require("../hooks/use-participants");
+const ParticipantsProvider = _ref => {
+  let {
+    children
+  } = _ref;
+  const isSdocRevision = _context.default.getSetting('isSdocRevision');
+  const isPublished = _context.default.getSetting('isPublished');
+  const [participants, setParticipants] = (0, _react.useState)([]);
+  const {
+    t
+  } = (0, _reactI18next.useTranslation)();
+  const updateLocalParticipants = (0, _react.useCallback)(function () {
+    let added = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+    if (!Array.isArray(added) || added.length === 0) return;
+    let newParticipants = participants.slice(0);
+    added.forEach(participant => {
+      const newParticipant = new _model.User(participant);
+      if (!newParticipants.find(item => item.username === newParticipant.username)) {
+        newParticipants.push(newParticipant);
+      }
+    });
+    setParticipants(newParticipants);
+  }, [participants]);
+  const addParticipants = (0, _react.useCallback)(otherEmail => {
+    if (participants.find(participant => participant.username === otherEmail)) return;
+    _context.default.addParticipants([otherEmail]).then(res => {
+      const {
+        success
+      } = res.data;
+      updateLocalParticipants(success);
+    }).catch(error => {
+      const errorMessage = (0, _utils.getErrorMsg)(error);
+      _toast.default.danger(t(errorMessage));
+    });
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [updateLocalParticipants, participants]);
+  const deleteLocalParticipant = (0, _react.useCallback)(email => {
+    if (!participants.find(participant => participant.username === email)) return;
+    let newParticipants = participants.slice(0);
+    newParticipants = newParticipants.filter(participant => participant.username !== email);
+    setParticipants(newParticipants);
+  }, [participants]);
+  const deleteParticipant = (0, _react.useCallback)(email => {
+    if (!participants.find(participant => participant.username === email)) return;
+    _context.default.deleteParticipants(email).then(res => {
+      let newParticipants = participants.slice(0);
+      newParticipants = newParticipants.filter(participant => participant.username !== email);
+      setParticipants(newParticipants);
+    }).catch(error => {
+      const errorMessage = (0, _utils.getErrorMsg)(error);
+      _toast.default.danger(t(errorMessage));
+    });
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [participants]);
+  (0, _react.useEffect)(() => {
+    if (isSdocRevision && isPublished) return;
+    _context.default.listParticipants().then(res => {
+      const participants = res.data.participant_list;
+      updateLocalParticipants(participants);
+    }).catch(error => {});
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+  (0, _react.useEffect)(() => {
+    const eventBus = _basicSdk.EventBus.getInstance();
+    const unsubscribeParticipantAdded = eventBus.subscribe(_constants.EXTERNAL_EVENT.PARTICIPANT_ADDED, updateLocalParticipants);
+    const unsubscribeParticipantRemoved = eventBus.subscribe(_constants.EXTERNAL_EVENT.PARTICIPANT_REMOVED, deleteLocalParticipant);
+    return () => {
+      unsubscribeParticipantAdded();
+      unsubscribeParticipantRemoved();
+    };
+  }, [updateLocalParticipants, deleteLocalParticipant]);
+  return /*#__PURE__*/_react.default.createElement(_useParticipants.ParticipantsContext.Provider, {
+    value: {
+      participants,
+      addParticipants,
+      deleteParticipant
+    }
+  }, children);
+};
+var _default = exports.default = ParticipantsProvider;

package/dist/basic-sdk/editor/sdoc-editor.js

@@ -31,8 +31,7 @@ const SdocEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
     isReloading,
     showComment,
     isShowHeaderToolbar = true,
-    showOutline = true,
-    plugins = []
+    showOutline = true
   } = _ref;
   const validEditor = (0, _react.useMemo)(() => {
     if (propsEditor) return propsEditor;

package/dist/basic-sdk/layout/editor-content.js

@@ -11,7 +11,6 @@ var _useScrollContext = require("../hooks/use-scroll-context");
 var _outline = _interopRequireDefault(require("../outline"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _provider = _interopRequireDefault(require("../comment/provider"));
-var _useParticipants = require("../comment/hooks/use-participants");
 var _rightPanel = _interopRequireDefault(require("../right-panel"));
 const EditorContent = _ref => {
   let {
@@ -34,7 +33,14 @@ const EditorContent = _ref => {
     'readonly': readonly,
     'no-outline': !showOutline
   });
-  const dom = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
+
+  // If you don't display comment, use Fragment to replace CommentProvider
+  const AboutCommentProvider = showComment ? _provider.default : _react.Fragment;
+  return /*#__PURE__*/_react.default.createElement(AboutCommentProvider, showComment && {
+    editor
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: "sdoc-content-wrapper"
+  }, /*#__PURE__*/_react.default.createElement("div", {
     ref: scrollRef,
     className: "sdoc-scroll-container",
     onScroll: onWrapperScroll,
@@ -50,17 +56,7 @@ const EditorContent = _ref => {
     doc: docValue
   }), children))), /*#__PURE__*/_react.default.createElement(_rightPanel.default, {
     editor: editor
-  }));
-  if (!showComment) {
-    return /*#__PURE__*/_react.default.createElement("div", {
-      className: "sdoc-content-wrapper"
-    }, dom);
-  }
-  return /*#__PURE__*/_react.default.createElement("div", {
-    className: "sdoc-content-wrapper"
-  }, /*#__PURE__*/_react.default.createElement(_provider.default, {
-    editor: editor
-  }, /*#__PURE__*/_react.default.createElement(_useParticipants.ParticipantsProvider, null, dom)));
+  })));
 };
 EditorContent.defaultProps = {
   readonly: false,

package/dist/hooks/use-plugins.js

@@ -9,6 +9,7 @@ exports.usePlugins = exports.PluginsProvider = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _constants = require("../basic-sdk/constants");
 var _comment = _interopRequireDefault(require("../basic-sdk/comment"));
+var _commentOperation = _interopRequireDefault(require("../basic-sdk/comment/components/comment-operation"));
 const PluginsContext = /*#__PURE__*/_react.default.createContext(null);
 const PluginsProvider = _ref => {
   let {
@@ -25,7 +26,7 @@ const PluginsProvider = _ref => {
     if (showComment) {
       allPlugins.push({
         name: 'sdoc-comment',
-        icon: 'sdoc-comments',
+        icon: /*#__PURE__*/_react.default.createElement(_commentOperation.default, null),
         resizable_width: true,
         display_type: _constants.PLUGIN_DISPLAY_TYPE.RIGHT_PANEL,
         component: _comment.default

package/dist/pages/simple-editor.js

@@ -106,31 +106,14 @@ const SimpleEditor = _ref => {
       setPublished(true);
     });
   }, [setErrorMessage]);
-  const renderEditor = (0, _react.useCallback)(() => {
-    if (!isSdocRevision) {
-      return /*#__PURE__*/_react.default.createElement(_basicSdk.SDocEditor, {
-        ref: editorRef,
-        isReloading: isReloading,
-        document: document,
-        showComment: showComment
-      });
-    }
-    if (isPublished) {
-      return /*#__PURE__*/_react.default.createElement(_views.PublishedRevisionDiffViewer, {
-        isShowChanges: isShowChanges,
-        revisionContent: revisionContent,
-        didMountCallback: setDiffChanges
-      });
-    }
-    return /*#__PURE__*/_react.default.createElement(_basicSdk.RevisionEditor, {
-      ref: editorRef,
-      isShowChanges: isShowChanges,
-      isReloading: isReloading,
-      document: document,
-      revisionContent: revisionContent,
-      didMountCallback: setDiffChanges
-    });
-  }, [isSdocRevision, isPublished, isShowChanges, isReloading, document, revisionContent, setDiffChanges, showComment]);
+  const docOperationsProps = {
+    isPublished,
+    isShowChanges,
+    changes,
+    handleViewChangesToggle,
+    handleRevisionMerged,
+    handleRevisionPublished
+  };
   if (isFirstLoading) {
     return /*#__PURE__*/_react.default.createElement(_loading.default, null);
   }
@@ -151,13 +134,22 @@ const SimpleEditor = _ref => {
     isDraft: isDraft,
     isPublished: isPublished,
     isEditMode: isPublished ? false : !isShowChanges
-  }), showDocOperations && /*#__PURE__*/_react.default.createElement(_docOperations.default, {
+  }), showDocOperations && /*#__PURE__*/_react.default.createElement(_docOperations.default, docOperationsProps)), /*#__PURE__*/_react.default.createElement(_layout.Content, null, !isSdocRevision && /*#__PURE__*/_react.default.createElement(_basicSdk.SDocEditor, {
+    ref: editorRef,
+    isReloading: isReloading,
+    document: document,
+    showComment: showComment
+  }), isSdocRevision && !isPublished && /*#__PURE__*/_react.default.createElement(_basicSdk.RevisionEditor, {
+    ref: editorRef,
+    isReloading: isReloading,
+    document: document,
+    revisionContent: revisionContent,
     isShowChanges: isShowChanges,
-    isPublished: isPublished,
-    changes: changes,
-    handleViewChangesToggle: handleViewChangesToggle,
-    handleRevisionMerged: handleRevisionMerged,
-    handleRevisionPublished: handleRevisionPublished
-  })), /*#__PURE__*/_react.default.createElement(_layout.Content, null, renderEditor())))));
+    didMountCallback: setDiffChanges
+  }), isSdocRevision && isPublished && /*#__PURE__*/_react.default.createElement(_views.PublishedRevisionDiffViewer, {
+    revisionContent: revisionContent,
+    isShowChanges: isShowChanges,
+    didMountCallback: setDiffChanges
+  }))))));
 };
 var _default = exports.default = (0, _reactI18next.withTranslation)('sdoc-editor')(SimpleEditor);

package/dist/pages/simple-viewer.js

@@ -66,27 +66,12 @@ class SimpleViewer extends _react.default.Component {
       sharePermissionText,
       downloadURL
     } = _context.default.getSettings();
-    if (_utils.isMobile) {
-      return /*#__PURE__*/_react.default.createElement(_errorBoundary.default, null, /*#__PURE__*/_react.default.createElement(_layout.default, null, /*#__PURE__*/_react.default.createElement(_layout.Header, null, /*#__PURE__*/_react.default.createElement("div", {
-        className: "doc-info"
-      }, /*#__PURE__*/_react.default.createElement("h2", {
-        className: "doc-name my-0"
-      }, docName), sharePermissionText && /*#__PURE__*/_react.default.createElement("span", {
-        className: "sdoc-share-permission ml-2"
-      }, sharePermissionText)), /*#__PURE__*/_react.default.createElement("div", {
-        className: "doc-ops"
-      }, downloadURL && /*#__PURE__*/_react.default.createElement("a", {
-        href: downloadURL,
-        className: "op-item"
-      }, /*#__PURE__*/_react.default.createElement("i", {
-        className: "sdocfont sdoc-download"
-      })))), /*#__PURE__*/_react.default.createElement(_layout.Content, null, /*#__PURE__*/_react.default.createElement(_basicSdk.SDocViewer, {
-        document: document,
-        showToolbar: false,
-        showOutline: false,
-        showComment: false
-      }))));
-    }
+    const sdocViewProps = {
+      document: document,
+      showToolbar: _utils.isMobile ? false : true,
+      showOutline: _utils.isMobile ? false : true,
+      showComment: false
+    };
     return /*#__PURE__*/_react.default.createElement(_errorBoundary.default, null, /*#__PURE__*/_react.default.createElement(_layout.default, null, /*#__PURE__*/_react.default.createElement(_layout.Header, null, /*#__PURE__*/_react.default.createElement("div", {
       className: "doc-info"
     }, /*#__PURE__*/_react.default.createElement("h2", {
@@ -100,12 +85,7 @@ class SimpleViewer extends _react.default.Component {
       className: "op-item"
     }, /*#__PURE__*/_react.default.createElement("i", {
       className: "sdocfont sdoc-download"
-    })))), /*#__PURE__*/_react.default.createElement(_layout.Content, null, /*#__PURE__*/_react.default.createElement(_basicSdk.SDocViewer, {
-      document: document,
-      showToolbar: true,
-      showOutline: true,
-      showComment: false
-    }))));
+    })))), /*#__PURE__*/_react.default.createElement(_layout.Content, null, /*#__PURE__*/_react.default.createElement(_basicSdk.SDocViewer, sdocViewProps))));
   }
 }
 var _default = exports.default = (0, _reactI18next.withTranslation)('sdoc-editor')(SimpleViewer);

package/package.json

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