@seafile/sdoc-editor 1.0.116 → 1.0.118

package/dist/basic-sdk/comment/components/comment-editor.js

@@ -91,7 +91,6 @@ const CommentEditor = _ref => {
     updateContent && updateContent(value);
   }, [content, insertContent, updateContent]);
   const onSubmit = (0, _react.useCallback)(event => {
-    if (!_slateReact.ReactEditor.isFocused(editor)) return;
     event && event.stopPropagation();
     const mdString = (0, _slateToMd.default)(editor.children);
     updateValue(mdString);
@@ -102,13 +101,17 @@ const CommentEditor = _ref => {
     _slate.Transforms.select(editor, _slate.Editor.start(editor, []));
     updateGlobalCommentContent && updateGlobalCommentContent(null);
   }, [editor, updateValue, addParticipants, userInfo.username, placeholder, updateGlobalCommentContent]);
+  const onSubmitByEnterKey = (0, _react.useCallback)(event => {
+    if (!_slateReact.ReactEditor.isFocused(editor)) return;
+    onSubmit(event);
+  }, [editor, onSubmit]);
   (0, _react.useEffect)(() => {
     const eventBus = _eventBus.default.getInstance();
-    const unsubscribePostComment = eventBus.subscribe(_constants2.INTERNAL_EVENT.COMMENT_EDITOR_POST_COMMENT, onSubmit);
+    const unsubscribePostComment = eventBus.subscribe(_constants2.INTERNAL_EVENT.COMMENT_EDITOR_POST_COMMENT, onSubmitByEnterKey);
     return () => {
       unsubscribePostComment();
     };
-  }, [onSubmit]);
+  }, [onSubmitByEnterKey]);
   const onCancel = (0, _react.useCallback)(event => {
     event.stopPropagation();
     const {

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

@@ -18,36 +18,48 @@ var _constants = require("../constants");
 const CommentItemCollapseWrapper = _ref => {
   let {
     element,
-    latestComment,
     topLevelComment,
+    latestReply,
     editor,
-    commentCount,
+    replyCount,
     setCurrentCommentGroup,
     t
   } = _ref;
-  const [editorContent, setEditorContent] = (0, _react.useState)('');
+  const scrollRef = (0, _react.useRef)(document.querySelector('.sdoc-scroll-container'));
   const {
     notificationsInfo
   } = (0, _notificationHooks.useNotificationContext)();
-  const scrollRef = (0, _react.useRef)(document.querySelector('.sdoc-scroll-container'));
-  const isUnseen = notificationsInfo.notifications_map[`sdoc_notification_${latestComment.id}`] ? true : false;
+  const [commentContent, setCommentContent] = (0, _react.useState)('');
+  const [replyContent, setReplyContent] = (0, _react.useState)('');
+  const isUnseen = notificationsInfo.notifications_map[`sdoc_notification_${topLevelComment.id}`] ? true : false;
   (0, _react.useEffect)(() => {
-    let mdString = '';
-    if (latestComment.reply === 'True') {
-      mdString = t('Mark_as_Resolved');
-    } else if (latestComment.reply === 'False') {
-      mdString = t('Resubmitted');
-    } else if (latestComment.reply) {
-      mdString = latestComment.reply;
-    } else {
-      mdString = latestComment.comment;
-    }
-    transferHtml(mdString);
-  }, [latestComment.comment, latestComment.reply, t]);
-  const transferHtml = async mdString => {
-    const htmlString = await _mdToHtml.default.process(mdString);
-    setEditorContent(String(htmlString));
-  };
+    const initCommentContent = async () => {
+      const htmlString = await _mdToHtml.default.process(topLevelComment.comment);
+      setCommentContent(String(htmlString));
+    };
+    initCommentContent();
+  }, [topLevelComment.comment]);
+  (0, _react.useEffect)(() => {
+    const initReplyContent = async () => {
+      if (!latestReply) {
+        setReplyContent('');
+        return;
+      }
+      let mdString = '';
+      if (latestReply.reply === 'True') {
+        mdString = t('Mark_as_Resolved');
+      } else if (latestReply.reply === 'False') {
+        mdString = t('Resubmitted');
+      } else if (latestReply.reply) {
+        mdString = latestReply.reply;
+      } else {
+        mdString = '';
+      }
+      const htmlString = await _mdToHtml.default.process(mdString);
+      setReplyContent(String(htmlString));
+    };
+    initReplyContent();
+  }, [latestReply, t]);
   const handleScrollToArticle = (0, _react.useCallback)(e => {
     e.stopPropagation();
     const dom = _slateReact.ReactEditor.toDOMNode(editor, element);
@@ -87,14 +99,14 @@ const CommentItemCollapseWrapper = _ref => {
     className: "comment-author__avatar"
   }, /*#__PURE__*/_react.default.createElement("img", {
     alt: "",
-    src: latestComment.avatar_url
+    src: topLevelComment.avatar_url
   })), /*#__PURE__*/_react.default.createElement("span", {
     className: "comment-author__info"
   }, /*#__PURE__*/_react.default.createElement("span", {
     className: "name"
-  }, latestComment.user_name), /*#__PURE__*/_react.default.createElement("span", {
+  }, topLevelComment.user_name), /*#__PURE__*/_react.default.createElement("span", {
     className: "time"
-  }, (0, _dayjs.default)(latestComment.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 && /*#__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"
@@ -102,28 +114,28 @@ const CommentItemCollapseWrapper = _ref => {
     className: "comment-content"
   }, /*#__PURE__*/_react.default.createElement("div", {
     dangerouslySetInnerHTML: {
-      __html: editorContent
+      __html: commentContent
     }
-  })), /*#__PURE__*/_react.default.createElement("div", {
+  })), replyCount !== 0 && /*#__PURE__*/_react.default.createElement("div", {
     className: "comment-footer"
   }, /*#__PURE__*/_react.default.createElement("span", {
     className: "comments-count"
   }, /*#__PURE__*/_react.default.createElement("i", {
     className: "sdocfont sdoc-comments"
-  }), commentCount !== 0 && /*#__PURE__*/_react.default.createElement("span", {
+  }), /*#__PURE__*/_react.default.createElement("span", {
     className: "comments-count-number"
-  }, commentCount)), /*#__PURE__*/_react.default.createElement("div", {
+  }, replyCount)), /*#__PURE__*/_react.default.createElement("div", {
     className: "comment-author"
   }, /*#__PURE__*/_react.default.createElement("span", {
     className: "comment-author__avatar"
   }, /*#__PURE__*/_react.default.createElement("img", {
     alt: "",
-    src: latestComment.avatar_url
+    src: latestReply.avatar_url
   })), /*#__PURE__*/_react.default.createElement("div", {
     className: "comment-author__latest-reply"
   }, /*#__PURE__*/_react.default.createElement("div", {
     dangerouslySetInnerHTML: {
-      __html: editorContent
+      __html: replyContent
     }
   })))))));
 };

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

