@seafile/sdoc-editor 1.0.122 → 1.0.124

package/dist/basic-sdk/comment/components/comment-item-collapse-wrapper.js

@@ -32,6 +32,11 @@ const CommentItemCollapseWrapper = _ref => {
   const [commentContent, setCommentContent] = (0, _react.useState)('');
   const [replyContent, setReplyContent] = (0, _react.useState)('');
   const isUnseen = notificationsInfo.notifications_map[`sdoc_notification_${topLevelComment.id}`] ? true : false;
+  const isReplayUnseen = (0, _react.useMemo)(() => {
+    if (!latestReply) return false;
+    const isUnseen = notificationsInfo.notifications_map[`sdoc_notification_${topLevelComment.id}_${latestReply.id}`] ? true : false;
+    return isUnseen;
+  }, [latestReply, notificationsInfo.notifications_map, topLevelComment.id]);
   (0, _react.useEffect)(() => {
     const initCommentContent = async () => {
       const htmlString = await _mdToHtml.default.process(topLevelComment.comment);
@@ -106,11 +111,9 @@ const CommentItemCollapseWrapper = _ref => {
     className: "name"
   }, topLevelComment.user_name), /*#__PURE__*/_react.default.createElement("span", {
     className: "time"
-  }, (0, _dayjs.default)(topLevelComment.updated_at).format('MM-DD HH:mm'), isUnseen && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", {
+  }, (0, _dayjs.default)(topLevelComment.updated_at).format('MM-DD HH:mm')))), (isUnseen || isReplayUnseen) && /*#__PURE__*/_react.default.createElement("div", {
     className: "sdoc-unread-message-tip"
-  }), /*#__PURE__*/_react.default.createElement("span", {
-    className: "sdoc-unread-message-text-tip"
-  }, t('New'))))))), /*#__PURE__*/_react.default.createElement("div", {
+  })), /*#__PURE__*/_react.default.createElement("div", {
     className: "comment-content"
   }, /*#__PURE__*/_react.default.createElement("div", {
     dangerouslySetInnerHTML: {

package/dist/basic-sdk/comment/components/comment-item-content.js

@@ -96,11 +96,9 @@ const CommentItem = _ref => {
     className: "name"
   }, comment.user_name), /*#__PURE__*/_react.default.createElement("span", {
     className: "time"
-  }, (0, _dayjs.default)(comment.updated_at).format('MM-DD HH:mm'), isUnseen && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", {
+  }, (0, _dayjs.default)(comment.updated_at).format('MM-DD HH:mm')))), isUnseen && !isActive && /*#__PURE__*/_react.default.createElement("span", {
     className: "sdoc-unread-message-tip"
-  }), /*#__PURE__*/_react.default.createElement("span", {
-    className: "sdoc-unread-message-text-tip"
-  }, t('New')))))), isActive && /*#__PURE__*/_react.default.createElement("div", {
+  }), isActive && /*#__PURE__*/_react.default.createElement("div", {
     className: "d-flex comment-item-operation-wrapper"
   }, !comment.resolved && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
     id: `tooltip_${menuId}`,

package/dist/basic-sdk/comment/components/comment-item-reply.js

@@ -84,11 +84,7 @@ const CommentItemReply = _ref => {
     className: "name"
   }, reply.user_name), /*#__PURE__*/_react.default.createElement("span", {
     className: "time"
-  }, (0, _dayjs.default)(reply.updated_at).format('MM-DD HH:mm'), isUnseen && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", {
-    className: "sdoc-unread-message-tip"
-  }), /*#__PURE__*/_react.default.createElement("span", {
-    className: "sdoc-unread-message-text-tip"
-  }, t('New')))))), isActive && user.username === reply.author && /*#__PURE__*/_react.default.createElement("div", {
+  }, (0, _dayjs.default)(reply.updated_at).format('MM-DD HH:mm')))), isActive && user.username === reply.author && /*#__PURE__*/_react.default.createElement("div", {
     className: "comment-item-operation-wrapper"
   }, /*#__PURE__*/_react.default.createElement(_reactstrap.Dropdown, {
     id: replyOpToolsId,

package/dist/basic-sdk/comment/components/comment-list.css

@@ -52,6 +52,7 @@
   overflow-y: auto;
   margin: 0;
   padding: 0;
+  padding-bottom: 16px;
 }
 
 .sdoc-comment-list-container .comment-item {
@@ -60,6 +61,10 @@
   cursor: pointer;
 }
 
+.sdoc-comment-list-container .comment-item .comment-item-operation-wrapper {
+  margin-top: -12px;
+}
+
 .comment-delete-popover .comment-delete-popover-container {
   padding: 16px;
 }
@@ -70,10 +75,6 @@
   width: 100%;
 }
 
-.sdoc-comment-list-container .comment-ui-container.active .comment-item:hover {
-  background: #fafafa;
-}
-
 .sdoc-comment-list-container .comment-item .comment-header,
 .sdoc-comment-list-container .comment-item .comment-author {
   display: flex;
@@ -150,7 +151,7 @@
   width: 6px;
   border-radius: 50%;
   background-color: #fc6440;
-  margin-left: 6px;
+  margin-right: 6px;
 }
 
 .sdoc-comment-list-container .comment-header .sdoc-unread-message-text-tip {
@@ -163,17 +164,9 @@
   color: #fff;
 }
 
-.sdoc-comment-list-container .comment-ui-container:hover .comment-header .sdoc-unread-message-tip {
-  display: none;
-}
-
-.sdoc-comment-list-container .comment-ui-container:hover .comment-header .sdoc-unread-message-text-tip {
-  display: inline-block;
-}
-
 .sdoc-comment-list-container .comment-ui-container .comment-operation {
-  width: 32px;
-  height: 32px;
+  width: 24px;
+  height: 24px;
   padding: 0 !important;
   display: flex;
   align-items: center;
@@ -189,11 +182,6 @@
   background-color: #f0f0f0;
 }
 
-.sdoc-comment-list-container .comment-ui-container .comment-operation .sdoc-confirm {
-  color: #20a0ff;
-  font-weight: 800;
-}
-
 .sdoc-comment-menu {
   padding: 0;
   border-radius: 2px;
@@ -322,7 +310,7 @@
 }
 
 .sdoc-article-container .sdoc-comment-list-container .comment-item {
-  padding: 16px;
+  padding: 16px 16px 0px 16px;
 }
 
 .sdoc-article-container .sdoc-comment-list-container .comment-item .comment-editor-wrapper.pb-3 {

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

@@ -12,3 +12,15 @@
   transform: scale(.7);
   text-align: center;
 }
+
+.sdoc-plugin-operation-btn-container .sdoc-unread-message-tip {
+  position: absolute;
+  left: 12px;
+  top: 4px;
+  display: inline-block;
+  height: 6px;
+  width: 6px;
+  border-radius: 50%;
+  background-color: #fc6440;
+  margin-left: 6px;
+}

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

@@ -22,10 +22,9 @@ function CommentsOperation() {
     };
     // 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));
+    className: "sdoc-unread-message-tip"
+  }));
 }

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