@@ -148,8 +148,8 @@ const GlobalComment = _ref => {
     className: "sdoc-comment-list-container"
   }, !activeCommentGroup && Array.isArray(commentList) && commentList.map(comment => {
     var _comment$replies, _comment$replies2;
-    const latestComment = ((_comment$replies = comment.replies) === null || _comment$replies === void 0 ? void 0 : _comment$replies.length) > 0 ? comment.replies[comment.replies.length - 1] : comment;
-    const commentCount = (_comment$replies2 = comment.replies) === null || _comment$replies2 === void 0 ? void 0 : _comment$replies2.length;
+    const replyCount = (_comment$replies = comment.replies) === null || _comment$replies === void 0 ? void 0 : _comment$replies.length;
+    const latestReply = ((_comment$replies2 = comment.replies) === null || _comment$replies2 === void 0 ? void 0 : _comment$replies2.length) > 0 ? comment.replies[comment.replies.length - 1] : null;
     const elementId = comment.detail.element_id;
     const element = getNodeByElementId(elementId);
     return /*#__PURE__*/_react.default.createElement(_commentItemCollapseWrapper.default, {
@@ -157,8 +157,8 @@ const GlobalComment = _ref => {
       editor: editor,
       element: element,
       topLevelComment: comment,
-      latestComment: latestComment,
-      commentCount: commentCount,
+      replyCount: replyCount,
+      latestReply: latestReply,
       setCurrentCommentGroup: setCurrentCommentGroup
     });
   }), activeCommentGroup && /*#__PURE__*/_react.default.createElement(_commentItemWrapper.default, {

package/dist/basic-sdk/extension/plugins/callout/render-elem/index.js

@@ -59,7 +59,7 @@ const renderCallout = (_ref, editor) => {
     return _constant.CALLOUT_ICON_MAP[callout_icon];
   }, [element]);
   const isShowPlaceholder = (0, _react.useCallback)(() => {
-    if (isSelected) return false;
+    if (readOnly || isSelected) return false;
     // If element contains more than one element or element is not paragraph, show placeholder
     const isContainUnitElement = element.children.length !== 1 || element.children.some(childElement => childElement.type !== 'paragraph');
     if (isContainUnitElement) return false;

package/package.json

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