@@ -206,6 +206,10 @@
   background-color: #f5f5f5;
 }
 
+.sdoc-comment-drawer .sdoc-comment-list-container .comment-ui-container .comment-item-list {
+  padding-bottom: 0px;
+}
+
 .sdoc-comment-drawer .sdoc-comment-list-container .comment-ui-container .comment-item {
   padding: 0px
 }
@@ -235,6 +239,7 @@
 .sdoc-comment-drawer .sdoc-comment-list-container .comment-item .comment-footer .comments-count {
   display: flex;
   align-items: center;
+  position: relative;
 }
 
 .sdoc-comment-drawer .sdoc-comment-list-container .comment-item .comment-footer .comments-count .comments-count-number {
@@ -247,10 +252,6 @@
   align-items: unset;
 }
 
-.sdoc-comment-drawer .sdoc-comment-list-container .comment-item .comment-item-operation-wrapper {
-  margin-top: -12px;
-}
-
 .sdoc-comment-drawer .sdoc-comment-list-container .comment-item .comment-item-operation-wrapper .comment-operation {
   width: 24px;
   height: 24px;

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

@@ -25,6 +25,7 @@ require("./index.css");
 const GlobalComment = _ref => {
   let {
     editor,
+    deleteUnseenNotifications,
     t
   } = _ref;
   const commentRef = (0, _react.useRef)(null);
@@ -120,10 +121,11 @@ const GlobalComment = _ref => {
     const activeCommentGroup = commentList.find(item => item.id === commentGroupId);
     if (activeCommentGroup) {
       setActiveCommentGroup(activeCommentGroup);
+      deleteUnseenNotifications && deleteUnseenNotifications(activeCommentGroup);
     } else {
       setActiveCommentGroup(null);
     }
-  }, [commentList]);
+  }, [commentList, deleteUnseenNotifications]);
   const commentEditorPlaceholder = !activeCommentGroup ? t('Enter_comment_shift_enter_for_new_line_Enter_to_send') : t('Enter_reply_shift_Enter_for_new_line_Enter_to_send');
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "sdoc-comment-drawer"

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

@@ -59,6 +59,7 @@ const CommentWrapper = _ref => {
     deleteUnseenNotifications: deleteUnseenNotifications,
     editor: editor
   }), type === 'global' && /*#__PURE__*/_react.default.createElement(_components.GlobalComment, {
+    deleteUnseenNotifications: deleteUnseenNotifications,
     editor: editor
   }));
 };

package/package.json

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